git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Add nixpkgs-2105 (#1133)

* Add nixpkgs-2105 * [WIP] Drop nixpkgs-2003 * Update all the nixpkgs pins * Default to nixpkgs-2009 for build.nix * Update individual jobs to nixpkgs 2105 Co-authored-by: Hamish Mackenzie <Hamish.K.Mackenzie@gmail.com>

commit2b842f282c9b9001beab232d513636ec96718c7b authorMoisés Ackerman <6054733+akrmn@users.noreply.github.com> dateWed 23 Jun 2021, 03:28 (5 years ago) parent362f1d6
5 files changed+35−19
compare with iko/ghcjs-patch-master
unifiedsplit
build.nix+1−1 ci.nix+4−3 nix/sources.json+26−13 overlays/emscripten.nix+2 release.nix+2−2
build.nix+1−1
@@ -5,7 +5,7 @@
55let
66 haskellNix = (import ./default.nix {});
77in
8−{ nixpkgs ? haskellNix.sources.nixpkgs
8+{ nixpkgs ? haskellNix.sources.nixpkgs-2009
99, nixpkgsArgs ? haskellNix.nixpkgsArgs
1010, pkgs ? import nixpkgs nixpkgsArgs
1111, ifdLevel ? 1000
ci.nix+4−3
@@ -10,6 +10,7 @@
1010 sources = import ./nix/sources.nix {};
1111 nixpkgsVersions = {
1212 "R2009" = "nixpkgs-2009";
13+ "R2105" = "nixpkgs-2105";
1314 "unstable" = "nixpkgs-unstable";
1415 };
1516 compilerNixNames = nixpkgsName: nixpkgs: builtins.mapAttrs (compiler-nix-name: runTests: {
@@ -22,10 +23,10 @@
2223 # cabal-install and nix-tools plans. When removing a ghc version
2324 # from here (so that is no longer cached) also remove ./materialized/ghcXXX.
2425 # Update supported-ghc-versions.md to reflect any changes made here.
25− {
26+ nixpkgs.lib.optionalAttrs (nixpkgsName == "R2009") {
2627 ghc865 = false;
27− ghc8105 = false; # Just included because the native version is needed at eval time
28− } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2009") {
28+ ghc8105 = false;
29+ } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2105") {
2930 ghc865 = false;
3031 ghc8105 = true;
3132 } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
nix/sources.json+26−13
@@ -91,16 +91,16 @@
9191 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
9292 },
9393 "nixpkgs": {
94− "branch": "nixpkgs-20.09-darwin",
94+ "branch": "nixpkgs-21.05-darwin",
9595 "builtin": false,
9696 "description": "Nix Packages collection",
9797 "homepage": null,
9898 "owner": "NixOS",
9999 "repo": "nixpkgs",
100− "rev": "f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693",
101− "sha256": "156f48manydh8sbrs8j97mzvwdz2zaw51xlm0grrrnns5wa5aaln",
100+ "rev": "3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8",
101+ "sha256": "0jf9l6j60sa8cms7r4a02kr9j9884pwv1prf79b2ysnxmnhimnch",
102102 "type": "tarball",
103− "url": "https://github.com/NixOS/nixpkgs/archive/f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693.tar.gz",
103+ "url": "https://github.com/NixOS/nixpkgs/archive/3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8.tar.gz",
104104 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
105105 },
106106 "nixpkgs-2003": {
@@ -110,10 +110,10 @@
110110 "homepage": null,
111111 "owner": "NixOS",
112112 "repo": "nixpkgs",
113− "rev": "7f73e46625f508a793700f5110b86f1a53341d6e",
114− "sha256": "1gijn6vm6hwy7sxdjd27qq0hjqpkq04npwbxybd9694x7h806823",
113+ "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205",
114+ "sha256": "05k9y9ki6jhaqdhycnidnk5zrdzsdammbk5lsmsbz249hjhhgcgh",
115115 "type": "tarball",
116− "url": "https://github.com/NixOS/nixpkgs/archive/7f73e46625f508a793700f5110b86f1a53341d6e.tar.gz",
116+ "url": "https://github.com/NixOS/nixpkgs/archive/1db42b7fe3878f3f5f7a4f2dc210772fd080e205.tar.gz",
117117 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
118118 },
119119 "nixpkgs-2009": {
@@ -123,10 +123,23 @@
123123 "homepage": null,
124124 "owner": "NixOS",
125125 "repo": "nixpkgs",
126− "rev": "f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693",
127− "sha256": "156f48manydh8sbrs8j97mzvwdz2zaw51xlm0grrrnns5wa5aaln",
126+ "rev": "46d1c3f28ca991601a53e9a14fdd53fcd3dd8416",
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",
128141 "type": "tarball",
129− "url": "https://github.com/NixOS/nixpkgs/archive/f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693.tar.gz",
142+ "url": "https://github.com/NixOS/nixpkgs/archive/3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8.tar.gz",
130143 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
131144 },
132145 "nixpkgs-unstable": {
@@ -136,10 +149,10 @@
136149 "homepage": "",
137150 "owner": "NixOS",
138151 "repo": "nixpkgs",
139− "rev": "d8eb97e3801bde96491535f40483d550b57605b9",
140− "sha256": "1bdd7jinq5d40qai45jfkbcw1n96c7fdlams5iidwzy2ag8axlqh",
152+ "rev": "0747387223edf1aa5beaedf48983471315d95e16",
153+ "sha256": "19hpz87vfcr6icxcjdlp2mnk8v5db4l3x32adzc5ynmxvfayg3lr",
141154 "type": "tarball",
142− "url": "https://github.com/NixOS/nixpkgs/archive/d8eb97e3801bde96491535f40483d550b57605b9.tar.gz",
155+ "url": "https://github.com/NixOS/nixpkgs/archive/0747387223edf1aa5beaedf48983471315d95e16.tar.gz",
143156 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
144157 },
145158 "old-ghc-nix": {
overlays/emscripten.nix+2
@@ -2,6 +2,8 @@ final: prev: let
22 # GHCJS currently requires an old version of emscripten. Overriding to build the older version doesn't
33 # work straightforwardly on 20.09 anymore, so we use an ugly hack and pull emscripten from 20.03.
44 # In future, we'll just fix GHCJS to work with the newer emscripten.
5+
6+ # Not sure what to do here - akrmn
57 pkgs-2003 = import final.haskell-nix.sources.nixpkgs-2003 {
68 system = final.stdenv.system;
79 overlays = [(final: prev: with final; {
release.nix+2−2
@@ -15,8 +15,8 @@ let
1515 # added here will also included without aggregation, making it easier
1616 # to find a failing test. Keep in mind though that adding too many
1717 # of these will slow down eval times.
18− linux = allJobs.R2009.ghc8105.linux.native or {};
19− darwin = allJobs.R2009.ghc8105.darwin.native or {};
18+ linux = allJobs.R2105.ghc8105.linux.native or {};
19+ darwin = allJobs.R2105.ghc8105.darwin.native or {};
2020 };
2121 names = x: lib.filter (n: n != "recurseForDerivations" && n != "meta")
2222 (builtins.attrNames x);