Use exeName for packages

Author: andreabedini

nix-tools/flake.nix

@@ -25,53 +25,57 @@
           (attrName: lib.genAttrs systems (system: perSystem.${system}.${attrName}))
       ;
     in
-    forEachSystem (system:
-      let
-        pkgs = haskellNix.legacyPackages.${system};
+    forEachSystem
+      (system:
+        let
+          pkgs = haskellNix.legacyPackages.${system};
 
-        project = pkgs.haskell-nix.cabalProject' {
-          src = ./.;
-          compiler-nix-name = "ghc928";
-        };
+          project = pkgs.haskell-nix.cabalProject' {
+            src = ./.;
+            compiler-nix-name = "ghc928";
+          };
 
-        mkTarball = package:
-          let
-            name = "${package.identifier.name}-${package.identifier.version}";
-            paths = builtins.attrValues package.components.exes;
-          in
-          pkgs.runCommand name
-            { preferLocalBuild = true; }
-            ''
-              mkdir -p ${name}
-              cp --verbose --target-directory ${name} \
-                ${pkgs.lib.concatMapStringsSep "  \\\n  " (p: "${p}/bin/*") paths}
+          mkTarball = package:
+            let
+              name = "${package.identifier.name}-${package.identifier.version}";
+              paths = builtins.attrValues package.components.exes;
+            in
+            pkgs.runCommand name
+              { preferLocalBuild = true; }
+              ''
+                mkdir -p ${name}
+                cp --verbose --target-directory ${name} \
+                  ${pkgs.lib.concatMapStringsSep "  \\\n  " (p: "${p}/bin/*") paths}
 
-              mkdir -p $out
-              tar cvzf $out/${name}.tar.gz ${name}
+                mkdir -p $out
+                tar cvzf $out/${name}.tar.gz ${name}
 
-              mkdir -p $out/nix-support
-              echo "file binary-dist $out/${name}.tar.gz" >> $out/nix-support/hydra-build-products
-              # Propagate the release name of the source tarball.  This is
-              # to get nice package names in channels.
-              echo "${name}" >> $out/nix-support/hydra-release-name
-            '';
-      in
-      lib.recursiveUpdate
-        project.flake'
-        (
-          lib.optionalAttrs (system == "x86_64-linux")
+                mkdir -p $out/nix-support
+                echo "file binary-dist $out/${name}.tar.gz" >> $out/nix-support/hydra-build-products
+                # Propagate the release name of the source tarball.  This is
+                # to get nice package names in channels.
+                echo "${name}" >> $out/nix-support/hydra-release-name
+              '';
+        in
+        builtins.foldl' lib.recursiveUpdate { } [
+          {
+            inherit (project.flake') "checks" "ciJobs" "devShells" "hydraJobs";
+            packages =
+              lib.mapAttrs'
+                (n: v: { name = v.exeName; value = v; })
+                project.flake'.packages;
+          }
+          (lib.optionalAttrs (system == "x86_64-linux")
             {
-              hydraJobs.binary-tarball = mkTarball
-                project.projectCross.musl64.hsPkgs.nix-tools;
-            }
-          //
-          lib.optionalAttrs (system == "aarch64-linux")
+              hydraJobs.binary-tarball =
+                mkTarball project.projectCross.musl64.hsPkgs.nix-tools;
+            })
+          (lib.optionalAttrs (system == "aarch64-linux")
             {
-              hydraJobs.binary-tarball = mkTarball
-                project.projectCross.aarch64-multiplatform-musl.hsPkgs.nix-tools;
-            }
-        )
-    );
+              hydraJobs.binary-tarball =
+                mkTarball project.projectCross.aarch64-multiplatform-musl.hsPkgs.nix-tools;
+            })
+        ]);
 
   nixConfig = {
     extra-substituters = [