Fix ci.benchmarks attribute

cardano-foundation · Dec 16, 2024 · ec60560 · ec60560
1 parent 7ebb18a
commit ec60560
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/flake.nix b/flake.nix
@@ -435,15 +435,18 @@
             };
 
             ci.benchmarks =
-            packages.benchmarks.cardano-wallet-benchmarks //
-            packages.benchmarks.cardano-wallet-blackbox-benchmarks // {
-              all = pkgs.releaseTools.aggregate {
-                name = "cardano-wallet-benchmarks";
-                meta.description = "Build all benchmarks";
-                constituents =
-                  lib.collect lib.isDerivation packages.benchmarks;
-              };
-            };
+              let
+                collectedBenchmarks =
+                  lib.concatMapAttrs (_n: v: v) packages.benchmarks;
+              in
+                collectedBenchmarks // {
+                  all = pkgs.releaseTools.aggregate {
+                    name = "cardano-wallet-benchmarks";
+                    meta.description = "Build all benchmarks";
+                    constituents =
+                      lib.collect lib.isDerivation collectedBenchmarks;
+                  };
+                };
             ci.artifacts = mkReleaseArtifacts walletProject // {
               dockerImage = packages.dockerImage;
             };

diff --git a/nix/lib.nix b/nix/lib.nix
@@ -7,7 +7,8 @@ lib
 rec {
   # Imports from nixpkgs.lib
   inherit (lib) filterAttrsRecursive recursiveUpdate collect 
-                optionalAttrs mapAttrs isDerivation fileset;
+                optionalAttrs mapAttrs isDerivation fileset
+                concatMapAttrs;
 
   /* Convert versions string from Cabal (YYYY.M.D)
      to git tag format (vYYYY-MM-DD).