Skip to content

Commit 4413b6a

Browse files
authored
Bump nixpkgs pins, add 22.11 to CI (#1815)
* Bump nixpkgs pins, add 22.11 to CI * Bump nixpkgs pins, add 22.11 to CI * Bump nixpkgs pins * Bump nixpkgs pins * Remove references to old pkgconfig packages * Bump nixpkgs * Fixes for latest nixpkgs * ifdLevel 1 * Bump nixpkgs pins * Remove top level required jobs * ifdLevel 2 * ifdLevel 3 * ifdLevel 1 * ifdLevel 0 * Bump nixpkgs used in default.nix * Build ghc 9.4.4 not 9.4.3 in ci for R2211 * Just build ghc 8.10.7 * Just build ghc 8.10.7 * Recreate flake.lock * Include newer ghc versions * Skip ghc 9.4 until 9.0 is built * ifdLevel 1 * ifdLevel 2 * Add ghc 9.4 * ifdLevel 1 * ifdLevel 2 * ifdLevel 3
1 parent 3bda280 commit 4413b6a

File tree

6 files changed

+118
-92
lines changed

6 files changed

+118
-92
lines changed

ci.nix

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
inherit (pkgs.haskell-nix) sources;
1414
nixpkgsVersions = {
1515
"R2205" = "nixpkgs-2205";
16+
"R2211" = "nixpkgs-2211";
1617
"unstable" = "nixpkgs-unstable";
1718
};
1819
haskellNix = compat { inherit checkMaterialization system; };
@@ -49,12 +50,17 @@
4950
nixpkgs.lib.optionalAttrs (nixpkgsName == "R2205") {
5051
ghc865 = false;
5152
ghc8107 = false;
53+
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2211") {
54+
ghc865 = false;
55+
ghc8107 = false;
56+
ghc902 = false;
57+
ghc925 = false;
58+
ghc944 = false;
5259
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
5360
ghc865 = false;
5461
ghc884 = false; # Native version is used to boot 9.0.1
5562
ghc8107 = true;
5663
ghc902 = false;
57-
ghc924 = false;
5864
ghc925 = true;
5965
ghc944 = true;
6066
}));

default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
let
44
pins = (__fromJSON (__readFile ./flake.lock)).nodes;
5-
nixpkgsPin = pins.nixpkgs-2205.locked;
5+
nixpkgsPin = pins.nixpkgs-2211.locked;
66
flakeCompatPin = pins.flake-compat.locked;
77
nixpkgsSrc =
88
builtins.fetchTarball {

flake.lock

Lines changed: 93 additions & 75 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,6 @@
177177
) (names allJobs));
178178
in {
179179
latest = allJobs.unstable.ghc8107.native or {};
180-
required = legacyPackages.releaseTools.aggregate {
181-
name = "required for CI";
182-
constituents = builtins.attrValues requiredJobs;
183-
};
184180
} // requiredJobs;
185181

186182
hydraJobs = ciJobs;

0 commit comments

Comments
 (0)