a68a7dd · haskell.nix · git.iko.soy

git.iko.soy/haskell.nix

on iko/ghcjs-patch-master help sign in

Add nixos-21.11 builds. (#1304)

* Add nixos-21.11 builds. * Remove references to nixpkgs-20.09.

commita68a7dda41d80d5ad21dbd8e2dcbae4ab8ad4956 authorTom Prince <tom.prince@hocat.ca> dateMon 6 Dec 2021, 16:55 (5 years ago) parentb247952

7 files changed+23−23

compare with iko/ghcjs-patch-master

unifiedsplit

build.nix+1−1 ci.nix+5−5 docs/reference/supported-ghc-versions.md+2−2 docs/tutorials/getting-started-hix.md+1−1 flake.lock+11−11 flake.nix+2−2 modules/hix-project.nix+1−1

build.nix+1−1

@@ -5,7 +5,7 @@

55let

66 haskellNix = (import ./default.nix {});

77in

8−{ nixpkgs ? haskellNix.sources.nixpkgs-2009

8+{ nixpkgs ? haskellNix.sources.nixpkgs-2111

99, nixpkgsArgs ? haskellNix.nixpkgsArgs

1010, pkgs ? import nixpkgs nixpkgsArgs

1111, ifdLevel ? 1000

ci.nix+5−5

@@ -10,8 +10,8 @@

1010 inherit (import ./ci-lib.nix { inherit pkgs; }) dimension platformFilterGeneric filterAttrsOnlyRecursive;

1111 inherit (pkgs.haskell-nix) sources;

1212 nixpkgsVersions = {

13− "R2009" = "nixpkgs-2009";

1413 "R2105" = "nixpkgs-2105";

14+ "R2111" = "nixpkgs-2111";

1515 "unstable" = "nixpkgs-unstable";

1616 };

1717 compilerNixNames = nixpkgsName: nixpkgs: builtins.mapAttrs (compiler-nix-name: runTests: {

@@ -24,10 +24,10 @@

2424 # cabal-install and nix-tools plans. When removing a ghc version

2525 # from here (so that is no longer cached) also remove ./materialized/ghcXXX.

2626 # Update supported-ghc-versions.md to reflect any changes made here.

27− nixpkgs.lib.optionalAttrs (nixpkgsName == "R2009") {

27+ nixpkgs.lib.optionalAttrs (nixpkgsName == "R2105") {

2828 ghc865 = false;

29− ghc8107 = false;

30− } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2105") {

29+ ghc8107 = true;

30+ } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2111") {

3131 ghc865 = false;

3232 ghc8107 = true;

3333 } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {

@@ -45,7 +45,7 @@

4545 nixpkgs.lib.filter (v: v != "aarch64-darwin" || (

4646 # aarch64-darwin requires ghc 8.10.7 and does not work on older nixpkgs

4747 !__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);

4949 crossSystems = nixpkgsName: nixpkgs: compiler-nix-name: system:

5050 # We need to use the actual nixpkgs version we're working with here, since the values

5151 # 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.

2020

2222|------------------|--------------------|-------------|-----------------------|---------------|

23−| 20.09 | `nixpkgs-2009` | 8.6.5 | `ghc865` | No |

24−| 20.09 | `nixpkgs-2009` | 8.10.7 | `ghc8107` | No |

2523| 21.05 | `nixpkgs-2105` | 8.6.5 | `ghc865` | No |

2624| 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 |

2727| unstable | `nixpkgs-unstable` | 8.6.5 | `ghc865` | No |

2828| unstable | `nixpkgs-unstable` | 8.8.4 | `ghc884` | No |

2929| 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):

9898

9999```nix

100100{ 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

102102 nixpkgs = <nixpkgs>; # use this instead of nixpkgsPin

103103 subDir = "some/sub/dir"; # sub dir containing the haskell project

104104 projectFileName = "stack.yaml"; # use this project file

flake.lock+11−11

@@ -162,34 +162,34 @@

162162 "type": "github"

163163 }

164164 },

165− "nixpkgs-2009": {

165+ "nixpkgs-2105": {

166166 "locked": {

167− "lastModified": 1624271064,

168− "narHash": "sha256-qns/uRW7MR2EfVf6VEeLgCsCp7pIOjDeR44JzTF09MA=",

167+ "lastModified": 1630481079,

168+ "narHash": "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=",

169169 "owner": "NixOS",

170170 "repo": "nixpkgs",

171− "rev": "46d1c3f28ca991601a53e9a14fdd53fcd3dd8416",

171+ "rev": "110a2c9ebbf5d4a94486854f18a37a938cfacbbb",

172172 "type": "github"

173173 },

174174 "original": {

175175 "owner": "NixOS",

176− "ref": "nixpkgs-20.09-darwin",

176+ "ref": "nixpkgs-21.05-darwin",

177177 "repo": "nixpkgs",

178178 "type": "github"

179179 }

180180 },

181− "nixpkgs-2105": {

181+ "nixpkgs-2111": {

182182 "locked": {

183− "lastModified": 1630481079,

184− "narHash": "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=",

183+ "lastModified": 1638410074,

184+ "narHash": "sha256-MQYI4k4XkoTzpeRjq5wl+1NShsl1CKq8MISFuZ81sWs=",

185185 "owner": "NixOS",

186186 "repo": "nixpkgs",

187− "rev": "110a2c9ebbf5d4a94486854f18a37a938cfacbbb",

187+ "rev": "5b80f23502f8e902612a8c631dfce383e1c56596",

188188 "type": "github"

189189 },

190190 "original": {

191191 "owner": "NixOS",

192− "ref": "nixpkgs-21.05-darwin",

192+ "ref": "nixpkgs-21.11-darwin",

193193 "repo": "nixpkgs",

194194 "type": "github"

195195 }

@@ -242,8 +242,8 @@

242242 "nixpkgs-2105"

243243 ],

244244 "nixpkgs-2003": "nixpkgs-2003",

245− "nixpkgs-2009": "nixpkgs-2009",

246245 "nixpkgs-2105": "nixpkgs-2105",

246+ "nixpkgs-2111": "nixpkgs-2111",

247247 "nixpkgs-unstable": "nixpkgs-unstable",

248248 "old-ghc-nix": "old-ghc-nix",

249249 "stackage": "stackage"

flake.nix+2−2

@@ -2,10 +2,10 @@

22 description = "Alternative Haskell Infrastructure for Nixpkgs";

44 inputs = {

5− nixpkgs.follows = "nixpkgs-2105";

5+ nixpkgs.follows = "nixpkgs-2111";

66 nixpkgs-2003 = { url = "github:NixOS/nixpkgs/nixpkgs-20.03-darwin"; };

7− nixpkgs-2009 = { url = "github:NixOS/nixpkgs/nixpkgs-20.09-darwin"; };

87 nixpkgs-2105 = { url = "github:NixOS/nixpkgs/nixpkgs-21.05-darwin"; };

8+ nixpkgs-2111 = { url = "github:NixOS/nixpkgs/nixpkgs-21.11-darwin"; };

99 nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; };

1010 flake-utils = { url = "github:numtide/flake-utils"; };

1111 hackage = {

modules/hix-project.nix+1−1

@@ -11,7 +11,7 @@

1111 nixpkgsPin = lib.mkOption {

1212 type = lib.types.str;

1313 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)";

1515 };

1616 nixpkgs = lib.mkOption {

1717 type = lib.types.nullOr lib.types.path;