git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Add nixos-21.11 builds. (#1304)
a68a7ddTom Prince
build.nix+1−1
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -5,7 +5,7 @@
5let
5let
6 haskellNix = (import ./default.nix {});
6 haskellNix = (import ./default.nix {});
7in
7in
8−{ nixpkgs ? haskellNix.sources.nixpkgs-2009
8+{ nixpkgs ? haskellNix.sources.nixpkgs-2111
9, nixpkgsArgs ? haskellNix.nixpkgsArgs
9, nixpkgsArgs ? haskellNix.nixpkgsArgs
10, pkgs ? import nixpkgs nixpkgsArgs
10, pkgs ? import nixpkgs nixpkgsArgs
11, ifdLevel ? 1000
11, ifdLevel ? 1000
ci.nix+5−5
@@ -10,8 +10,8 @@
10 inherit (import ./ci-lib.nix { inherit pkgs; }) dimension platformFilterGeneric filterAttrsOnlyRecursive;
10 inherit (import ./ci-lib.nix { inherit pkgs; }) dimension platformFilterGeneric filterAttrsOnlyRecursive;
11 inherit (pkgs.haskell-nix) sources;
11 inherit (pkgs.haskell-nix) sources;
12 nixpkgsVersions = {
12 nixpkgsVersions = {
13− "R2009" = "nixpkgs-2009";
14 "R2105" = "nixpkgs-2105";
13 "R2105" = "nixpkgs-2105";
14+ "R2111" = "nixpkgs-2111";
15 "unstable" = "nixpkgs-unstable";
15 "unstable" = "nixpkgs-unstable";
16 };
16 };
17 compilerNixNames = nixpkgsName: nixpkgs: builtins.mapAttrs (compiler-nix-name: runTests: {
17 compilerNixNames = nixpkgsName: nixpkgs: builtins.mapAttrs (compiler-nix-name: runTests: {
@@ -24,10 +24,10 @@
24 # cabal-install and nix-tools plans. When removing a ghc version
24 # cabal-install and nix-tools plans. When removing a ghc version
25 # from here (so that is no longer cached) also remove ./materialized/ghcXXX.
25 # from here (so that is no longer cached) also remove ./materialized/ghcXXX.
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 == "R2009") {
27+ nixpkgs.lib.optionalAttrs (nixpkgsName == "R2105") {
28 ghc865 = false;
28 ghc865 = false;
29− ghc8107 = false;
29+ ghc8107 = true;
30− } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2105") {
30+ } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2111") {
31 ghc865 = false;
31 ghc865 = false;
32 ghc8107 = true;
32 ghc8107 = true;
33 } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
33 } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
@@ -45,7 +45,7 @@
45 nixpkgs.lib.filter (v: v != "aarch64-darwin" || (
45 nixpkgs.lib.filter (v: v != "aarch64-darwin" || (
46 # aarch64-darwin requires ghc 8.10.7 and does not work on older nixpkgs
46 # aarch64-darwin requires ghc 8.10.7 and does not work on older nixpkgs
47 !__elem compiler-nix-name ["ghc865" "ghc884" "ghc8104" "ghc810420210212" "ghc8105" "ghc8106" "ghc901"]
47 !__elem compiler-nix-name ["ghc865" "ghc884" "ghc8104" "ghc810420210212" "ghc8105" "ghc8106" "ghc901"]
48− && !__elem nixpkgsName ["R2009" "R2105"])) supportedSystems) (v: v);
48+ && !__elem nixpkgsName ["R2105"])) supportedSystems) (v: v);
49 crossSystems = nixpkgsName: nixpkgs: compiler-nix-name: system:
49 crossSystems = nixpkgsName: nixpkgs: compiler-nix-name: system:
50 # We need to use the actual nixpkgs version we're working with here, since the values
50 # We need to use the actual nixpkgs version we're working with here, since the values
51 # of 'lib.systems.examples' are not understood between all versions
51 # of 'lib.systems.examples' are not understood between all versions
docs/reference/supported-ghc-versions.md+2−2
@@ -20,10 +20,10 @@ really should use an instance of Nixpkgs provided by `haskell.nix` itself.
20
20
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−| 20.09 | `nixpkgs-2009` | 8.6.5 | `ghc865` | No |
24−| 20.09 | `nixpkgs-2009` | 8.10.7 | `ghc8107` | No |
25| 21.05 | `nixpkgs-2105` | 8.6.5 | `ghc865` | No |
23| 21.05 | `nixpkgs-2105` | 8.6.5 | `ghc865` | No |
26| 21.05 | `nixpkgs-2105` | 8.10.7 | `ghc8107` | Yes |
24| 21.05 | `nixpkgs-2105` | 8.10.7 | `ghc8107` | Yes |
25+| 21.11 | `nixpkgs-2105` | 8.6.5 | `ghc865` | No |
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 |
28| unstable | `nixpkgs-unstable` | 8.8.4 | `ghc884` | No |
28| unstable | `nixpkgs-unstable` | 8.8.4 | `ghc884` | No |
29| unstable | `nixpkgs-unstable` | 8.10.4 | `ghc8104` | No |
29| unstable | `nixpkgs-unstable` | 8.10.4 | `ghc8104` | No |
docs/tutorials/getting-started-hix.md+1−1
@@ -98,7 +98,7 @@ in the files or on the command line (they are all optional):
98
98
99```nix
99```nix
100{ name = "hello"; # for better error messages and derivation names
100{ name = "hello"; # for better error messages and derivation names
101− nixpkgsPin = "nixpkgs-unstable"; # or nixpkgs-2009 or nixpkgs-2003
101+ nixpkgsPin = "nixpkgs-unstable"; # or nixpkgs-2111 or nixpkgs-2105
102 nixpkgs = <nixpkgs>; # use this instead of nixpkgsPin
102 nixpkgs = <nixpkgs>; # use this instead of nixpkgsPin
103 subDir = "some/sub/dir"; # sub dir containing the haskell project
103 subDir = "some/sub/dir"; # sub dir containing the haskell project
104 projectFileName = "stack.yaml"; # use this project file
104 projectFileName = "stack.yaml"; # use this project file
flake.lock+11−11
@@ -162,34 +162,34 @@
162 "type": "github"
162 "type": "github"
163 }
163 }
164 },
164 },
165− "nixpkgs-2009": {
165+ "nixpkgs-2105": {
166 "locked": {
166 "locked": {
167− "lastModified": 1624271064,
167+ "lastModified": 1630481079,
168− "narHash": "sha256-qns/uRW7MR2EfVf6VEeLgCsCp7pIOjDeR44JzTF09MA=",
168+ "narHash": "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=",
169 "owner": "NixOS",
169 "owner": "NixOS",
170 "repo": "nixpkgs",
170 "repo": "nixpkgs",
171− "rev": "46d1c3f28ca991601a53e9a14fdd53fcd3dd8416",
171+ "rev": "110a2c9ebbf5d4a94486854f18a37a938cfacbbb",
172 "type": "github"
172 "type": "github"
173 },
173 },
174 "original": {
174 "original": {
175 "owner": "NixOS",
175 "owner": "NixOS",
176− "ref": "nixpkgs-20.09-darwin",
176+ "ref": "nixpkgs-21.05-darwin",
177 "repo": "nixpkgs",
177 "repo": "nixpkgs",
178 "type": "github"
178 "type": "github"
179 }
179 }
180 },
180 },
181− "nixpkgs-2105": {
181+ "nixpkgs-2111": {
182 "locked": {
182 "locked": {
183− "lastModified": 1630481079,
183+ "lastModified": 1638410074,
184− "narHash": "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=",
184+ "narHash": "sha256-MQYI4k4XkoTzpeRjq5wl+1NShsl1CKq8MISFuZ81sWs=",
185 "owner": "NixOS",
185 "owner": "NixOS",
186 "repo": "nixpkgs",
186 "repo": "nixpkgs",
187− "rev": "110a2c9ebbf5d4a94486854f18a37a938cfacbbb",
187+ "rev": "5b80f23502f8e902612a8c631dfce383e1c56596",
188 "type": "github"
188 "type": "github"
189 },
189 },
190 "original": {
190 "original": {
191 "owner": "NixOS",
191 "owner": "NixOS",
192− "ref": "nixpkgs-21.05-darwin",
192+ "ref": "nixpkgs-21.11-darwin",
193 "repo": "nixpkgs",
193 "repo": "nixpkgs",
194 "type": "github"
194 "type": "github"
195 }
195 }
@@ -242,8 +242,8 @@
242 "nixpkgs-2105"
242 "nixpkgs-2105"
243 ],
243 ],
244 "nixpkgs-2003": "nixpkgs-2003",
244 "nixpkgs-2003": "nixpkgs-2003",
245− "nixpkgs-2009": "nixpkgs-2009",
246 "nixpkgs-2105": "nixpkgs-2105",
245 "nixpkgs-2105": "nixpkgs-2105",
246+ "nixpkgs-2111": "nixpkgs-2111",
247 "nixpkgs-unstable": "nixpkgs-unstable",
247 "nixpkgs-unstable": "nixpkgs-unstable",
248 "old-ghc-nix": "old-ghc-nix",
248 "old-ghc-nix": "old-ghc-nix",
249 "stackage": "stackage"
249 "stackage": "stackage"
flake.nix+2−2
@@ -2,10 +2,10 @@
2 description = "Alternative Haskell Infrastructure for Nixpkgs";
2 description = "Alternative Haskell Infrastructure for Nixpkgs";
3
3
4 inputs = {
4 inputs = {
5− nixpkgs.follows = "nixpkgs-2105";
5+ nixpkgs.follows = "nixpkgs-2111";
6 nixpkgs-2003 = { url = "github:NixOS/nixpkgs/nixpkgs-20.03-darwin"; };
6 nixpkgs-2003 = { url = "github:NixOS/nixpkgs/nixpkgs-20.03-darwin"; };
7− nixpkgs-2009 = { url = "github:NixOS/nixpkgs/nixpkgs-20.09-darwin"; };
8 nixpkgs-2105 = { url = "github:NixOS/nixpkgs/nixpkgs-21.05-darwin"; };
7 nixpkgs-2105 = { url = "github:NixOS/nixpkgs/nixpkgs-21.05-darwin"; };
8+ nixpkgs-2111 = { url = "github:NixOS/nixpkgs/nixpkgs-21.11-darwin"; };
9 nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; };
9 nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; };
10 flake-utils = { url = "github:numtide/flake-utils"; };
10 flake-utils = { url = "github:numtide/flake-utils"; };
11 hackage = {
11 hackage = {
modules/hix-project.nix+1−1
@@ -11,7 +11,7 @@
11 nixpkgsPin = lib.mkOption {
11 nixpkgsPin = lib.mkOption {
12 type = lib.types.str;
12 type = lib.types.str;
13 default = "nixpkgs-unstable";
13 default = "nixpkgs-unstable";
14− description = "The name of a haskell.nix nixpkgs pin to use (e.g. nixpkgs-unstable or nixpkgs-2009)";
14+ description = "The name of a haskell.nix nixpkgs pin to use (e.g. nixpkgs-unstable or nixpkgs-2111)";
15 };
15 };
16 nixpkgs = lib.mkOption {
16 nixpkgs = lib.mkOption {
17 type = lib.types.nullOr lib.types.path;
17 type = lib.types.nullOr lib.types.path;