From 3bf8d3ff2958dca342ba2dba8e32d44f9a06a225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Wed, 8 Jan 2025 22:09:27 +0100 Subject: [PATCH] Simplify CI --- flake.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 9dd41488..5d6017c6 100644 --- 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)); };