[DEVOPS-1120] Update iohk-nix revision

Author: rvl

default.nix

@@ -6,14 +6,20 @@
 }:
 
 let
-  haskellPackages = import ./nix/pkgs.nix {
-    inherit pkgs;
-    src = iohkLib.cleanSourceHaskell ./.;
+  haskell = iohkLib.nix-tools.haskell { inherit pkgs; };
+
+  pkgSet = haskell.mkStackPkgSet {
+    stack-pkgs = import ./nix/pkgs.nix;
+    pkg-def-extras = [];
+    modules = [ {
+      packages.cardano-shell.src = iohkLib.cleanSourceHaskell ./.;
+    } ];
   };
+  haskellPackages = pkgSet.config.hsPkgs;
 
 in {
-  inherit haskellPackages;
+  inherit haskellPackages iohkLib;
 
   inherit (haskellPackages.cardano-shell.components)
-    benchmarks exes library tests;
+    all benchmarks exes library tests;
 }

nix/iohk-nix.json

@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/input-output-hk/iohk-nix",
-  "rev": "42dccd89930475bf8b12c3e7dfda10abc4651478",
-  "date": "2019-02-01T09:01:21+08:00",
-  "sha256": "17617k8vmmwppkrfzd08npkl3yyjrb7qzdyhshibnhm85g5jw3dr",
+  "rev": "059b42f187e8e185789a34aa7bbb58f7355ee670",
+  "date": "2019-03-21T17:16:23+01:00",
+  "sha256": "1av7sq79g73w9ncrad5mf188mh78vgsv235rc06jx9y2ghsaah1l",
   "fetchSubmodules": false
 }

nix/pkgs.nix

@@ -1,69 +1,32 @@
-{ args ? { config = import ./config.nix; }
-, pkgs ? import <nixpkgs> { inherit args; }
-, src ? ../.
-}:
-let
-  overrideWith = override: default:
-   let
-     try = builtins.tryEval (builtins.findFile builtins.nixPath override);
-   in if try.success then
-     builtins.trace "using search host <${override}>" try.value
-   else
-     default;
-in
-let
-  # all packages from hackage as nix expressions
-  hackage = import (overrideWith "hackage"
-                    (pkgs.fetchFromGitHub { owner  = "input-output-hk";
-                                            repo   = "hackage.nix";
-                                            rev    = "5223a45e08b1b0d738fdd292b39e49f39f21536f";
-                                            sha256 = "09r662kn2qs444fmqni9jamaxnrk9jrg6whqmxbwhfgd5vy3yynq";
-                                            name   = "hackage-exprs-source"; }))
-                   ;
-  # a different haskell infrastructure
-  haskell = import (overrideWith "haskell"
-                    (pkgs.fetchFromGitHub { owner  = "input-output-hk";
-                                            repo   = "haskell.nix";
-                                            rev    = "34511726b7b43a8a22f8026b4e9f9672e57b2cd6";
-                                            sha256 = "01zm6337b1zcc42s22bpb21xhmhhhgnv0ds3r0p8mc1sb62l0zwg";
-                                            name   = "haskell-lib-source"; }))
-                   hackage;
-
-  # the set of all stackage snapshots
-  stackage = import (overrideWith "stackage"
-                     (pkgs.fetchFromGitHub { owner  = "input-output-hk";
-                                             repo   = "stackage.nix";
-                                             rev    = "ee2b3a71ce8eca1a40eee8a928644dd9912218fe";
-                                             sha256 = "1463d8b3cfsw0xwl9ln8kylm98bp4c518kql4ydw2ggdvihyh20v";
-                                             name   = "stackage-snapshot-source"; }))
-                   ;
-
-  # our packages
-  stack-pkgs = import ./.stack-pkgs.nix;
-
-  # The compiler referenced in the stack config
-  compiler = (stack-pkgs.overlay hackage).compiler.nix-name;
-
-  # Build the packageset with module support.
-  # We can essentially override anything in the modules
-  # section.
-  #
-  #  packages.cbors.patches = [ ./one.patch ];
-  #  packages.cbors.flags.optimize-gmp = false;
-  #
-  pkgSet = haskell.mkPkgSet {
-    inherit pkgs;
-    pkg-def = stackage.${stack-pkgs.resolver};
-    pkg-def-overlays = [
-      stack-pkgs.overlay
-    ];
-    modules = [
-      haskell.ghcHackagePatches.${compiler}
-
-      { packages.cardano-wallet.src = pkgs.lib.mkForce src; }
-    ];
-  };
-
-  packages = pkgSet.config.hsPkgs // { _config = pkgSet.config; };
-
-in packages
+{
+  extras = hackage:
+    {
+      packages = {
+        "base58-bytestring" = (((hackage.base58-bytestring)."0.1.0").revisions).default;
+        "half" = (((hackage.half)."0.2.2.3").revisions).default;
+        "micro-recursion-schemes" = (((hackage.micro-recursion-schemes)."5.0.2.2").revisions).default;
+        "streaming-binary" = (((hackage.streaming-binary)."0.3.0.1").revisions).default;
+        "pretty-show" = (((hackage.pretty-show)."1.8.2").revisions).default;
+        "katip" = (((hackage.katip)."0.7.0.0").revisions)."4b30d0643e18d01a3fd264d3d75921b49b2f464336a52fa46fa049107ebbfe04";
+        "time-units" = (((hackage.time-units)."1.0.0").revisions)."27cf54091c4a0ca73d504fc11d5c31ab4041d17404fe3499945e2055697746c1";
+        "ekg" = (((hackage.ekg)."0.4.0.15").revisions)."f52d7c00654d72d2ab988255f30adba95a52484ac310bab9c136c64732e69f4b";
+        "ekg-json" = (((hackage.ekg-json)."0.1.0.6").revisions)."4ff2e9cac213a5868ae8b4a7c72a16a9a76fac14d944ae819b3d838a9725569b";
+        } // {
+        cardano-shell = ./cardano-shell.nix;
+        cardano-prelude = ./cardano-prelude.nix;
+        cardano-prelude-test = ./cardano-prelude-test.nix;
+        contra-tracer = ./contra-tracer.nix;
+        iohk-monitoring = ./iohk-monitoring.nix;
+        cardano-sl-x509 = ./cardano-sl-x509.nix;
+        cborg = ./.stack.nix/cborg.nix;
+        cardano-crypto = ./.stack.nix/cardano-crypto.nix;
+        plutus-prototype = ./.stack.nix/plutus-prototype.nix;
+        hedgehog = ./.stack.nix/hedgehog.nix;
+        canonical-json = ./.stack.nix/canonical-json.nix;
+        };
+      compiler.version = "8.6.3";
+      compiler.nix-name = "ghc863";
+      };
+  resolver = "lts-13.4";
+  compiler = "ghc-8.6.3";
+  }

shell.nix

@@ -1,6 +1,8 @@
 let
   hsPkgs = import ./default.nix {};
   mainShell = hsPkgs.haskellPackages.cardano-shell.components.all;
+
+  # fixme: get shc from iohk-nix
   pkgs = import (import ./nixpkgs.nix) { config = import ./config.nix; };
   runCoveralls = pkgs.stdenv.mkDerivation {
     name = "run-coveralls";