From 5142ea6f649e0e74ccc280dd06b4789a0f01977b Mon Sep 17 00:00:00 2001 From: Gautier DI FOLCO Date: Sun, 4 Feb 2024 11:06:30 +0100 Subject: [PATCH] fix(nix): don't ship dev tools within the production closure (#144) --- flake.nix | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index b7247016..391c820f 100644 --- 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 =