Update iohk-nix. Fix nix-shells.

Author: jbgi

.gitignore

@@ -113,3 +113,6 @@ exchange-topology.yaml
 launch_*
 result*
 cabal.config
+
+# avoid issues when running /nix/regenerate.sh
+.stack-to-nix.cache

default.nix

@@ -50,10 +50,6 @@ commonLib.nix-tools.default-nix ./nix/pkgs.nix args
 # ... and add additional non-haskell packages we want to build on CI:
 // {
 
-  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 ];

nix/.stack.nix/contra-tracer.nix

@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/input-output-hk/iohk-nix",
-  "rev": "0a34a05d611a7141d2b6d73446be004fa06f0f5c",
-  "date": "2019-05-10T23:27:17+08:00",
-  "sha256": "174k68m8q4afa39hr76g9j0zk6sf9p8m1gncnj52plb2gmshf54w",
+  "rev": "5040e0192871203251ed404edb3c9259c18bc7e1",
+  "date": "2019-05-20T19:03:56-03:00",
+  "sha256": "1ah1njfj906068g0z10x5ldphcx4l1dx7y026vhmqyjhyqgml88q",
   "fetchSubmodules": false
 }

nix/.stack.nix/default.nix

@@ -1,9 +1,5 @@
-{ system ? builtins.currentSystem
-, config ? {}
-, localPkgs ? import ./. { inherit config system; }
-}:
 let
-  # mainShell = localPkgs.nix-tools.libs.cardano-shell.env;
+  localPkgs = import ./. { };
   mainShell = localPkgs.nix-tools.libs.cardano-shell;
 in mainShell // {
   inherit (localPkgs) runCoveralls;

nix/.stack.nix/iohk-monitoring.nix

@@ -1,4 +1 @@
-{ system ? builtins.currentSystem
-, config ? {}
-}:
-(import ./default.nix { inherit system config; }).stack-env
+(import ./. {}).nix-tools.libs.cardano-shell

nix/iohk-nix-src.json

@@ -100,4 +100,5 @@ extra-deps:
 # compiler-check: newer-minor
 
 nix:
+  enable: true
   shell-file: stack-shell.nix