fix(nix): don't ship dev tools within the production closure (#144)

haskell · Feb 4, 2024 · 5142ea6 · 5142ea6
1 parent 23c7af5
commit 5142ea6
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/flake.nix b/flake.nix
@@ -19,8 +19,8 @@
         jailbreakUnbreak = pkg:
           pkgs.haskell.lib.doJailbreak (pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.unmarkBroken pkg));
 
-        cvss = pkgs.haskellPackages.callCabal2nix "cvss" ./code/cvss {};
-        osv = pkgs.haskellPackages.callCabal2nix "osv" ./code/osv {inherit cvss;};
+        cvss = pkgs.haskellPackages.callCabal2nix "cvss" ./code/cvss { };
+        osv = pkgs.haskellPackages.callCabal2nix "osv" ./code/osv { inherit cvss; };
         hsec-core = pkgs.haskellPackages.callCabal2nix "hsec-core" ./code/hsec-core {
           inherit cvss osv;
           Cabal-syntax = pkgs.haskellPackages.Cabal-syntax_3_8_1_0;
@@ -39,14 +39,18 @@
             };
 
             modifier = drv:
-              pkgs.haskell.lib.addBuildTools drv (with pkgs.haskellPackages;
-              [
-                cabal-fmt
-                cabal-install
-                ghcid
-                haskell-language-server
-                pkgs.nixpkgs-fmt
-              ]);
+              if returnShellEnv
+              then
+                pkgs.haskell.lib.addBuildTools drv
+                  (with pkgs.haskellPackages;
+                  [
+                    cabal-fmt
+                    cabal-install
+                    ghcid
+                    haskell-language-server
+                    pkgs.nixpkgs-fmt
+                  ])
+              else drv;
           };
 
         gitconfig =