Skip to content

Commit 5142ea6

Browse files
blackheavenTristanCacqueray
authored andcommitted
fix(nix): don't ship dev tools within the production closure (#144)
1 parent 23c7af5 commit 5142ea6

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

flake.nix

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
jailbreakUnbreak = pkg:
2020
pkgs.haskell.lib.doJailbreak (pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.unmarkBroken pkg));
2121

22-
cvss = pkgs.haskellPackages.callCabal2nix "cvss" ./code/cvss {};
23-
osv = pkgs.haskellPackages.callCabal2nix "osv" ./code/osv {inherit cvss;};
22+
cvss = pkgs.haskellPackages.callCabal2nix "cvss" ./code/cvss { };
23+
osv = pkgs.haskellPackages.callCabal2nix "osv" ./code/osv { inherit cvss; };
2424
hsec-core = pkgs.haskellPackages.callCabal2nix "hsec-core" ./code/hsec-core {
2525
inherit cvss osv;
2626
Cabal-syntax = pkgs.haskellPackages.Cabal-syntax_3_8_1_0;
@@ -39,14 +39,18 @@
3939
};
4040

4141
modifier = drv:
42-
pkgs.haskell.lib.addBuildTools drv (with pkgs.haskellPackages;
43-
[
44-
cabal-fmt
45-
cabal-install
46-
ghcid
47-
haskell-language-server
48-
pkgs.nixpkgs-fmt
49-
]);
42+
if returnShellEnv
43+
then
44+
pkgs.haskell.lib.addBuildTools drv
45+
(with pkgs.haskellPackages;
46+
[
47+
cabal-fmt
48+
cabal-install
49+
ghcid
50+
haskell-language-server
51+
pkgs.nixpkgs-fmt
52+
])
53+
else drv;
5054
};
5155

5256
gitconfig =

0 commit comments

Comments
 (0)