Skip to content

Commit 15d19ef

Browse files
committed
Use exeName for packages
1 parent be4476e commit 15d19ef

File tree

1 file changed

+19
-16
lines changed

1 file changed

+19
-16
lines changed

nix-tools/flake.nix

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,22 +56,25 @@
5656
echo "${name}" >> $out/nix-support/hydra-release-name
5757
'';
5858
in
59-
lib.recursiveUpdate
60-
project.flake'
61-
(
62-
lib.optionalAttrs (system == "x86_64-linux")
63-
{
64-
hydraJobs.binary-tarball = mkTarball
65-
project.projectCross.musl64.hsPkgs.nix-tools;
66-
}
67-
//
68-
lib.optionalAttrs (system == "aarch64-linux")
69-
{
70-
hydraJobs.binary-tarball = mkTarball
71-
project.projectCross.aarch64-multiplatform-musl.hsPkgs.nix-tools;
72-
}
73-
)
74-
);
59+
builtins.foldl' lib.recursiveUpdate { } [
60+
{
61+
inherit (project.flake') "checks" "ciJobs" "devShells" "hydraJobs";
62+
packages =
63+
lib.mapAttrs'
64+
(n: v: { name = v.exeName; value = v; })
65+
project.flake'.packages;
66+
}
67+
(lib.optionalAttrs (system == "x86_64-linux")
68+
{
69+
hydraJobs.binary-tarball =
70+
mkTarball project.projectCross.musl64.hsPkgs.nix-tools;
71+
})
72+
(lib.optionalAttrs (system == "aarch64-linux")
73+
{
74+
hydraJobs.binary-tarball =
75+
mkTarball project.projectCross.aarch64-multiplatform-musl.hsPkgs.nix-tools;
76+
})
77+
]);
7578

7679
nixConfig = {
7780
extra-substituters = [

0 commit comments

Comments
 (0)