Merge branch 'master' of github.com:input-output-hk/haskell.nix into circuithub

Author: ocharles

.github/workflows/pipeline.yml

@@ -5,6 +5,10 @@ on:
     branches:
       - master
 
+  push:
+    branches:
+      - master
+
 defaults:
   run:
     shell: bash

ci.nix

@@ -13,6 +13,7 @@
   inherit (pkgs.haskell-nix) sources;
   nixpkgsVersions = {
     "R2205" = "nixpkgs-2205";
+    "R2211" = "nixpkgs-2211";
     "unstable" = "nixpkgs-unstable";
   };
   haskellNix = compat { inherit checkMaterialization system; };
@@ -49,13 +50,18 @@
       nixpkgs.lib.optionalAttrs (nixpkgsName == "R2205") {
         ghc865 = false;
         ghc8107 = false;
+      } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2211") {
+        ghc865 = false;
+        ghc8107 = false;
+        ghc902 = false;
+        ghc926 = false;
+        ghc944 = false;
       } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
         ghc865 = false;
         ghc884 = false; # Native version is used to boot 9.0.1
         ghc8107 = true;
         ghc902 = false;
-        ghc924 = false;
-        ghc925 = true;
+        ghc926 = true;
         ghc944 = true;
       }));
   crossSystems = nixpkgsName: nixpkgs: compiler-nix-name:
@@ -67,10 +73,10 @@
        || (system == "x86_64-darwin" && __elem compiler-nix-name ["ghc8107"]))) {
     inherit (lib.systems.examples) ghcjs;
   } // lib.optionalAttrs (nixpkgsName == "unstable"
-      && ((system == "x86_64-linux"  && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc925" "ghc944"])
+      && ((system == "x86_64-linux"  && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc926" "ghc944"])
        || (system == "x86_64-darwin" && __elem compiler-nix-name []))) { # TODO add ghc versions when we have more darwin build capacity
     inherit (lib.systems.examples) mingwW64;
-  } // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc922" "ghc923" "ghc924" "ghc925"]) {
+  } // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc922" "ghc923" "ghc924" "ghc926"]) {
     # Musl cross only works on linux
     # aarch64 cross only works on linux
     inherit (lib.systems.examples) musl64 aarch64-multiplatform;

default.nix

@@ -2,7 +2,7 @@
 
 let
   pins = (__fromJSON (__readFile ./flake.lock)).nodes;
-  nixpkgsPin = pins.nixpkgs-2205.locked;
+  nixpkgsPin = pins.nixpkgs-2211.locked;
   flakeCompatPin = pins.flake-compat.locked;
   nixpkgsSrc =
     builtins.fetchTarball {

docs/tutorials/development/default.nix

@@ -26,5 +26,5 @@ in pkgs.haskell-nix.project {
     src = ./.;
   };
   # Specify the GHC version to use.
-  compiler-nix-name = "ghc925"; # Not required for `stack.yaml` based projects.
+  compiler-nix-name = "ghc926"; # Not required for `stack.yaml` based projects.
 }

docs/tutorials/development/nix/sources.json

@@ -5,22 +5,22 @@
         "homepage": "https://input-output-hk.github.io/haskell.nix",
         "owner": "input-output-hk",
         "repo": "haskell.nix",
-        "rev": "d20fc9dc2245a5f5d1d3dc898bf41e6f58b7486d",
-        "sha256": "09qkfbxkrymcsiaydw6iyvpw14y5279863a25m62cxbb44hnqan3",
+        "rev": "d61a3f429425e57108ca2b5355f10df94dafe39d",
+        "sha256": "1fra8grb1jzfb794vm9kw090bb5kiq5g11xmb3nkm2lk60yixjx3",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/haskell.nix/archive/d20fc9dc2245a5f5d1d3dc898bf41e6f58b7486d.tar.gz",
+        "url": "https://github.com/input-output-hk/haskell.nix/archive/d61a3f429425e57108ca2b5355f10df94dafe39d.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "release-21.05",
+        "branch": "release-22.11",
         "description": "Nix Packages collection",
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5f244caea76105b63d826911b2a1563d33ff1cdc",
-        "sha256": "1xlgynfw9svy7nvh9nkxsxdzncv9hg99gbvbwv3gmrhmzc3sar75",
+        "rev": "b7ce17b1ebf600a72178f6302c77b6382d09323f",
+        "sha256": "sha256-uNvD7fzO5hNlltNQUAFBPlcEjNG5Gkbhl/ROiX+GZU4=",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/5f244caea76105b63d826911b2a1563d33ff1cdc.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/b7ce17b1ebf600a72178f6302c77b6382d09323f.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }

docs/tutorials/getting-started-flakes/flake.nix

@@ -12,7 +12,7 @@
           helloProject =
             final.haskell-nix.project' {
               src = ./.;
-              compiler-nix-name = "ghc925";
+              compiler-nix-name = "ghc926";
               # This is used by `nix develop .` to open a shell for use with
               # `cabal`, `hlint` and `haskell-language-server`
               shell.tools = {

docs/tutorials/getting-started/default.nix

@@ -26,5 +26,5 @@ in pkgs.haskell-nix.project {
     src = ./.;
   };
   # Specify the GHC version to use.
-  compiler-nix-name = "ghc925"; # Not required for `stack.yaml` based projects.
+  compiler-nix-name = "ghc926"; # Not required for `stack.yaml` based projects.
 }

docs/tutorials/getting-started/nix/sources.json

@@ -5,10 +5,10 @@
         "homepage": "https://input-output-hk.github.io/haskell.nix",
         "owner": "input-output-hk",
         "repo": "haskell.nix",
-        "rev": "d20fc9dc2245a5f5d1d3dc898bf41e6f58b7486d",
-        "sha256": "09qkfbxkrymcsiaydw6iyvpw14y5279863a25m62cxbb44hnqan3",
+        "rev": "d61a3f429425e57108ca2b5355f10df94dafe39d",
+        "sha256": "1fra8grb1jzfb794vm9kw090bb5kiq5g11xmb3nkm2lk60yixjx3",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/haskell.nix/archive/d20fc9dc2245a5f5d1d3dc898bf41e6f58b7486d.tar.gz",
+        "url": "https://github.com/input-output-hk/haskell.nix/archive/d61a3f429425e57108ca2b5355f10df94dafe39d.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {