Update nix-tools github action

Author: hamishmack

nix-tools/.buildkite/fixed.nix

@@ -8,7 +8,7 @@ let
     plan-pkgs = import ./pkgs.nix;
     pkg-def-extras = [];
     modules = [{
-     nonReinstallablePkgs= [ "rts" "ghc-heap" "ghc-prim" "integer-gmp" "integer-simple" "base"
+     nonReinstallablePkgs= [ "rts" "ghc-heap" "ghc-prim" "integer-gmp" "integer-simple" "base" "ghc-bignum"
       "deepseq" "array" "ghc-boot-th" "pretty" "template-haskell"
       # ghcjs custom packages
       "ghcjs-prim" "ghcjs-th"

nix-tools/.buildkite/nix-tools-build.sh

@@ -1,7 +1,13 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -I "nixpkgs=channel:nixos-21.11" --pure -i bash -p nixUnstable cabal-install ghc git nix-prefetch-git cacert
+#! nix-shell -I "nixpkgs=channel:nixos-22.11" -i bash -p nixUnstable cabal-install ghc git nix-prefetch-git cacert
 
-export NIX_PATH="nixpkgs=channel:nixos-21.11"
+# The `nix-shell` is set to run without `--pure`.
+# It is possible to use `--pure` if we need to, but it requires setting these.
+#  export LANG=en_US.UTF-8
+#  export LC_ALL=en_US.UTF-8
+#  export LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
+
+export NIX_PATH="nixpkgs=channel:nixos-22.11"
 index_state="2020-01-10T00:00:00Z"
 expected_hash="0z2jc4fibfxz88pfgjq3wk5j3v7sn34xkwb8h60hbwfwhhy63vx6"
 
@@ -11,14 +17,16 @@ set -euo pipefail
 # https://github.com/input-output-hk/haskell.nix/issues/57
 rm -f .nix-tools.cache
 
-echo "+++ Cabal configure"
+echo "+++ Cabal update"
 cabal new-update
-cabal new-configure
 
 echo
-echo "+++ Run stable version of plan-to-nix"
+echo "+++ Run stable version of make-install-plan and plan-to-nix"
 nix build --impure --expr '(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.ghc8107)' -o nt
+./nt/bin/make-install-plan
+rm -rf .buildkite/nix1
 ./nt/bin/plan-to-nix --output .buildkite/nix1 --plan-json dist-newstyle/cache/plan.json
+mv dist-newstyle/cabal-files .buildkite/nix1/cabal-files
 
 # Replace currently broken plan-to-nix output
 cp .buildkite/fixed.nix .buildkite/nix1/default.nix
@@ -34,19 +42,26 @@ echo "There are no tests -- https://github.com/input-output-hk/haskell.nix/issue
 echo
 echo "+++ Add runtime dependencies to PATH"
 
-nix build -f channel:nixos-20.03 nix-prefetch-scripts -o nix-prefetch-scripts
-nix build -f channel:nixos-20.03 git -o git
+nix build -f channel:nixos-22.11 nix-prefetch-scripts -o nix-prefetch-scripts
+nix build -f channel:nixos-22.11 git -o git
 export PATH="$PWD/nix-prefetch-scripts/bin:$PWD/git/bin:$PATH"
 
 echo
-echo "+++ Run plan-to-nix again"
+echo "+++ Run make-install-plan and plan-to-nix again"
 
 # This file can interfere with the build.
 # https://github.com/input-output-hk/haskell.nix/issues/57
 rm -f .nix-tools.cache
 
+rm -rf dist-newstyle
+
+nix build -f .buildkite/nix1 nix-tools.components.exes.make-install-plan
+./result/bin/make-install-plan
+
 nix build -f .buildkite/nix1 nix-tools.components.exes.plan-to-nix
+rm -rf .buildkite/nix2
 ./result/bin/plan-to-nix --output .buildkite/nix2 --plan-json dist-newstyle/cache/plan.json
+mv dist-newstyle/cabal-files .buildkite/nix2/cabal-files
 
 # Add module needed to allow Cabal 3.2 to be installed
 sed -i -e 's|modules = \[\]|modules = \[{ nonReinstallablePkgs = \[ "rts" "ghc-heap" "ghc-prim" "integer-gmp" "integer-simple" "base" "deepseq" "array" "ghc-boot-th" "pretty" "template-haskell" "ghcjs-prim" "ghcjs-th" "ghc-boot" "ghc" "Win32" "array" "binary" "bytestring" "containers" "directory" "filepath" "ghc-boot" "ghc-compact" "ghc-prim" "hpc" "mtl" "parsec" "process" "text" "time" "transformers" "unix" "xhtml" "stm" "terminfo" \]; }\]|' \

nix-tools/nix-tools.cabal

@@ -28,7 +28,7 @@ library
                      , Stack2nix.External.Resolve
                      , Stack2nix.Project
                      , Stack2nix.Stack
-  build-depends:       base          >= 4    && <4.15
+  build-depends:       base          >= 4    && <4.16
                      , Cabal         >= 3.8  && <3.9
                      , Cabal-syntax  >= 3.8  && <3.9
                      , aeson         >= 2.0  && <2.1

test/tests.sh

@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash -p bash jq nix gnused
+#! nix-shell -I "nixpkgs=channel:nixos-22.11" -i bash -p bash jq nix gnused
 
 set -euo pipefail