Merge pull request #386 from turion/dev_simplify_ci

Simplify CI
turion · Jan 8, 2025 · 93b5619 · 93b5619
2 parents f9224cd + 3bf8d3f
commit 93b5619
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/flake.nix b/flake.nix
@@ -197,14 +197,13 @@
       devShells = forAllPlatforms (systems: pkgs: mapAttrs
         (_: hp: hp.shellFor {
           packages = ps: map (pname: ps.${pname}) pnames;
-          nativeBuildInputs = with hp; [
+          nativeBuildInputs = (with hp; [
             haskell-language-server
-          ] ++ lib.optional (lib.versionAtLeast hp.ghc.version "9.4") [
-            fourmolu
-            cabal-gild
-          ] ++ lib.optional (lib.versionAtLeast hp.ghc.version "9.6") [
+          ]) ++ (with pkgs; [
+            haskellPackages.fourmolu
+            haskellPackages.cabal-gild
             cabal-install
-          ];
+          ]);
         })
         (hpsFor pkgs));
     };