Skip to content

Add nixpkgs-2105 #1133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jun 23, 2021
Merged

Add nixpkgs-2105 #1133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
555f23d
Add nixpkgs-2105
akrmn Jun 7, 2021
adf318c
[WIP] Drop nixpkgs-2003
akrmn Jun 13, 2021
d115e1c
Merge remote-tracking branch 'origin/master' into nixpkgs-2105
hamishmack Jun 22, 2021
21367ce
Update all the nixpkgs pins
hamishmack Jun 22, 2021
743eed8
ifdLevel 1
hamishmack Jun 22, 2021
67cb833
ifdLevel 2
hamishmack Jun 22, 2021
acf86bc
ifdLevel 3
hamishmack Jun 22, 2021
fcc3a57
Default to nixpkgs-2009 for build.nix
hamishmack Jun 22, 2021
92c972e
Update individual jobs to nixpkgs 2105
hamishmack Jun 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions ci.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
sources = import ./nix/sources.nix {};
nixpkgsVersions = {
"R2009" = "nixpkgs-2009";
"R2105" = "nixpkgs-2105";
"unstable" = "nixpkgs-unstable";
};
compilerNixNames = nixpkgsName: nixpkgs: builtins.mapAttrs (compiler-nix-name: runTests: {
Expand All @@ -22,10 +23,10 @@
# cabal-install and nix-tools plans. When removing a ghc version
# from here (so that is no longer cached) also remove ./materialized/ghcXXX.
# Update supported-ghc-versions.md to reflect any changes made here.
{
nixpkgs.lib.optionalAttrs (nixpkgsName == "R2009") {
ghc865 = false;
ghc8105 = false; # Just included because the native version is needed at eval time
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2009") {
ghc8105 = false;
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2105") {
ghc865 = false;
ghc8105 = true;
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
Expand Down
39 changes: 26 additions & 13 deletions nix/sources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,16 +91,16 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.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": "f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693",
"sha256": "156f48manydh8sbrs8j97mzvwdz2zaw51xlm0grrrnns5wa5aaln",
"rev": "3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8",
"sha256": "0jf9l6j60sa8cms7r4a02kr9j9884pwv1prf79b2ysnxmnhimnch",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs-2003": {
Expand All @@ -110,10 +110,10 @@
"homepage": null,
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7f73e46625f508a793700f5110b86f1a53341d6e",
"sha256": "1gijn6vm6hwy7sxdjd27qq0hjqpkq04npwbxybd9694x7h806823",
"rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205",
"sha256": "05k9y9ki6jhaqdhycnidnk5zrdzsdammbk5lsmsbz249hjhhgcgh",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/7f73e46625f508a793700f5110b86f1a53341d6e.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/1db42b7fe3878f3f5f7a4f2dc210772fd080e205.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs-2009": {
Expand All @@ -123,10 +123,23 @@
"homepage": null,
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693",
"sha256": "156f48manydh8sbrs8j97mzvwdz2zaw51xlm0grrrnns5wa5aaln",
"rev": "46d1c3f28ca991601a53e9a14fdd53fcd3dd8416",
"sha256": "1h7lfhqws2cf8zg30fj8pakh4aw0id3m9yjpgn21scdv2nwkyyxa",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/46d1c3f28ca991601a53e9a14fdd53fcd3dd8416.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs-2105": {
"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/f02bf8ffb9a5ec5e8f6f66f1e5544fd2aa1a0693.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs-unstable": {
Expand All @@ -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/<owner>/<repo>/archive/<rev>.tar.gz"
},
"old-ghc-nix": {
Expand Down
2 changes: 2 additions & 0 deletions overlays/emscripten.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hey @michaelpj, I think I got rid of all occurrences of nixpkgs-2003 or R2003, except for this one. The comment above mine is a bit worrying.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, this is a bit worrying. I also don't know what to do about this.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will need to keep a nixpkgs-2003 pin for now

pkgs-2003 = import final.haskell-nix.sources.nixpkgs-2003 {
system = final.stdenv.system;
overlays = [(final: prev: with final; {
Expand Down
4 changes: 2 additions & 2 deletions release.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down