git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Update nixpkgs pins. Turn off CI for nixpkgs-2105 (#1308)
e95a1f0Hamish Mackenzie
ci.nix+1−1
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -26,7 +26,7 @@
26 # Update supported-ghc-versions.md to reflect any changes made here.
26 # Update supported-ghc-versions.md to reflect any changes made here.
27 nixpkgs.lib.optionalAttrs (nixpkgsName == "R2105") {
27 nixpkgs.lib.optionalAttrs (nixpkgsName == "R2105") {
28 ghc865 = false;
28 ghc865 = false;
29− ghc8107 = true;
29+ ghc8107 = false;
30 } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2111") {
30 } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2111") {
31 ghc865 = false;
31 ghc865 = false;
32 ghc8107 = true;
32 ghc8107 = true;
docs/reference/supported-ghc-versions.md+1−1
@@ -21,7 +21,7 @@ really should use an instance of Nixpkgs provided by `haskell.nix` itself.
21| Nixpkgs version | Nixpkgs pinning | GHC version | `compiler-nix-name` | Tested in CI? |
21| Nixpkgs version | Nixpkgs pinning | GHC version | `compiler-nix-name` | Tested in CI? |
22|------------------|--------------------|-------------|-----------------------|---------------|
22|------------------|--------------------|-------------|-----------------------|---------------|
23| 21.05 | `nixpkgs-2105` | 8.6.5 | `ghc865` | No |
23| 21.05 | `nixpkgs-2105` | 8.6.5 | `ghc865` | No |
24−| 21.05 | `nixpkgs-2105` | 8.10.7 | `ghc8107` | Yes |
24+| 21.05 | `nixpkgs-2105` | 8.10.7 | `ghc8107` | No |
25| 21.11 | `nixpkgs-2105` | 8.6.5 | `ghc865` | No |
25| 21.11 | `nixpkgs-2105` | 8.6.5 | `ghc865` | No |
26| 21.11 | `nixpkgs-2105` | 8.10.7 | `ghc8107` | Yes |
26| 21.11 | `nixpkgs-2105` | 8.10.7 | `ghc8107` | Yes |
27| unstable | `nixpkgs-unstable` | 8.6.5 | `ghc865` | No |
27| unstable | `nixpkgs-unstable` | 8.6.5 | `ghc865` | No |
flake.lock+9−9
@@ -164,11 +164,11 @@
164 },
164 },
165 "nixpkgs-2105": {
165 "nixpkgs-2105": {
166 "locked": {
166 "locked": {
167− "lastModified": 1630481079,
167+ "lastModified": 1639202042,
168− "narHash": "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=",
168+ "narHash": "sha256-xEMgCsIcDUQ0kw9xvqU0wObns580kpdcr1ACz83+gHs=",
169 "owner": "NixOS",
169 "owner": "NixOS",
170 "repo": "nixpkgs",
170 "repo": "nixpkgs",
171− "rev": "110a2c9ebbf5d4a94486854f18a37a938cfacbbb",
171+ "rev": "499ca2a9f6463ce119e40361f4329afa921a1d13",
172 "type": "github"
172 "type": "github"
173 },
173 },
174 "original": {
174 "original": {
@@ -180,11 +180,11 @@
180 },
180 },
181 "nixpkgs-2111": {
181 "nixpkgs-2111": {
182 "locked": {
182 "locked": {
183− "lastModified": 1638410074,
183+ "lastModified": 1639213685,
184− "narHash": "sha256-MQYI4k4XkoTzpeRjq5wl+1NShsl1CKq8MISFuZ81sWs=",
184+ "narHash": "sha256-Evuobw7o9uVjAZuwz06Al0fOWZ5JMKOktgXR0XgWBtg=",
185 "owner": "NixOS",
185 "owner": "NixOS",
186 "repo": "nixpkgs",
186 "repo": "nixpkgs",
187− "rev": "5b80f23502f8e902612a8c631dfce383e1c56596",
187+ "rev": "453bcb8380fd1777348245b3c44ce2a2b93b2e2d",
188 "type": "github"
188 "type": "github"
189 },
189 },
190 "original": {
190 "original": {
@@ -196,11 +196,11 @@
196 },
196 },
197 "nixpkgs-unstable": {
197 "nixpkgs-unstable": {
198 "locked": {
198 "locked": {
199− "lastModified": 1635295995,
199+ "lastModified": 1639239143,
200− "narHash": "sha256-sGYiXjFlxTTMNb4NSkgvX+knOOTipE6gqwPUQpxNF+c=",
200+ "narHash": "sha256-9fFMUs6m3/4ZMflSqRgO4iEkBtFBnDyLWa3AB2tOvfs=",
201 "owner": "NixOS",
201 "owner": "NixOS",
202 "repo": "nixpkgs",
202 "repo": "nixpkgs",
203− "rev": "22a500a3f87bbce73bd8d777ef920b43a636f018",
203+ "rev": "e6df26a654b7fdd59a068c57001eab5736b1363c",
204 "type": "github"
204 "type": "github"
205 },
205 },
206 "original": {
206 "original": {
release.nix+2−2
@@ -21,8 +21,8 @@ let
21 # added here will also included without aggregation, making it easier
21 # added here will also included without aggregation, making it easier
22 # to find a failing test. Keep in mind though that adding too many
22 # to find a failing test. Keep in mind though that adding too many
23 # of these will slow down eval times.
23 # of these will slow down eval times.
24− x86_64-linux = allJobs.R2105.ghc8107.x86_64-linux.native or {};
24+ x86_64-linux = allJobs.R2111.ghc8107.x86_64-linux.native or {};
25− x86_64-darwin = allJobs.R2105.ghc8107.x86_64-darwin.native or {};
25+ x86_64-darwin = allJobs.R2111.ghc8107.x86_64-darwin.native or {};
26 };
26 };
27 names = x: lib.filter (n: n != "recurseForDerivations" && n != "meta")
27 names = x: lib.filter (n: n != "recurseForDerivations" && n != "meta")
28 (builtins.attrNames x);
28 (builtins.attrNames x);