Use nixpkgs 22.05 for scripts

build.nix

@@ -5,7 +5,7 @@
 let
   haskellNix = (import ./default.nix {});
 in
-{ nixpkgs ? haskellNix.sources.nixpkgs-2111
+{ nixpkgs ? haskellNix.sources.nixpkgs-2205
 , nixpkgsArgs ? haskellNix.nixpkgsArgs
 , pkgs ? import nixpkgs nixpkgsArgs
 , evalPackages ? import nixpkgs nixpkgsArgs
@@ -76,10 +76,14 @@ in rec {
       ];
     };
     check-materialization-concurrency = pkgs.buildPackages.callPackage ./scripts/check-materialization-concurrency/check.nix {};
-    check-path-support = pkgs.buildPackages.callPackage ./scripts/check-path-support.nix {
-      # TODO remove this when nixpkgs-2205 is released and used for `pkgs`
-      # check-path-support fails unless we have nix 2.4 or newer.
-      inherit (import haskellNix.sources.nixpkgs-unstable {}) 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 {
+      inherit compiler-nix-name;
     };
   };
 

mkdocs.yml

@@ -13,17 +13,14 @@ site_name: Alternative Haskell Infrastructure for Nixpkgs
 theme: readthedocs
 site_url: null
 repo_url: https://github.com/input-output-hk/haskell.nix
-permalink: true
 markdown_extensions:
   - admonition
   - footnotes
   - tables
   - toc:
       permalink: true
 
-# this is called `nav` in more recent mkdocs versions. Mine
-# right now is 0.17.5
-pages:
+nav:
   - 'Introduction': index.md
   - 'Motivation': motivation.md
   - 'Architecture': architecture.md

scripts/check-path-support.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, writeScript, coreutils, gnutar, gzip, nix, gitMinimal }:
+{ stdenv, lib, writeScript, coreutils, gnutar, gzip, nix, gitMinimal, compiler-nix-name }:
 
 with lib;
 
@@ -9,5 +9,5 @@ writeScript "check-path-supprot.sh" ''
 
   export PATH="${makeBinPath [ coreutils gnutar gzip nix gitMinimal ]}"
 
-  nix-build -E '((import ./. {}).pkgs.haskell-nix.cabalProject { compiler-nix-name = "ghc865"; src = ./test/cabal-simple; }).cabal-simple.components.library'
+  nix-build -E '((import ./. {}).pkgs.haskell-nix.cabalProject { compiler-nix-name = "${compiler-nix-name}"; src = ./test/cabal-simple; }).cabal-simple.components.library'
 ''