git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Update nixpkgs pins. Turn off CI for nixpkgs-2105 (#1308)

* Turn off haskell.nix tests for nixpkgs-2105 * nix flake lock --update-input the nixpkgs pins * Update docs

commite95a1f0dacbc64603c31d11e36e4ba1af8f0eb43 authorHamish Mackenzie <Hamish.Mackenzie@iohk.io> dateMon 13 Dec 2021, 18:05 (5 years ago) parent6384a09
4 files changed+13−13
compare with iko/ghcjs-patch-master
unifiedsplit
ci.nix+1−1 docs/reference/supported-ghc-versions.md+1−1 flake.lock+9−9 release.nix+2−2
ci.nix+1−1
@@ -26,7 +26,7 @@
2626 # Update supported-ghc-versions.md to reflect any changes made here.
2727 nixpkgs.lib.optionalAttrs (nixpkgsName == "R2105") {
2828 ghc865 = false;
29− ghc8107 = true;
29+ ghc8107 = false;
3030 } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2111") {
3131 ghc865 = false;
3232 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.
2121| Nixpkgs version | Nixpkgs pinning | GHC version | `compiler-nix-name` | Tested in CI? |
2222|------------------|--------------------|-------------|-----------------------|---------------|
2323| 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 |
2525| 21.11 | `nixpkgs-2105` | 8.6.5 | `ghc865` | No |
2626| 21.11 | `nixpkgs-2105` | 8.10.7 | `ghc8107` | Yes |
2727| unstable | `nixpkgs-unstable` | 8.6.5 | `ghc865` | No |
flake.lock+9−9
@@ -164,11 +164,11 @@
164164 },
165165 "nixpkgs-2105": {
166166 "locked": {
167− "lastModified": 1630481079,
168− "narHash": "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=",
167+ "lastModified": 1639202042,
168+ "narHash": "sha256-xEMgCsIcDUQ0kw9xvqU0wObns580kpdcr1ACz83+gHs=",
169169 "owner": "NixOS",
170170 "repo": "nixpkgs",
171− "rev": "110a2c9ebbf5d4a94486854f18a37a938cfacbbb",
171+ "rev": "499ca2a9f6463ce119e40361f4329afa921a1d13",
172172 "type": "github"
173173 },
174174 "original": {
@@ -180,11 +180,11 @@
180180 },
181181 "nixpkgs-2111": {
182182 "locked": {
183− "lastModified": 1638410074,
184− "narHash": "sha256-MQYI4k4XkoTzpeRjq5wl+1NShsl1CKq8MISFuZ81sWs=",
183+ "lastModified": 1639213685,
184+ "narHash": "sha256-Evuobw7o9uVjAZuwz06Al0fOWZ5JMKOktgXR0XgWBtg=",
185185 "owner": "NixOS",
186186 "repo": "nixpkgs",
187− "rev": "5b80f23502f8e902612a8c631dfce383e1c56596",
187+ "rev": "453bcb8380fd1777348245b3c44ce2a2b93b2e2d",
188188 "type": "github"
189189 },
190190 "original": {
@@ -196,11 +196,11 @@
196196 },
197197 "nixpkgs-unstable": {
198198 "locked": {
199− "lastModified": 1635295995,
200− "narHash": "sha256-sGYiXjFlxTTMNb4NSkgvX+knOOTipE6gqwPUQpxNF+c=",
199+ "lastModified": 1639239143,
200+ "narHash": "sha256-9fFMUs6m3/4ZMflSqRgO4iEkBtFBnDyLWa3AB2tOvfs=",
201201 "owner": "NixOS",
202202 "repo": "nixpkgs",
203− "rev": "22a500a3f87bbce73bd8d777ef920b43a636f018",
203+ "rev": "e6df26a654b7fdd59a068c57001eab5736b1363c",
204204 "type": "github"
205205 },
206206 "original": {
release.nix+2−2
@@ -21,8 +21,8 @@ let
2121 # added here will also included without aggregation, making it easier
2222 # to find a failing test. Keep in mind though that adding too many
2323 # of these will slow down eval times.
24− x86_64-linux = allJobs.R2105.ghc8107.x86_64-linux.native or {};
25− x86_64-darwin = allJobs.R2105.ghc8107.x86_64-darwin.native or {};
24+ x86_64-linux = allJobs.R2111.ghc8107.x86_64-linux.native or {};
25+ x86_64-darwin = allJobs.R2111.ghc8107.x86_64-darwin.native or {};
2626 };
2727 names = x: lib.filter (n: n != "recurseForDerivations" && n != "meta")
2828 (builtins.attrNames x);