Fix buildkite issues (input-output-hk#73)

* Fix buildkite issues

* Use default nixpkgs truncateIndex test. Update hash

Author: hamishmack

nix-tools/.buildkite/build.sh

@@ -1,9 +1,9 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -I "nixpkgs=channel:nixos-19.03" --pure -i bash -p nix cabal-install ghc git nix-prefetch-git
+#! nix-shell -I "nixpkgs=channel:nixos-19.09" --pure -i bash -p nix cabal-install ghc git nix-prefetch-git cacert
 
-export NIX_PATH="nixpkgs=channel:nixos-19.03"
-index_state="2019-09-15T00:00:00Z"
-expected_hash="1qgk0dnsq2j7sa5ww9vv8ikj0cxc4b1y87z22a1mvizjd8h5nlw8"
+export NIX_PATH="nixpkgs=channel:nixos-19.09"
+index_state="2020-01-10T00:00:00Z"
+expected_hash="0z2jc4fibfxz88pfgjq3wk5j3v7sn34xkwb8h60hbwfwhhy63vx6"
 
 set -euo pipefail
 
@@ -17,7 +17,7 @@ cabal new-configure
 
 echo
 echo "+++ Run stable version of plan-to-nix"
-nix build -f https://github.com/input-output-hk/haskell.nix/archive/master.tar.gz nix-tools -o nt
+nix build '(let haskellNix = builtins.fetchTarball "https://github.com/input-output-hk/haskell.nix/archive/master.tar.gz"; in (import (haskellNix + "/nixpkgs") (import haskellNix)).haskell-nix.nix-tools)' -o nt
 ./nt/bin/plan-to-nix --output .buildkite/nix1 --plan-json dist-newstyle/cache/plan.json
 
 echo

nix-tools/.buildkite/nix1/default.nix

@@ -1,7 +1,8 @@
-{ nixpkgs ? builtins.fetchTarball https://github.com/NixOS/nixpkgs/archive/2255f292063ccbe184ff8f9b35ce475c04d5ae69.tar.gz }:
+{ haskellNixSrc ? builtins.fetchTarball https://github.com/input-output-hk/haskell.nix/archive/master.tar.gz
+, nixpkgs ? haskellNixSrc + "/nixpkgs" }:
 
 let
-  pkgs = import (builtins.fetchTarball https://github.com/input-output-hk/haskell.nix/archive/hkm/overlays-2.tar.gz) { inherit nixpkgs; };
+  pkgs = import nixpkgs (import haskellNixSrc);
 
   pkgSet = pkgs.haskell-nix.mkCabalProjectPkgSet {
     plan-pkgs = import ./pkgs.nix;

nix-tools/.buildkite/nix2/default.nix

@@ -1,7 +1,8 @@
-{ nixpkgs ? builtins.fetchTarball https://github.com/NixOS/nixpkgs/archive/2255f292063ccbe184ff8f9b35ce475c04d5ae69.tar.gz }:
+{ haskellNixSrc ? builtins.fetchTarball https://github.com/input-output-hk/haskell.nix/archive/master.tar.gz
+, nixpkgs ? haskellNixSrc + "/nixpkgs" }:
 
 let
-  pkgs = import (builtins.fetchTarball https://github.com/input-output-hk/haskell.nix/archive/hkm/overlays-2.tar.gz) { inherit nixpkgs; };
+  pkgs = import nixpkgs (import haskellNixSrc);
 
   pkgSet = pkgs.haskell-nix.mkCabalProjectPkgSet {
     plan-pkgs = import ./pkgs.nix;

nix-tools/plan2nix/Plan2Nix.hs

@@ -239,12 +239,13 @@ value2plan plan = Plan { packages, extras, compilerVersion, compilerPackages }
 
 
 defaultNixContents = unlines $
-  [  "{ pkgs ? import <nixpkgs> {} }:"
+  [ "{ haskellNixSrc ? builtins.fetchTarball https://github.com/input-output-hk/haskell.nix/archive/master.tar.gz"
+  , ", nixpkgs ? haskellNixSrc + \"/nixpkgs\" }:"
   , ""
   , "let"
-  , "  haskell = import (builtins.fetchTarball https://github.com/input-output-hk/haskell.nix/archive/master.tar.gz) { inherit pkgs; };"
+  , "  pkgs = import nixpkgs (import haskellNixSrc);"
   , ""
-  , "  pkgSet = haskell.mkCabalProjectPkgSet {"
+  , "  pkgSet = pkgs.haskell-nix.mkCabalProjectPkgSet {"
   , "    plan-pkgs = import ./pkgs.nix;"
   , "    pkg-def-extras = [];"
   , "    modules = [];"

nix-tools/stack2nix/Stack2nix.hs

@@ -192,12 +192,13 @@ packages2nix args pkgs =
 
 defaultNixContents :: String
 defaultNixContents = unlines
-  [  "{ pkgs ? import <nixpkgs> {} }:"
+  [ "{ haskellNixSrc ? builtins.fetchTarball https://github.com/input-output-hk/haskell.nix/archive/master.tar.gz"
+  , ", nixpkgs ? haskellNixSrc + \"/nixpkgs\" }:"
   , ""
   , "let"
-  , "  haskell = import (builtins.fetchTarball https://github.com/input-output-hk/haskell.nix/archive/master.tar.gz) { inherit pkgs; };"
+  , "  pkgs = import nixpkgs (import haskellNixSrc);"
   , ""
-  , "  pkgSet = haskell.mkStackPkgSet {"
+  , "  pkgSet = pkgs.haskell-nix.mkStackPkgSet {"
   , "    stack-pkgs = import ./pkgs.nix;"
   , "    pkg-def-extras = [];"
   , "    modules = [];"

nix-tools/test/truncate-index.nix

@@ -6,7 +6,7 @@
 
 rec {
   pkgs = import nixpkgs {};
-  hsPkgs = import nix-tools-path { inherit nixpkgs; };
+  hsPkgs = import nix-tools-path {};
   index = builtins.fetchurl http://hackage.haskell.org/01-index.tar.gz;
   indexTruncated = pkgs.runCommand "00-index.tar.gz" {
     outputHashAlgo = "sha256";