Add the tool plans to as hydraJobs

hamishmack · hamishmack · commit 3d848279a818 · 2024-11-13T23:07:22.000+13:00
diff --git a/cross-js.nix b/cross-js.nix
@@ -1,7 +1,15 @@
 { self, pkgs, compiler, compiler-nix-name, toolsModule, withHLS ? true, withHlint ? true, withIOG ? true  }:
 let tool-version-map = import ./tool-map.nix;
-    tool = tool-name: pkgs.haskell-nix.tool compiler-nix-name tool-name [(tool-version-map compiler-nix-name tool-name) toolsModule];
-    cabal-install = pkgs.haskell-nix.nix-tools-unchecked.exes.cabal;
+    tool = tool-name: pkgs.pkgsBuildBuild.haskell-nix.tool compiler-nix-name tool-name [(tool-version-map compiler-nix-name tool-name) toolsModule];
+    cabal-install = pkgs.pkgsBuildBuild.haskell-nix.nix-tools-unchecked.exes.cabal;
+    haskell-tools =
+         pkgs.lib.optionalAttrs (withHLS && (compiler-not-in (
+           # it appears we can't get HLS build with 9.8 yet.
+           pkgs.lib.optional (builtins.compareVersions compiler.version "9.7" >= 0) compiler-nix-name
+        ++ pkgs.lib.optional (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) "ghc902") "Haskell Language Server")) { hls = tool "haskell-language-server"; }
+      // pkgs.lib.optionalAttrs (withHlint && (compiler-not-in (
+           pkgs.lib.optional (builtins.compareVersions compiler.version "9.8" >= 0) compiler-nix-name
+        ++ pkgs.lib.optional (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) "ghc902") "HLint")) { hlint = tool "hlint"; };
     # add a trace helper. This will trace a message about disabling a component despite requesting it, if it's not supported in that compiler.
     compiler-not-in = compiler-list: name: (if __elem compiler-nix-name compiler-list then __trace "No ${name}. Not yet compatible with ${compiler-nix-name}" false else true);
 
@@ -86,17 +94,17 @@ pkgs.mkShell ({
         (tool "alex")
         stdenv.cc.cc.lib ]) ++ (with pkgs.buildPackages; [
     ])
-    ++ pkgs.lib.optional (withHLS && (compiler-not-in (
-         # it appears we can't get HLS build with 9.8 yet.
-         pkgs.lib.optional (builtins.compareVersions compiler.version "9.7" >= 0) compiler-nix-name
-      ++ pkgs.lib.optional (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) "ghc902") "Haskell Language Server")) (tool "haskell-language-server")
-    ++ pkgs.lib.optional (withHlint && (compiler-not-in (
-         pkgs.lib.optional (builtins.compareVersions compiler.version "9.8" >= 0) compiler-nix-name
-      ++ pkgs.lib.optional (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) "ghc902") "HLint")) (tool "hlint")
+    ++ builtins.attrValues haskell-tools
     ++ pkgs.lib.optional withIOG
         (with pkgs; [ cddl cbor-diag ]
         ++ map pkgs.lib.getDev (with pkgs; [
             libblst libsodium-vrf secp256k1
         ]))
     ;
+
+    passthru = {
+      plans = if haskell-tools == {} then {} else
+        pkgs.pkgsBuildBuild.linkFarm "plans"
+          (builtins.mapAttrs (_: t: t.project.plan-nix) haskell-tools);
+    };
 })
diff --git a/cross-windows.nix b/cross-windows.nix
@@ -2,6 +2,14 @@
 let tool-version-map = import ./tool-map.nix;
     tool = tool-name: pkgs.pkgsBuildBuild.haskell-nix.tool compiler-nix-name tool-name [(tool-version-map compiler-nix-name tool-name) toolsModule];
     cabal-install = pkgs.pkgsBuildBuild.haskell-nix.nix-tools-unchecked.exes.cabal;
+    haskell-tools =
+         pkgs.lib.optionalAttrs (withHLS && (compiler-not-in (
+           # it appears we can't get HLS build with 9.8 yet.
+           pkgs.lib.optional (builtins.compareVersions compiler.version "9.7" >= 0) compiler-nix-name
+        ++ pkgs.lib.optional (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) "ghc902") "Haskell Language Server")) { hls = tool "haskell-language-server"; }
+      // pkgs.lib.optionalAttrs (withHlint && (compiler-not-in (
+           pkgs.lib.optional (builtins.compareVersions compiler.version "9.8" >= 0) compiler-nix-name
+        ++ pkgs.lib.optional (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) "ghc902") "HLint")) { hlint = tool "hlint"; };
     # add a trace helper. This will trace a message about disabling a component despite requesting it, if it's not supported in that compiler.
     compiler-not-in = compiler-list: name: (if __elem compiler-nix-name compiler-list then __trace "No ${name}. Not yet compatible with ${compiler-nix-name}" false else true);
     # Exclude zstd support for now, since it's currently broken on mingw32W64:
@@ -192,17 +200,17 @@ pkgs.pkgsBuildBuild.mkShell ({
         windows.mcfgthreads
         windows.mingw_w64_pthreads
     ])
-    ++ pkgs.lib.optional (withHLS && (compiler-not-in (
-         # it appears we can't get HLS build with 9.8 yet.
-         pkgs.lib.optional (builtins.compareVersions compiler.version "9.7" >= 0) compiler-nix-name
-      ++ pkgs.lib.optional (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) "ghc902") "Haskell Language Server")) (tool "haskell-language-server")
-    ++ pkgs.lib.optional (withHlint && (compiler-not-in (
-         pkgs.lib.optional (builtins.compareVersions compiler.version "9.8" >= 0) compiler-nix-name
-      ++ pkgs.lib.optional (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) "ghc902") "HLint")) (tool "hlint")
+    ++ builtins.attrValues haskell-tools
     ++ pkgs.lib.optional withIOG
         (with pkgs.pkgsBuildBuild; [ cddl cbor-diag ]
         ++ map pkgs.lib.getDev (with pkgs; [
             libblst libsodium-vrf secp256k1
         ]))
     ;
+
+    passthru = {
+      plans = if haskell-tools == {} then {} else
+        pkgs.pkgsBuildBuild.linkFarm "plans"
+          (builtins.mapAttrs (_: t: t.project.plan-nix) haskell-tools);
+    };
 })
diff --git a/dynamic.nix b/dynamic.nix
@@ -1,8 +1,15 @@
 # define a development shell for dynamically linked applications (default)
 { self, pkgs, compiler, compiler-nix-name, toolsModule, withHLS ? true, withHlint ? true, withIOG ? true, withIOGFull ? false }:
 let tool-version-map = import ./tool-map.nix;
-    tool = tool-name: pkgs.haskell-nix.tool compiler-nix-name tool-name [(tool-version-map compiler-nix-name tool-name) toolsModule];
-    cabal-install = pkgs.haskell-nix.nix-tools-unchecked.exes.cabal;
+    tool = tool-name: pkgs.pkgsBuildBuild.haskell-nix.tool compiler-nix-name tool-name [(tool-version-map compiler-nix-name tool-name) toolsModule];
+    cabal-install = pkgs.pkgsBuildBuild.haskell-nix.nix-tools-unchecked.exes.cabal;
+    haskell-tools =
+         pkgs.lib.optionalAttrs (withHLS && (compiler-not-in (
+           pkgs.lib.optional (builtins.compareVersions compiler.version "9.7" >= 0) compiler-nix-name
+        ++ pkgs.lib.optional (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) "ghc902") "Haskell Language Server")) { hls = tool "haskell-language-server"; }
+      // pkgs.lib.optionalAttrs (withHlint && (compiler-not-in (
+           pkgs.lib.optional (builtins.compareVersions compiler.version "9.10" >= 0) compiler-nix-name
+        ++ pkgs.lib.optional (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) "ghc902") "HLint")) { hlint = tool "hlint"; };
     # add a trace helper. This will trace a message about disabling a component despite requesting it, if it's not supported in that compiler.
     compiler-not-in = compiler-list: name: (if __elem compiler-nix-name compiler-list then __trace "No ${name}. Not yet compatible with ${compiler-nix-name}" false else true);
 
@@ -94,12 +101,7 @@ pkgs.mkShell {
         ]
         ++ pkgs.lib.optional pkgs.stdenv.hostPlatform.isLinux systemd
     )
-    ++ pkgs.lib.optional (withHLS && (compiler-not-in (
-         pkgs.lib.optional (builtins.compareVersions compiler.version "9.7" >= 0) compiler-nix-name
-      ++ pkgs.lib.optional (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) "ghc902") "Haskell Language Server")) (tool "haskell-language-server")
-    ++ pkgs.lib.optional (withHlint && (compiler-not-in (
-         pkgs.lib.optional (builtins.compareVersions compiler.version "9.10" >= 0) compiler-nix-name
-      ++ pkgs.lib.optional (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) "ghc902") "HLint")) (tool "hlint")
+    ++ builtins.attrValues haskell-tools
     ++ pkgs.lib.optional withIOG
         (with pkgs; [
             cddl
@@ -114,4 +116,10 @@ pkgs.mkShell {
                 postgresql # for db-sync
             ]))
     ;
+
+    passthru = {
+      plans = if haskell-tools == {} then {} else
+        pkgs.pkgsBuildBuild.linkFarm "plans"
+          (builtins.mapAttrs (_: t: t.project.plan-nix) haskell-tools);
+    };
 }
diff --git a/flake.nix b/flake.nix
@@ -251,8 +251,9 @@
                 license = pkgs.lib.licenses.asl20;
                 platforms = pkgs.lib.platforms.unix;
               };
-            })) devShells) // {
-          };
+            })) devShells)
+          // (pkgs.lib.mapAttrs' (name: drv:
+            pkgs.lib.nameValuePair "${name}-plans" drv.plans) devShells);
         packages.cabalProjectLocal.static        = (import ./quirks.nix { pkgs = static-pkgs; static = true; }).template;
         packages.cabalProjectLocal.cross-js      = (import ./quirks.nix { pkgs = js-pkgs;                    }).template;
         packages.cabalProjectLocal.cross-windows = (import ./quirks.nix { pkgs = windows-pkgs;               }).template;
diff --git a/static.nix b/static.nix
@@ -2,6 +2,11 @@
 let tool-version-map = import ./tool-map.nix;
     tool = tool-name: pkgs.pkgsBuildBuild.haskell-nix.tool compiler-nix-name tool-name [(tool-version-map compiler-nix-name tool-name) toolsModule];
     cabal-install = pkgs.pkgsBuildBuild.haskell-nix.nix-tools-unchecked.exes.cabal;
+    haskell-tools =
+        pkgs.lib.optionalAttrs (withHLS && (compiler-not-in (
+           pkgs.lib.optional (builtins.compareVersions compiler.version "9.7" >= 0) compiler-nix-name) "Haskell Language Server")) { hls = tool "haskell-language-server"; }
+      // pkgs.lib.optionalAttrs (withHlint && (compiler-not-in (
+           pkgs.lib.optional (builtins.compareVersions compiler.version "9.8" >= 0) compiler-nix-name) "HLint")) { hlint = tool "hlint"; };
     # add a trace helper. This will trace a message about disabling a component despite requesting it, if it's not supported in that compiler.
     compiler-not-in = compiler-list: name: (if __elem compiler-nix-name compiler-list then __trace "No ${name}. Not yet compatible with ${compiler-nix-name}" false else true);
 
@@ -144,10 +149,13 @@ pkgs.mkShell (rec {
         (pkgs.pkg-config or pkgconfig)
         stdenv.cc.cc.lib ]) ++ (with pkgs.buildPackages; [
     ])
-    ++ pkgs.lib.optional (withHLS && (compiler-not-in (
-         pkgs.lib.optional (builtins.compareVersions compiler.version "9.7" >= 0) compiler-nix-name) "Haskell Language Server")) (tool "haskell-language-server")
-    ++ pkgs.lib.optional (withHlint && (compiler-not-in (
-         pkgs.lib.optional (builtins.compareVersions compiler.version "9.8" >= 0) compiler-nix-name) "HLint")) (tool "hlint")
+    ++ builtins.attrValues haskell-tools
     ++ pkgs.lib.optional withIOG (with pkgs; [ cddl cbor-diag ])
     ;
+
+    passthru = {
+      plans = if haskell-tools == {} then {} else
+        pkgs.pkgsBuildBuild.linkFarm "plans"
+          (builtins.mapAttrs (_: t: t.project.plan-nix) haskell-tools);
+    };
 })
