More use of 22.11 to avoid GHA issues (input-output-hk#1938)

* Remove old workaround

* Possible new work around

* Possible new work around

* Comments

* Avoid GHA abbreviation

Author: hamishmack

build.nix

@@ -6,8 +6,11 @@
 , nixpkgsArgs ? haskellNix.nixpkgsArgs
 , pkgs ? import nixpkgs nixpkgsArgs
 , evalPackages ? import nixpkgs nixpkgsArgs
-, nixpkgsForHydra ? haskellNix.sources.nixpkgs-2105
-, pkgsForHydra ? import nixpkgsForHydra (nixpkgsArgs // { inherit (pkgs) system; })
+# This version is used to make our GitHub Action runners happy
+# Using `nixpkgs-unstable` currently results in:
+#   version `GLIBCXX_3.4.30' not found
+, nixpkgsForGitHubAction ? haskellNix.sources.nixpkgs-2211
+, pkgsForGitHubAction ? import nixpkgsForGitHubAction (nixpkgsArgs // { inherit (pkgs) system; })
 , ifdLevel ? 1000
 , compiler-nix-name ? throw "No `compiler-nix-name` passed to build.nix"
 , haskellNix ? (import ./default.nix {})
@@ -75,12 +78,7 @@ in rec {
     update-docs = pkgs.buildPackages.callPackage ./scripts/update-docs.nix {
       generatedOptions = pkgs.callPackage ./scripts/options-doc.nix { };
     };
-    # Because this is going to be used to test caching on hydra, it must not
-    # use the darcs package from the haskell.nix we are testing.  For that reason
-    # it uses `pkgs.buildPackages.callPackage` not `haskell.callPackage`
-    # (We could pull in darcs from a known good haskell.nix for hydra to
-    # use)
-    check-hydra = pkgsForHydra.buildPackages.callPackage ./scripts/check-hydra.nix {};
+    check-hydra = pkgs.buildPackages.callPackage ./scripts/check-hydra.nix {};
     check-closure-size = pkgs.buildPackages.callPackage ./scripts/check-closure-size.nix {
       # Includes cabal-install since this is commonly used.
       nix-tools = pkgs.linkFarm "common-tools" [
@@ -89,21 +87,15 @@ in rec {
       ];
     };
     check-materialization-concurrency = pkgs.buildPackages.callPackage ./scripts/check-materialization-concurrency/check.nix {};
-    # Forcing nixpkgs-unstable here because this test makes a script
-    # that when run will build `aeson` (used by `tests/cabal-simple`)
-    # and we currently do not build that on hydra for nixpkgs-2205 (used by `pkgs`).
-    # Using nixpkgs-unstable should allow buildkite to find what it needs
-    # in the hydra cache when it runs the script.
-    check-path-support = (import haskellNix.sources.nixpkgs-unstable nixpkgsArgs)
-        .buildPackages.callPackage ./scripts/check-path-support.nix {
+    check-path-support = pkgsForGitHubAction.buildPackages.callPackage ./scripts/check-path-support.nix {
       inherit compiler-nix-name;
     };
   };
 
   # These are pure parts of maintainer-script so they can be built by hydra
   # and added to the cache to speed up buildkite.
   maintainer-script-cache = pkgs.recurseIntoAttrs (
-      (pkgs.lib.optionalAttrs (pkgsForHydra.system == "x86_64-linux") {
+      (pkgs.lib.optionalAttrs (pkgs.system == "x86_64-linux") {
         inherit (maintainer-scripts) check-hydra;
       })
     // (pkgs.lib.optionalAttrs (ifdLevel > 2) {

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

@@ -1,6 +1,10 @@
 #! /usr/bin/env nix-shell
 #! nix-shell -I "nixpkgs=channel:nixos-22.11" -i bash -p nixUnstable cabal-install ghc git nix-prefetch-git cacert
 
+# This file uses nixpkgs 22.11 to make our GHA runners happy
+# Using `nixpkgs-unstable` currently results in:
+#   version `GLIBCXX_3.4.30' not found
+
 # 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
@@ -22,7 +26,7 @@ cabal new-update
 
 echo
 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
+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-2211 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