Skip to content

Commit d5e28de

Browse files
committed
Bump nixpkgs pins and add 24.05
1 parent f7fc6f4 commit d5e28de

File tree

3 files changed

+28
-8
lines changed

3 files changed

+28
-8
lines changed

ci.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"R2211" = inputs.nixpkgs-2211;
2323
"R2305" = inputs.nixpkgs-2305;
2424
"R2311" = inputs.nixpkgs-2311;
25+
"R2405" = inputs.nixpkgs-2405;
2526
"unstable" = inputs.nixpkgs-unstable;
2627
};
2728

@@ -56,7 +57,7 @@
5657
# cabal-install and nix-tools plans. When removing a ghc version
5758
# from here (so that is no longer cached) also remove ./materialized/ghcXXX.
5859
# Update supported-ghc-versions.md to reflect any changes made here.
59-
nixpkgs.lib.optionalAttrs (nixpkgsName == "R2311") {
60+
nixpkgs.lib.optionalAttrs (nixpkgsName == "R2405") {
6061
ghc94 = false;
6162
ghc96 = false;
6263
ghc98 = false;

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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
nixpkgs-2211 = { url = "github:NixOS/nixpkgs/nixpkgs-22.11-darwin"; };
1111
nixpkgs-2305 = { url = "github:NixOS/nixpkgs/nixpkgs-23.05-darwin"; };
1212
nixpkgs-2311 = { url = "github:NixOS/nixpkgs/nixpkgs-23.11-darwin"; };
13+
nixpkgs-2405 = { url = "github:NixOS/nixpkgs/nixpkgs-24.05-darwin"; };
1314
nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; };
1415
flake-compat = { url = "github:input-output-hk/flake-compat/hkm/gitlab-fix"; flake = false; };
1516
"hls-1.10" = { url = "github:haskell/haskell-language-server/1.10.0.0"; flake = false; };
@@ -82,13 +83,14 @@
8283
, nixpkgs-2211
8384
, nixpkgs-2305
8485
, nixpkgs-2311
86+
, nixpkgs-2405
8587
, flake-compat
8688
, ...
8789
}@inputs:
8890
let
8991
callFlake = import flake-compat;
9092

91-
ifdLevel = 1;
93+
ifdLevel = 0;
9294
compiler = "ghc928";
9395
config = import ./config.nix;
9496

0 commit comments

Comments
 (0)