Fix nix-shells.

Author: jbgi

default.nix

@@ -41,11 +41,28 @@ in
 # parameterize this file when targetting different
 # hosts.
 { system ? builtins.currentSystem
-, config ? {}, ... }@args:
+, config ? {}
+, pkgs ? commonLib.getPkgs { inherit config system; }
+, ... }@args:
 # We will instantiate the default-nix template with the
 # nix/pkgs.nix file...
 commonLib.nix-tools.default-nix ./nix/pkgs.nix args
 # ... and add additional non-haskell packages we want to build on CI:
 // {
-  cardano-shell-env = (import ./stack-shell.nix { inherit config system;  });
+
+  stack-env = pkgs.runCommand "stack-env" { 
+    buildInputs = with pkgs; [ haskell.packages.ghc863.ghc zlib openssl git ];
+  } "mkdir $out";
+
+  runCoveralls = pkgs.stdenv.mkDerivation {
+    name = "run-coveralls";
+    buildInputs = with pkgs; [ haskellPackages.stack-hpc-coveralls stack ];
+    shellHook = ''
+      echo '~~~ stack test'
+      stack test --coverage
+      echo '~~~ shc'
+      shc --repo-token=$COVERALLS_REPO_TOKEN cardano-shell cardano-shell-test
+      exit
+    '';
+  };
 }

shell.nix

@@ -1,24 +1,9 @@
-let
-  commonLib = import ./nix/iohk-common.nix;
-in
 { system ? builtins.currentSystem
 , config ? {}
 , localPkgs ? import ./. { inherit config system; }
-, pkgs ? commonLib.getPkgs { inherit config system; }
 }:
 let
   mainShell = localPkgs.nix-tools.libs.cardano-shell.env;
-  runCoveralls = pkgs.stdenv.mkDerivation {
-    name = "run-coveralls";
-    buildInputs = [ pkgs.haskellPackages.stack-hpc-coveralls pkgs.stack ];
-    shellHook = ''
-      echo '~~~ stack test'
-      stack test --coverage
-      echo '~~~ shc'
-      shc --repo-token=$COVERALLS_REPO_TOKEN cardano-shell cardano-shell-test
-      exit
-    '';
-  };
 in mainShell // {
-  inherit runCoveralls;
+  inherit (localPkgs) runCoveralls;
 }

stack-shell.nix

@@ -1,10 +1,4 @@
 { system ? builtins.currentSystem
 , config ? {}
-, localPkgs ? import ./. { inherit config system; }
-, pkgs ? localPkgs._lib.getPkgs { inherit config system; }
 }:
-with pkgs; haskell.lib.buildStackProject {
-  name = "cardano-shell-env";
-  buildInputs = [ zlib openssl git ];
-  ghc = haskell.packages.ghc863.ghc;
-}
+(import ./default.nix { inherit system config; }).stack-env