From 2fb0a1e6754e24e638c1420fcd548daa90f74ddb Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 15 Nov 2023 22:44:26 +0100 Subject: [PATCH] full path closure --- release.nix | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/release.nix b/release.nix index b9361de3..ffe5ed61 100644 --- a/release.nix +++ b/release.nix @@ -132,21 +132,17 @@ let allJobs = prefix: jobs: let aggrJob = (nixpkgs-final {}).releaseTools.aggregate { name = "all-packages"; - constituents = [ - jobs.tested - jobs.tests.molcas - jobs.python3.adcc - ]; - # constituents = with lib; - # let - # a2l = mapAttrsToList (_: path: if (lib.isAttrs path) then a2l path else path); - # pnames = - # mapAttrsRecursiveCond - # (as: !(as ? "type" && as.type == "derivation")) - # (path: _: concatStringsSep "." ([ prefix ] ++ path)) - # jobs - # ; - # in a2l pnames; + constituents = with lib; + let + a2l = mapAttrsToList (_: path: if (lib.isAttrs path && !isDerivation path) then a2l path else path); + pnames = + mapAttrsRecursiveCond + (as: !(as ? "type" && as.type == "derivation")) + # (path: _: concatStringsSep "." ([ prefix ] ++ path)) + (path: v: v) + jobs + ; + in a2l pnames; }; in { "${prefix}" = jobs;