From 555f23d86efa9f7d9d895b36cc9a53fe21770e49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Ackerman?= <6054733+akrmn@users.noreply.github.com> Date: Mon, 7 Jun 2021 17:28:47 +0200 Subject: [PATCH 1/8] Add nixpkgs-2105 --- ci.nix | 1 + nix/sources.json | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/ci.nix b/ci.nix index 6060ff21f7..e3359f9b77 100644 --- a/ci.nix +++ b/ci.nix @@ -11,6 +11,7 @@ nixpkgsVersions = { "R2003" = "nixpkgs-2003"; "R2009" = "nixpkgs-2009"; + "R2105" = "nixpkgs-2105"; "unstable" = "nixpkgs-unstable"; }; compilerNixNames = nixpkgsName: nixpkgs: builtins.mapAttrs (compiler-nix-name: runTests: { diff --git a/nix/sources.json b/nix/sources.json index 521cd117d3..61031f7ef2 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -142,6 +142,19 @@ "url": "https://github.com/NixOS/nixpkgs/archive/f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, + "nixpkgs-2105": { + "branch": "nixpkgs-21.05-darwin", + "builtin": false, + "description": "Nix Packages collection", + "homepage": null, + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7e9b0dff974c89e070da1ad85713ff3c20b0ca97", + "sha256": "1ckzhh24mgz6jd1xhfgx0i9mijk6xjqxwsshnvq789xsavrmsc36", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/7e9b0dff974c89e070da1ad85713ff3c20b0ca97.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, "nixpkgs-unstable": { "branch": "nixpkgs-unstable", "builtin": false, From adf318cb56fb0f4e3a43d1faca4baddb1176d666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Ackerman?= <6054733+akrmn@users.noreply.github.com> Date: Sun, 13 Jun 2021 19:35:58 +0200 Subject: [PATCH 2/8] [WIP] Drop nixpkgs-2003 --- ci.nix | 9 ++------- flake.nix | 1 - nix/sources.json | 13 ------------- overlays/emscripten.nix | 2 ++ 4 files changed, 4 insertions(+), 21 deletions(-) diff --git a/ci.nix b/ci.nix index e3359f9b77..3737230e6d 100644 --- a/ci.nix +++ b/ci.nix @@ -9,7 +9,6 @@ inherit (import ./ci-lib.nix) dimension platformFilterGeneric filterAttrsOnlyRecursive; sources = import ./nix/sources.nix {}; nixpkgsVersions = { - "R2003" = "nixpkgs-2003"; "R2009" = "nixpkgs-2009"; "R2105" = "nixpkgs-2105"; "unstable" = "nixpkgs-unstable"; @@ -49,16 +48,12 @@ in lib.optionalAttrs (nixpkgsName == "unstable" && (__elem compiler-nix-name ["ghc865" "ghc884" "ghc8104"])) { inherit (lib.systems.examples) ghcjs; } // lib.optionalAttrs (system == "x86_64-linux" && ( - (nixpkgsName == "R2009" && __elem compiler-nix-name ["ghc8101" "ghc8102" "ghc8103" "ghc8104" "ghc810420210212"]) - || (nixpkgsName == "R2003" && __elem compiler-nix-name ["ghc865"]))) { + (nixpkgsName == "R2009" && __elem compiler-nix-name ["ghc8101" "ghc8102" "ghc8103" "ghc8104" "ghc810420210212"]))) { # Windows cross compilation is currently broken on macOS inherit (lib.systems.examples) mingwW64; - } // lib.optionalAttrs (system == "x86_64-linux" - && !(nixpkgsName == "R2003" && compiler-nix-name == "ghc8104")) { + } // lib.optionalAttrs (system == "x86_64-linux") { # Musl cross only works on linux # aarch64 cross only works on linux - # We also skip these for the R2003 was build of ghc8104 (we only need the - # native so ifdLevel 1 includes compiler needed in ifdLevel2 eval) inherit (lib.systems.examples) musl64 aarch64-multiplatform; }; isDisabled = d: d.meta.disabled or false; diff --git a/flake.nix b/flake.nix index 302e56ff4d..dc51644d31 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,6 @@ inputs = { # Note: keep this in sync with sources.json! nixpkgs.url = github:NixOS/nixpkgs/f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693; - nixpkgs-2003.url = github:NixOS/nixpkgs/7f73e46625f508a793700f5110b86f1a53341d6e; nixpkgs-2009.url = github:NixOS/nixpkgs/f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693; nixpkgs-unstable.url = github:NixOS/nixpkgs/410bbd828cdc6156aecd5bc91772ad3a6b1099c7; }; diff --git a/nix/sources.json b/nix/sources.json index 61031f7ef2..cf9a422e38 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -116,19 +116,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, - "nixpkgs-2003": { - "branch": "nixpkgs-20.03-darwin", - "builtin": false, - "description": "Nix Packages collection", - "homepage": null, - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7f73e46625f508a793700f5110b86f1a53341d6e", - "sha256": "1gijn6vm6hwy7sxdjd27qq0hjqpkq04npwbxybd9694x7h806823", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/7f73e46625f508a793700f5110b86f1a53341d6e.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, "nixpkgs-2009": { "branch": "nixpkgs-20.09-darwin", "builtin": false, diff --git a/overlays/emscripten.nix b/overlays/emscripten.nix index ec0c398375..8f03c09229 100644 --- a/overlays/emscripten.nix +++ b/overlays/emscripten.nix @@ -2,6 +2,8 @@ final: prev: let # GHCJS currently requires an old version of emscripten. Overriding to build the older version doesn't # work straightforwardly on 20.09 anymore, so we use an ugly hack and pull emscripten from 20.03. # In future, we'll just fix GHCJS to work with the newer emscripten. + + # Not sure what to do here - akrmn pkgs-2003 = import final.haskell-nix.sources.nixpkgs-2003 { system = final.stdenv.system; overlays = [(final: prev: with final; { From 21367ce3b8715daf592c77eb6a3418b893929638 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Tue, 22 Jun 2021 13:36:08 +1200 Subject: [PATCH 3/8] Update all the nixpkgs pins --- nix/sources.json | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index c1dede0e3a..8f1ddecaa2 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -91,16 +91,29 @@ "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { - "branch": "nixpkgs-20.09-darwin", + "branch": "nixpkgs-21.05-darwin", + "builtin": false, + "description": "Nix Packages collection", + "homepage": null, + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8", + "sha256": "0jf9l6j60sa8cms7r4a02kr9j9884pwv1prf79b2ysnxmnhimnch", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, + "nixpkgs-2003": { + "branch": "nixpkgs-20.03-darwin", "builtin": false, "description": "Nix Packages collection", "homepage": null, "owner": "NixOS", "repo": "nixpkgs", - "rev": "f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693", - "sha256": "156f48manydh8sbrs8j97mzvwdz2zaw51xlm0grrrnns5wa5aaln", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "sha256": "05k9y9ki6jhaqdhycnidnk5zrdzsdammbk5lsmsbz249hjhhgcgh", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/1db42b7fe3878f3f5f7a4f2dc210772fd080e205.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-2009": { @@ -110,10 +123,10 @@ "homepage": null, "owner": "NixOS", "repo": "nixpkgs", - "rev": "f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693", - "sha256": "156f48manydh8sbrs8j97mzvwdz2zaw51xlm0grrrnns5wa5aaln", + "rev": "46d1c3f28ca991601a53e9a14fdd53fcd3dd8416", + "sha256": "1h7lfhqws2cf8zg30fj8pakh4aw0id3m9yjpgn21scdv2nwkyyxa", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/46d1c3f28ca991601a53e9a14fdd53fcd3dd8416.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-2105": { @@ -123,10 +136,10 @@ "homepage": null, "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e9b0dff974c89e070da1ad85713ff3c20b0ca97", - "sha256": "1ckzhh24mgz6jd1xhfgx0i9mijk6xjqxwsshnvq789xsavrmsc36", + "rev": "3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8", + "sha256": "0jf9l6j60sa8cms7r4a02kr9j9884pwv1prf79b2ysnxmnhimnch", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/7e9b0dff974c89e070da1ad85713ff3c20b0ca97.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-unstable": { @@ -136,10 +149,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d8eb97e3801bde96491535f40483d550b57605b9", - "sha256": "1bdd7jinq5d40qai45jfkbcw1n96c7fdlams5iidwzy2ag8axlqh", + "rev": "0747387223edf1aa5beaedf48983471315d95e16", + "sha256": "19hpz87vfcr6icxcjdlp2mnk8v5db4l3x32adzc5ynmxvfayg3lr", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/d8eb97e3801bde96491535f40483d550b57605b9.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/0747387223edf1aa5beaedf48983471315d95e16.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "old-ghc-nix": { From 743eed8443022efdc776dcc6843b89be8da7b752 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Tue, 22 Jun 2021 13:39:14 +1200 Subject: [PATCH 4/8] ifdLevel 1 --- release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.nix b/release.nix index 6514968ada..64dd95dab2 100644 --- a/release.nix +++ b/release.nix @@ -1,7 +1,7 @@ # 'supportedSystems' restricts the set of systems that we will evaluate for. Useful when you're evaluating # on a machine with e.g. no way to build the Darwin IFDs you need! { supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ] -, ifdLevel ? 3 +, ifdLevel ? 1 , checkMaterialization ? false }: let From 67cb833ee26e864f5771cd7e0c498d0413e894e5 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Tue, 22 Jun 2021 21:06:45 +1200 Subject: [PATCH 5/8] ifdLevel 2 --- release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.nix b/release.nix index 64dd95dab2..83e3682b19 100644 --- a/release.nix +++ b/release.nix @@ -1,7 +1,7 @@ # 'supportedSystems' restricts the set of systems that we will evaluate for. Useful when you're evaluating # on a machine with e.g. no way to build the Darwin IFDs you need! { supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ] -, ifdLevel ? 1 +, ifdLevel ? 2 , checkMaterialization ? false }: let From acf86bcd919a12306294869c74252f793f902053 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Wed, 23 Jun 2021 03:11:53 +1200 Subject: [PATCH 6/8] ifdLevel 3 --- release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.nix b/release.nix index 83e3682b19..6514968ada 100644 --- a/release.nix +++ b/release.nix @@ -1,7 +1,7 @@ # 'supportedSystems' restricts the set of systems that we will evaluate for. Useful when you're evaluating # on a machine with e.g. no way to build the Darwin IFDs you need! { supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ] -, ifdLevel ? 2 +, ifdLevel ? 3 , checkMaterialization ? false }: let From fcc3a57853764b09bbec4aac6ed93b55a42a9616 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Wed, 23 Jun 2021 03:42:00 +1200 Subject: [PATCH 7/8] Default to nixpkgs-2009 for build.nix --- build.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.nix b/build.nix index 8bc51e6450..3e232af838 100644 --- a/build.nix +++ b/build.nix @@ -5,7 +5,7 @@ let haskellNix = (import ./default.nix {}); in -{ nixpkgs ? haskellNix.sources.nixpkgs +{ nixpkgs ? haskellNix.sources.nixpkgs-2009 , nixpkgsArgs ? haskellNix.nixpkgsArgs , pkgs ? import nixpkgs nixpkgsArgs , ifdLevel ? 1000 From 92c972eedcb6623a884a56b37909da35983e4515 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Wed, 23 Jun 2021 04:08:19 +1200 Subject: [PATCH 8/8] Update individual jobs to nixpkgs 2105 --- release.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release.nix b/release.nix index 6514968ada..3ccf087c2a 100644 --- a/release.nix +++ b/release.nix @@ -15,8 +15,8 @@ let # added here will also included without aggregation, making it easier # to find a failing test. Keep in mind though that adding too many # of these will slow down eval times. - linux = allJobs.R2009.ghc8105.linux.native or {}; - darwin = allJobs.R2009.ghc8105.darwin.native or {}; + linux = allJobs.R2105.ghc8105.linux.native or {}; + darwin = allJobs.R2105.ghc8105.darwin.native or {}; }; names = x: lib.filter (n: n != "recurseForDerivations" && n != "meta") (builtins.attrNames x);