shellFor: Allow all mkDerivation arguments (e.g. buildInputs)

Author: rvl

builder/shell-for.nix

@@ -1,6 +1,6 @@
 { lib, stdenv, glibcLocales, ghcForComponent, makeConfigFiles, hsPkgs }:
 
-{ packages, buildInputs ? [], withHoogle ? true } @ args:
+{ packages, withHoogle ? true, ... } @ args:
 
 let
   selected = packages hsPkgs;
@@ -30,7 +30,7 @@ in
   stdenv.mkDerivation (mkDrvArgs // {
     name = mkDrvArgs.name or name;
 
-    buildInputs = buildInputs ++ systemInputs ++ mkDrvArgs.buildInputs or [];
+    buildInputs = systemInputs ++ mkDrvArgs.buildInputs or [];
     nativeBuildInputs = [ ghcEnv ] ++ nativeBuildInputs ++ mkDrvArgs.nativeBuildInputs or [];
     phases = ["installPhase"];
     installPhase = "echo $nativeBuildInputs $buildInputs > $out";

test/default.nix

@@ -15,7 +15,7 @@ in {
   with-packages = haskell.callPackage ./with-packages { inherit util; };
   builder-haddock = haskell.callPackage ./builder-haddock {};
   stack-simple = haskell.callPackage ./stack-simple {};
-  shell-for = haskell.callPackage ./shell-for { inherit util; };
+  shell-for = haskell.callPackage ./shell-for {};
   callStackToNix = haskell.callPackage ./callStackToNix {};
   callCabalProjectToNix = haskell.callPackage ./call-cabal-project-to-nix {};
 

test/shell-for/default.nix

@@ -1,7 +1,6 @@
-{ stdenv, util, mkStackSnapshotPkgSet }:
+{ stdenv, cabal-install, mkStackSnapshotPkgSet }:
 
 with stdenv.lib;
-with util;
 
 let
   pkgSet = mkStackSnapshotPkgSet {
@@ -20,6 +19,9 @@ let
   env = pkgSet.config.hsPkgs.shellFor {
     packages = ps: with ps; [ conduit conduit-extra resourcet ];
     withHoogle = true;
+    # This adds cabal-install to the shell, which helps tests because
+    # they use a nix-shell --pure. Normally you would BYO cabal-install.
+    buildInputs = [ cabal-install ];
   };
 
 in
@@ -40,9 +42,7 @@ in
     passthru = {
       # Used for debugging with nix repl
       inherit pkgSet;
-
       # Used for testing externally with nix-shell (../tests.sh).
-      # This just adds cabal-install to the existing shell.
-      env = addCabalInstall env;
+      inherit env;
     };
 }