git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Add nixpkgs-2105 (#1133)
2b842f2Moisés Ackerman
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
8+{ nixpkgs ? haskellNix.sources.nixpkgs-2009
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+4−3
@@ -10,6 +10,7 @@
10 sources = import ./nix/sources.nix {};
10 sources = import ./nix/sources.nix {};
11 nixpkgsVersions = {
11 nixpkgsVersions = {
12 "R2009" = "nixpkgs-2009";
12 "R2009" = "nixpkgs-2009";
13+ "R2105" = "nixpkgs-2105";
13 "unstable" = "nixpkgs-unstable";
14 "unstable" = "nixpkgs-unstable";
14 };
15 };
15 compilerNixNames = nixpkgsName: nixpkgs: builtins.mapAttrs (compiler-nix-name: runTests: {
16 compilerNixNames = nixpkgsName: nixpkgs: builtins.mapAttrs (compiler-nix-name: runTests: {
@@ -22,10 +23,10 @@
22 # cabal-install and nix-tools plans. When removing a ghc version
23 # cabal-install and nix-tools plans. When removing a ghc version
23 # from here (so that is no longer cached) also remove ./materialized/ghcXXX.
24 # from here (so that is no longer cached) also remove ./materialized/ghcXXX.
24 # Update supported-ghc-versions.md to reflect any changes made here.
25 # Update supported-ghc-versions.md to reflect any changes made here.
25− {
26+ nixpkgs.lib.optionalAttrs (nixpkgsName == "R2009") {
26 ghc865 = false;
27 ghc865 = false;
27− ghc8105 = false; # Just included because the native version is needed at eval time
28+ ghc8105 = false;
28− } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2009") {
29+ } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2105") {
29 ghc865 = false;
30 ghc865 = false;
30 ghc8105 = true;
31 ghc8105 = true;
31 } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
32 } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
nix/sources.json+26−13
@@ -91,16 +91,16 @@
91 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
91 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
92 },
92 },
93 "nixpkgs": {
93 "nixpkgs": {
94− "branch": "nixpkgs-20.09-darwin",
94+ "branch": "nixpkgs-21.05-darwin",
95 "builtin": false,
95 "builtin": false,
96 "description": "Nix Packages collection",
96 "description": "Nix Packages collection",
97 "homepage": null,
97 "homepage": null,
98 "owner": "NixOS",
98 "owner": "NixOS",
99 "repo": "nixpkgs",
99 "repo": "nixpkgs",
100− "rev": "f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693",
100+ "rev": "3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8",
101− "sha256": "156f48manydh8sbrs8j97mzvwdz2zaw51xlm0grrrnns5wa5aaln",
101+ "sha256": "0jf9l6j60sa8cms7r4a02kr9j9884pwv1prf79b2ysnxmnhimnch",
102 "type": "tarball",
102 "type": "tarball",
103− "url": "https://github.com/NixOS/nixpkgs/archive/f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693.tar.gz",
103+ "url": "https://github.com/NixOS/nixpkgs/archive/3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8.tar.gz",
104 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
104 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
105 },
105 },
106 "nixpkgs-2003": {
106 "nixpkgs-2003": {
@@ -110,10 +110,10 @@
110 "homepage": null,
110 "homepage": null,
111 "owner": "NixOS",
111 "owner": "NixOS",
112 "repo": "nixpkgs",
112 "repo": "nixpkgs",
113− "rev": "7f73e46625f508a793700f5110b86f1a53341d6e",
113+ "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205",
114− "sha256": "1gijn6vm6hwy7sxdjd27qq0hjqpkq04npwbxybd9694x7h806823",
114+ "sha256": "05k9y9ki6jhaqdhycnidnk5zrdzsdammbk5lsmsbz249hjhhgcgh",
115 "type": "tarball",
115 "type": "tarball",
116− "url": "https://github.com/NixOS/nixpkgs/archive/7f73e46625f508a793700f5110b86f1a53341d6e.tar.gz",
116+ "url": "https://github.com/NixOS/nixpkgs/archive/1db42b7fe3878f3f5f7a4f2dc210772fd080e205.tar.gz",
117 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
117 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
118 },
118 },
119 "nixpkgs-2009": {
119 "nixpkgs-2009": {
@@ -123,10 +123,23 @@
123 "homepage": null,
123 "homepage": null,
124 "owner": "NixOS",
124 "owner": "NixOS",
125 "repo": "nixpkgs",
125 "repo": "nixpkgs",
126− "rev": "f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693",
126+ "rev": "46d1c3f28ca991601a53e9a14fdd53fcd3dd8416",
127− "sha256": "156f48manydh8sbrs8j97mzvwdz2zaw51xlm0grrrnns5wa5aaln",
127+ "sha256": "1h7lfhqws2cf8zg30fj8pakh4aw0id3m9yjpgn21scdv2nwkyyxa",
128+ "type": "tarball",
129+ "url": "https://github.com/NixOS/nixpkgs/archive/46d1c3f28ca991601a53e9a14fdd53fcd3dd8416.tar.gz",
130+ "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
131+ },
132+ "nixpkgs-2105": {
133+ "branch": "nixpkgs-21.05-darwin",
134+ "builtin": false,
135+ "description": "Nix Packages collection",
136+ "homepage": null,
137+ "owner": "NixOS",
138+ "repo": "nixpkgs",
139+ "rev": "3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8",
140+ "sha256": "0jf9l6j60sa8cms7r4a02kr9j9884pwv1prf79b2ysnxmnhimnch",
128 "type": "tarball",
141 "type": "tarball",
129− "url": "https://github.com/NixOS/nixpkgs/archive/f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693.tar.gz",
142+ "url": "https://github.com/NixOS/nixpkgs/archive/3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8.tar.gz",
130 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
143 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
131 },
144 },
132 "nixpkgs-unstable": {
145 "nixpkgs-unstable": {
@@ -136,10 +149,10 @@
136 "homepage": "",
149 "homepage": "",
137 "owner": "NixOS",
150 "owner": "NixOS",
138 "repo": "nixpkgs",
151 "repo": "nixpkgs",
139− "rev": "d8eb97e3801bde96491535f40483d550b57605b9",
152+ "rev": "0747387223edf1aa5beaedf48983471315d95e16",
140− "sha256": "1bdd7jinq5d40qai45jfkbcw1n96c7fdlams5iidwzy2ag8axlqh",
153+ "sha256": "19hpz87vfcr6icxcjdlp2mnk8v5db4l3x32adzc5ynmxvfayg3lr",
141 "type": "tarball",
154 "type": "tarball",
142− "url": "https://github.com/NixOS/nixpkgs/archive/d8eb97e3801bde96491535f40483d550b57605b9.tar.gz",
155+ "url": "https://github.com/NixOS/nixpkgs/archive/0747387223edf1aa5beaedf48983471315d95e16.tar.gz",
143 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
156 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
144 },
157 },
145 "old-ghc-nix": {
158 "old-ghc-nix": {
overlays/emscripten.nix+2
@@ -2,6 +2,8 @@ final: prev: let
2 # GHCJS currently requires an old version of emscripten. Overriding to build the older version doesn't
2 # GHCJS currently requires an old version of emscripten. Overriding to build the older version doesn't
3 # work straightforwardly on 20.09 anymore, so we use an ugly hack and pull emscripten from 20.03.
3 # work straightforwardly on 20.09 anymore, so we use an ugly hack and pull emscripten from 20.03.
4 # In future, we'll just fix GHCJS to work with the newer emscripten.
4 # In future, we'll just fix GHCJS to work with the newer emscripten.
5+
6+ # Not sure what to do here - akrmn
5 pkgs-2003 = import final.haskell-nix.sources.nixpkgs-2003 {
7 pkgs-2003 = import final.haskell-nix.sources.nixpkgs-2003 {
6 system = final.stdenv.system;
8 system = final.stdenv.system;
7 overlays = [(final: prev: with final; {
9 overlays = [(final: prev: with final; {
release.nix+2−2
@@ -15,8 +15,8 @@ let
15 # added here will also included without aggregation, making it easier
15 # added here will also included without aggregation, making it easier
16 # to find a failing test. Keep in mind though that adding too many
16 # to find a failing test. Keep in mind though that adding too many
17 # of these will slow down eval times.
17 # of these will slow down eval times.
18− linux = allJobs.R2009.ghc8105.linux.native or {};
18+ linux = allJobs.R2105.ghc8105.linux.native or {};
19− darwin = allJobs.R2009.ghc8105.darwin.native or {};
19+ darwin = allJobs.R2105.ghc8105.darwin.native or {};
20 };
20 };
21 names = x: lib.filter (n: n != "recurseForDerivations" && n != "meta")
21 names = x: lib.filter (n: n != "recurseForDerivations" && n != "meta")
22 (builtins.attrNames x);
22 (builtins.attrNames x);