Add nixpkgs-2205 and update other nixpkgs pins

builder/setup-builder.nix

@@ -76,9 +76,8 @@ let
         for f in Setup.hs Setup.lhs; do
           if [ -f $f ]; then
             echo Compiling package $f
-            ghc $f -threaded '' + (if includeGhcPackage then "-package ghc " else "")
-                + ''-package-db ${configFiles}/${configFiles.packageCfgDir} --make -o ./Setup
-            setup=$(pwd)/Setup
+            ghc $f -threaded ${if includeGhcPackage then "-package ghc " else ""
+                }-package-db ${configFiles}/${configFiles.packageCfgDir} --make -o ./Setup
           fi
         done
         [ -f ./Setup ] || (echo Failed to build Setup && exit 1)

ci.nix

@@ -11,10 +11,17 @@
   inherit (pkgs.haskell-nix) sources;
   nixpkgsVersions = {
     "R2111" = "nixpkgs-2111";
+    "R2205" = "nixpkgs-2205";
     "unstable" = "nixpkgs-unstable";
   };
+  haskellNix = import ./default.nix { inherit checkMaterialization; };
+  nixpkgsArgs = haskellNix.nixpkgsArgs // {
+    # Needed for dwarf tests
+    config = haskellNix.nixpkgsArgs.config // {
+      permittedInsecurePackages = ["libdwarf-20210528" "libdwarf-20181024" "dwarfdump-20181024"];
+    };
+  };
   compilerNixNames = nixpkgsName: nixpkgs: builtins.mapAttrs (compiler-nix-name: runTests: {
-    inherit (import ./default.nix { inherit checkMaterialization; }) nixpkgsArgs;
     inherit runTests;
   }) (
     # GHC version to cache and whether to run the tests against them.
@@ -26,6 +33,9 @@
     nixpkgs.lib.optionalAttrs (nixpkgsName == "R2111") {
       ghc865 = false;
       ghc8107 = true;
+    } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2205") {
+      ghc865 = false;
+      ghc8107 = true;
     } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
       ghc865 = false;
       ghc884 = false; # Native version is used to boot 9.0.1
@@ -70,7 +80,7 @@ dimension "Nixpkgs version" nixpkgsVersions (nixpkgsName: nixpkgs-pin:
   let pinnedNixpkgsSrc = sources.${nixpkgs-pin};
       # We need this for generic nixpkgs stuff at the right version
       genericPkgs = import pinnedNixpkgsSrc {};
-  in dimension "GHC version" (compilerNixNames nixpkgsName genericPkgs) (compiler-nix-name: {nixpkgsArgs, runTests}:
+  in dimension "GHC version" (compilerNixNames nixpkgsName genericPkgs) (compiler-nix-name: {runTests}:
     dimension "System" (systems nixpkgsName genericPkgs compiler-nix-name) (systemName: system:
       let pkgs = import pinnedNixpkgsSrc (nixpkgsArgs // { inherit system; });
           build = import ./build.nix { inherit pkgs ifdLevel compiler-nix-name; };

flake.nix

@@ -6,6 +6,7 @@
     nixpkgs-2003 = { url = "github:NixOS/nixpkgs/nixpkgs-20.03-darwin"; };
     nixpkgs-2105 = { url = "github:NixOS/nixpkgs/nixpkgs-21.05-darwin"; };
     nixpkgs-2111 = { url = "github:NixOS/nixpkgs/nixpkgs-21.11-darwin"; };
+    nixpkgs-2205 = { url = "github:NixOS/nixpkgs/nixpkgs-22.05-darwin"; };
     nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; };
     flake-utils = { url = "github:numtide/flake-utils"; };
     hydra.url = "hydra";

lib/ghcjs-project.nix

@@ -76,9 +76,11 @@ let
 
     # Inputs needed to boot the GHCJS compiler
     bootInputs = with pkgs.buildPackages; [
-            # pin nodejs to the 12 series for now, as strings can only be half the length in node 14+
-            # see https://github.com/nodejs/node/issues/33960, this can break large TH splices for now.
-            nodejs-12_x
+            # We used to pin nodejs to the 12 series, as strings can only be half the length in node 14+
+            # see https://github.com/nodejs/node/issues/33960
+            # Large TH splices are likely broken.
+            # TODO reinstate the pin of find a work around for ghcjs to send TH splice in chunks.
+            nodejs-18_x
             makeWrapper
             xorg.lndir
             gmp

lib/materialize.nix

@@ -24,7 +24,7 @@
 }: derivation:
 
 let
-  inherit (derivation) name;
+  name = derivation.name + pkgs.lib.optionalString (derivation ? version) "-${derivation.version}";
 
   traceIgnoringSha256 = reason: x:
     if sha256 != null
@@ -38,8 +38,8 @@ let
 
   unchecked =
     let
-      sha256message = "To make ${this} a fixed-output derivation but not materialized, set `${sha256Arg}` to the output of the 'calculateMaterializedSha' script in 'passthru'.";
-      materializeMessage = "To materialize ${this} entirely, pass a writable path as the `materialized` argument and run the 'updateMaterialized' script in 'passthru'.";
+      sha256message = "${name}: To make ${this} a fixed-output derivation but not materialized, set `${sha256Arg}` to the output of the 'calculateMaterializedSha' script in 'passthru'.";
+      materializeMessage = "${name}: To materialize ${this} entirely, pass a writable path as the `materialized` argument and run the 'updateMaterialized' script in 'passthru'.";
     in if reasonNotSafe != null
       then
         # Warn the user if they tried to pin stuff down when it is not safe

lib/spdx/licenses.nix

@@ -1,14 +1,15 @@
 pkgs:
 with builtins; let
-  materialized' = ../../materialized + "/spdx-${pkgs.evalPackages.spdx-license-list-data.version}";
+  spdxJson = pkgs.evalPackages.spdx-license-list-data.json or pkgs.evalPackages.spdx-license-list-data;
+  materialized' = ../../materialized + "/spdx-${spdxJson.version}";
   licensesJSON = fromJSON (replaceStrings
       [ "\\u0026" "\\u0027" "\\u003d" ]
       [ "&" "'" "=" ]
       (readFile "${pkgs.evalPackages.haskell-nix.materialize {
         materialized = if pathExists materialized' then materialized' else null;
-      } (pkgs.evalPackages.runCommand "spdx-json" {} ''
+      } (pkgs.evalPackages.runCommand "spdx-json" { inherit (spdxJson) version; } ''
           mkdir $out
-          cp ${pkgs.evalPackages.spdx-license-list-data.json or pkgs.evalPackages.spdx-license-list-data}/json/licenses.json $out
+          cp ${spdxJson}/json/licenses.json $out
         '')
       }/licenses.json")
     );