Skip to content

Commit 26e3f44

Browse files
Add nixpkgs-2311 and update other nispkgs pins (#2120)
* ghc8*: backport GCC inline fix * Pin sphinx to v5 for NixOS 23.11 * Add nixpkgs-2311 and update other nixpkgs pins --------- Co-authored-by: Jonathan Ringer <[email protected]>
1 parent 0992b04 commit 26e3f44

File tree

12 files changed

+7709
-21
lines changed

12 files changed

+7709
-21
lines changed

ci.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"R2205" = inputs.nixpkgs-2205;
2222
"R2211" = inputs.nixpkgs-2211;
2323
"R2305" = inputs.nixpkgs-2305;
24+
"R2311" = inputs.nixpkgs-2311;
2425
"unstable" = inputs.nixpkgs-unstable;
2526
};
2627

@@ -59,6 +60,7 @@
5960
ghc810 = false;
6061
ghc90 = false;
6162
ghc92 = false;
63+
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2311") {
6264
ghc94 = false;
6365
ghc96 = false;
6466
ghc98 = false;
@@ -71,7 +73,7 @@
7173
ghc96llvm = true;
7274
ghc98 = true;
7375
ghc98llvm = true;
74-
ghc98X = true;
76+
# ghc98X = true; Disabled for now as there are no changes since 9.8.1 release yet and the current source does not boot with 9.8.1
7577
ghc99 = true;
7678
})));
7779
crossSystems = nixpkgsName: nixpkgs: compiler-nix-name:
@@ -86,7 +88,7 @@
8688
|| (system == "aarch64-darwin" && !builtins.elem compiler-nix-name ["ghc884" "ghc902" "ghc928" "ghc948"])
8789
)) {
8890
inherit (lib.systems.examples) ghcjs;
89-
} // lib.optionalAttrs (nixpkgsName == "unstable"
91+
} // lib.optionalAttrs (nixpkgsName != "unstable"
9092
&& (__match ".*llvm" compiler-nix-name == null)
9193
&& ((system == "x86_64-linux" && !builtins.elem compiler-nix-name ["ghc884"])
9294
|| (system == "x86_64-darwin" && builtins.elem compiler-nix-name []))) { # TODO add ghc versions when we have more darwin build capacity

flake.lock

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

flake.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
nixpkgs-2205 = { url = "github:NixOS/nixpkgs/nixpkgs-22.05-darwin"; };
1010
nixpkgs-2211 = { url = "github:NixOS/nixpkgs/nixpkgs-22.11-darwin"; };
1111
nixpkgs-2305 = { url = "github:NixOS/nixpkgs/nixpkgs-23.05-darwin"; };
12+
nixpkgs-2311 = { url = "github:NixOS/nixpkgs/nixpkgs-23.11-darwin"; };
1213
nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; };
1314
ghc98X = {
1415
flake = false;
@@ -85,6 +86,7 @@
8586
, nixpkgs-2205
8687
, nixpkgs-2211
8788
, nixpkgs-2305
89+
, nixpkgs-2311
8890
, flake-compat
8991
, ...
9092
}@inputs:

materialized/dummy-ghc/ghc-9.8.1-x86_64-linux/ghc/info

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)