Skip to content

Bump nixpkgs pins, add 22.11 to CI #1815

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.

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 35 commits into from
Feb 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
0f8f5c5
Bump nixpkgs pins, add 22.11 to CI
hamishmack Dec 14, 2022
fbb9445
Bump nixpkgs pins, add 22.11 to CI
hamishmack Dec 14, 2022
ad8c6c6
Bump nixpkgs pins
hamishmack Jan 13, 2023
cdc5d5a
Bump nixpkgs pins
hamishmack Jan 15, 2023
ce7dce2
Remove references to old pkgconfig packages
hamishmack Jan 15, 2023
eb355da
Merge remote-tracking branch 'origin/master' into hkm/nixpkgs-update
hamishmack Jan 23, 2023
f6ff5b0
Bump nixpkgs
hamishmack Jan 23, 2023
85f3d82
Merge remote-tracking branch 'origin/master' into hkm/nixpkgs-update
hamishmack Jan 24, 2023
b22d3e3
Fixes for latest nixpkgs
hamishmack Jan 25, 2023
95c5f06
Merge remote-tracking branch 'origin/master' into hkm/nixpkgs-update
hamishmack Jan 25, 2023
1f8d043
Merge remote-tracking branch 'origin/master' into hkm/nixpkgs-update
hamishmack Jan 31, 2023
f9d710c
ifdLevel 1
hamishmack Feb 1, 2023
65332cb
Bump nixpkgs pins
hamishmack Feb 2, 2023
13c3150
Remove top level required jobs
hamishmack Feb 5, 2023
fa38a71
ifdLevel 2
hamishmack Feb 5, 2023
de2b663
ifdLevel 3
hamishmack Feb 6, 2023
b70628e
Merge remote-tracking branch 'origin/master' into hkm/nixpkgs-update
hamishmack Feb 7, 2023
e39d9c8
ifdLevel 1
hamishmack Feb 7, 2023
493e743
Merge remote-tracking branch 'origin/master' into hkm/nixpkgs-update
hamishmack Feb 9, 2023
19edf06
ifdLevel 0
hamishmack Feb 9, 2023
942d14c
Bump nixpkgs used in default.nix
hamishmack Feb 9, 2023
910235d
Build ghc 9.4.4 not 9.4.3 in ci for R2211
hamishmack Feb 9, 2023
b09c179
Just build ghc 8.10.7
hamishmack Feb 10, 2023
920cbf3
Just build ghc 8.10.7
hamishmack Feb 10, 2023
7472fa6
Merge remote-tracking branch 'origin/master' into hkm/nixpkgs-update
hamishmack Feb 10, 2023
50b414d
Recreate flake.lock
hamishmack Feb 10, 2023
50d599c
Include newer ghc versions
hamishmack Feb 10, 2023
0bb5c1e
Skip ghc 9.4 until 9.0 is built
hamishmack Feb 10, 2023
b1e5900
ifdLevel 1
hamishmack Feb 11, 2023
fefccac
ifdLevel 2
hamishmack Feb 11, 2023
faf83bf
Add ghc 9.4
hamishmack Feb 11, 2023
f3fdc5a
ifdLevel 1
hamishmack Feb 11, 2023
2b2abd4
ifdLevel 2
hamishmack Feb 12, 2023
2975697
ifdLevel 3
hamishmack Feb 12, 2023
3da4c28
Merge remote-tracking branch 'origin/master' into hkm/nixpkgs-update
hamishmack Feb 12, 2023
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
8 changes: 7 additions & 1 deletion ci.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
inherit (pkgs.haskell-nix) sources;
nixpkgsVersions = {
"R2205" = "nixpkgs-2205";
"R2211" = "nixpkgs-2211";
"unstable" = "nixpkgs-unstable";
};
haskellNix = compat { inherit checkMaterialization system; };
Expand Down Expand Up @@ -49,12 +50,17 @@
nixpkgs.lib.optionalAttrs (nixpkgsName == "R2205") {
ghc865 = false;
ghc8107 = false;
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2211") {
ghc865 = false;
ghc8107 = false;
ghc902 = false;
ghc925 = false;
ghc944 = false;
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
ghc865 = false;
ghc884 = false; # Native version is used to boot 9.0.1
ghc8107 = true;
ghc902 = false;
ghc924 = false;
ghc925 = true;
ghc944 = true;
}));
Expand Down
2 changes: 1 addition & 1 deletion default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

let
pins = (__fromJSON (__readFile ./flake.lock)).nodes;
nixpkgsPin = pins.nixpkgs-2205.locked;
nixpkgsPin = pins.nixpkgs-2211.locked;
flakeCompatPin = pins.flake-compat.locked;
nixpkgsSrc =
builtins.fetchTarball {
Expand Down
168 changes: 93 additions & 75 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,6 @@
) (names allJobs));
in {
latest = allJobs.unstable.ghc8107.native or {};
required = legacyPackages.releaseTools.aggregate {
name = "required for CI";
constituents = builtins.attrValues requiredJobs;
};
} // requiredJobs;

hydraJobs = ciJobs;
Expand Down
Loading