s/nixpkgs-default/nixpkgs and use nix-tools.ghc883

Author: hamishmack

nix-tools/.buildkite/build.sh

@@ -17,7 +17,7 @@ cabal new-configure
 
 echo
 echo "+++ Run stable version of plan-to-nix"
-nix build '(let haskellNix = import (builtins.fetchTarball "https://github.com/input-output-hk/haskell.nix/archive/master.tar.gz") {}; in (import haskellNix.sources.nixpkgs-default haskellNix.nixpkgsArgs).haskell-nix.nix-tools)' -o nt
+nix build '(let haskellNix = import (builtins.fetchTarball "https://github.com/input-output-hk/haskell.nix/archive/master.tar.gz") {}; in (import haskellNix.sources.nixpkgs haskellNix.nixpkgsArgs).haskell-nix.nix-tools.ghc883)' -o nt
 ./nt/bin/plan-to-nix --output .buildkite/nix1 --plan-json dist-newstyle/cache/plan.json
 
 # Replace currently broken plan-to-nix output

nix-tools/.buildkite/fixed.nix

@@ -1,5 +1,5 @@
 { haskellNix ? import (builtins.fetchTarball https://github.com/input-output-hk/haskell.nix/archive/master.tar.gz) {}
-, nixpkgs ? haskellNix.sources.nixpkgs-default }:
+, nixpkgs ? haskellNix.sources.nixpkgs }:
 
 let
   pkgs = import nixpkgs haskellNix.nixpkgsArgs;

nix-tools/plan2nix/Plan2Nix.hs

@@ -241,7 +241,7 @@ value2plan plan = Plan { packages, extras, compilerVersion, compilerPackages }
 defaultNixContents = unlines $
   [ "{ haskellNixSrc ? builtins.fetchTarball https://github.com/input-output-hk/haskell.nix/archive/master.tar.gz"
   , ", haskellNix ? import haskellNixSrc {}"
-  , ", nixpkgs ? haskellNix.sources.nixpkgs-default }:"
+  , ", nixpkgs ? haskellNix.sources.nixpkgs }:"
   , ""
   , "let"
   , "  pkgs = import nixpkgs haskellNix.nixpkgsArgs;"