|
76 | 76 | } @ input: let |
77 | 77 | inherit (builtins) elem match; |
78 | 78 | 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; |
80 | 80 | inherit (utils.lib) eachSystem flattenTree; |
81 | 81 | inherit (iohkNix.lib) prefixNamesWith; |
82 | 82 | removeRecurse = lib.filterAttrsRecursive (n: _: n != "recurseForDerivations"); |
|
126 | 126 | in |
127 | 127 | # Take all executables from the project local packages |
128 | 128 | 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 | + }); |
163 | 165 |
|
164 | 166 | mkCardanoNodePackages = project: |
165 | 167 | (collectExes project) |
|
501 | 503 | customConfig.haskellNix |
502 | 504 | ]; |
503 | 505 | cardanoNodePackages = mkCardanoNodePackages final.cardanoNodeProject; |
504 | | - inherit (final.cardanoNodePackages) |
| 506 | + inherit |
| 507 | + (final.cardanoNodePackages) |
505 | 508 | bech32 |
506 | 509 | cardano-cli |
507 | 510 | cardano-node |
|
512 | 515 | db-truncater |
513 | 516 | locli |
514 | 517 | snapshot-converter |
515 | | - tx-generator; |
| 518 | + tx-generator |
| 519 | + ; |
516 | 520 | }; |
517 | 521 | nixosModules = { |
518 | 522 | cardano-node = { |
|
0 commit comments