Skip to content

Commit 1487a69

Browse files
committed
Add nixpkgs-2411 and update other nixpkgs pins
1 parent 3b06ae8 commit 1487a69

File tree

4 files changed

+30
-8
lines changed

4 files changed

+30
-8
lines changed

ci.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"R2305" = inputs.nixpkgs-2305;
2424
"R2311" = inputs.nixpkgs-2311;
2525
"R2405" = inputs.nixpkgs-2405;
26+
"R2411" = inputs.nixpkgs-2411;
2627
"unstable" = inputs.nixpkgs-unstable;
2728
};
2829

@@ -61,7 +62,7 @@
6162
# cabal-install and nix-tools plans. When removing a ghc version
6263
# from here (so that is no longer cached) also remove ./materialized/ghcXXX.
6364
# Update supported-ghc-versions.md to reflect any changes made here.
64-
nixpkgs.lib.optionalAttrs (nixpkgsName == "R2405") {
65+
nixpkgs.lib.optionalAttrs (nixpkgsName == "R2411") {
6566
ghc96 = false;
6667
ghc98 = false;
6768
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {

default.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ self // {
9494
pkgs-2405 = import self.inputs.nixpkgs-2405 (nixpkgsArgs // {
9595
localSystem = { inherit system; };
9696
});
97+
pkgs-2411 = import self.inputs.nixpkgs-2411 (nixpkgsArgs // {
98+
localSystem = { inherit system; };
99+
});
97100
pkgs-unstable = import self.inputs.nixpkgs-unstable (nixpkgsArgs // {
98101
localSystem = { inherit system; };
99102
});

flake.lock

Lines changed: 23 additions & 6 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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
nixpkgs-2305 = { url = "github:NixOS/nixpkgs/nixpkgs-23.05-darwin"; };
1212
nixpkgs-2311 = { url = "github:NixOS/nixpkgs/nixpkgs-23.11-darwin"; };
1313
nixpkgs-2405 = { url = "github:NixOS/nixpkgs/nixpkgs-24.05-darwin"; };
14+
nixpkgs-2411 = { url = "github:NixOS/nixpkgs/nixpkgs-24.11-darwin"; };
1415
nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; };
1516
flake-compat = { url = "github:input-output-hk/flake-compat/hkm/gitlab-fix"; flake = false; };
1617
"hls-1.10" = { url = "github:haskell/haskell-language-server/1.10.0.0"; flake = false; };
@@ -83,7 +84,7 @@
8384
let
8485
callFlake = import flake-compat;
8586

86-
ifdLevel = 3;
87+
ifdLevel = 0;
8788
runningHydraEvalTest = false;
8889
defaultCompiler = "ghc928";
8990
config = import ./config.nix;

0 commit comments

Comments
 (0)