Skip to content

Commit 3f44adf

Browse files
fmt: alejandra
1 parent 9cf1e65 commit 3f44adf

File tree

1 file changed

+41
-37
lines changed

1 file changed

+41
-37
lines changed

flake.nix

Lines changed: 41 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
} @ input: let
7777
inherit (builtins) elem match;
7878
inherit (nixpkgs) lib;
79-
inherit (lib) collect getAttr genAttrs filterAttrs hasPrefix head isDerivation mapAttrs optionalAttrs optionals recursiveUpdate ;
79+
inherit (lib) collect getAttr genAttrs filterAttrs hasPrefix head isDerivation mapAttrs optionalAttrs optionals recursiveUpdate;
8080
inherit (utils.lib) eachSystem flattenTree;
8181
inherit (iohkNix.lib) prefixNamesWith;
8282
removeRecurse = lib.filterAttrsRecursive (n: _: n != "recurseForDerivations");
@@ -126,40 +126,42 @@
126126
in
127127
# Take all executables from the project local packages
128128
project.exes
129-
// (with project.hsPkgs; {
130-
# Add some executables from other relevant packages
131-
inherit (bech32.components.exes) bech32;
132-
inherit (ouroboros-consensus-cardano.components.exes) db-analyser db-synthesizer db-truncater snapshot-converter;
133-
# Add cardano-node, cardano-cli and tx-generator with their git revision stamp.
134-
# Keep available an alternative without the git revision, like the other
135-
# passthru (profiled and asserted in nix/haskell.nix) that
136-
# have no git revision but for the same compilation alternative.
137-
cardano-node =
138-
let node = project.exes.cardano-node;
139-
in recursiveUpdate
140-
(set-git-rev node)
141-
{passthru = {noGitRev = node;};}
142-
;
143-
cardano-cli =
144-
let cli = cardano-cli.components.exes.cardano-cli;
145-
in recursiveUpdate
146-
(set-git-rev cli)
147-
{passthru = {noGitRev = cli;};}
148-
;
149-
cardano-submit-api =
150-
let submit-api = project.exes.cardano-submit-api;
151-
in recursiveUpdate
152-
(set-git-rev submit-api)
153-
{passthru = {noGitRev = submit-api;};}
154-
;
155-
} // optionalAttrs (project.exes ? tx-generator) {
156-
tx-generator =
157-
let tx-gen = project.exes.tx-generator;
158-
in recursiveUpdate
159-
(set-git-rev tx-gen)
160-
{passthru = {noGitRev = tx-gen;};}
161-
;
162-
});
129+
// (with project.hsPkgs;
130+
{
131+
# Add some executables from other relevant packages
132+
inherit (bech32.components.exes) bech32;
133+
inherit (ouroboros-consensus-cardano.components.exes) db-analyser db-synthesizer db-truncater snapshot-converter;
134+
# Add cardano-node, cardano-cli and tx-generator with their git revision stamp.
135+
# Keep available an alternative without the git revision, like the other
136+
# passthru (profiled and asserted in nix/haskell.nix) that
137+
# have no git revision but for the same compilation alternative.
138+
cardano-node = let
139+
node = project.exes.cardano-node;
140+
in
141+
recursiveUpdate
142+
(set-git-rev node)
143+
{passthru = {noGitRev = node;};};
144+
cardano-cli = let
145+
cli = cardano-cli.components.exes.cardano-cli;
146+
in
147+
recursiveUpdate
148+
(set-git-rev cli)
149+
{passthru = {noGitRev = cli;};};
150+
cardano-submit-api = let
151+
submit-api = project.exes.cardano-submit-api;
152+
in
153+
recursiveUpdate
154+
(set-git-rev submit-api)
155+
{passthru = {noGitRev = submit-api;};};
156+
}
157+
// optionalAttrs (project.exes ? tx-generator) {
158+
tx-generator = let
159+
tx-gen = project.exes.tx-generator;
160+
in
161+
recursiveUpdate
162+
(set-git-rev tx-gen)
163+
{passthru = {noGitRev = tx-gen;};};
164+
});
163165

164166
mkCardanoNodePackages = project:
165167
(collectExes project)
@@ -501,7 +503,8 @@
501503
customConfig.haskellNix
502504
];
503505
cardanoNodePackages = mkCardanoNodePackages final.cardanoNodeProject;
504-
inherit (final.cardanoNodePackages)
506+
inherit
507+
(final.cardanoNodePackages)
505508
bech32
506509
cardano-cli
507510
cardano-node
@@ -512,7 +515,8 @@
512515
db-truncater
513516
locli
514517
snapshot-converter
515-
tx-generator;
518+
tx-generator
519+
;
516520
};
517521
nixosModules = {
518522
cardano-node = {

0 commit comments

Comments
 (0)