Skip to content

Commit 5006680

Browse files
committed
Add nixpkgs-2505
1 parent 339479e commit 5006680

File tree

4 files changed

+29
-7
lines changed

4 files changed

+29
-7
lines changed

ci.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
# short names for nixpkgs versions
2020
nixpkgsVersions = {
2121
"R2411" = inputs.nixpkgs-2411;
22+
"R2505" = inputs.nixpkgs-2505;
2223
"unstable" = inputs.nixpkgs-unstable;
2324
};
2425

@@ -57,7 +58,7 @@
5758
# cabal-install and nix-tools plans. When removing a ghc version
5859
# from here (so that is no longer cached) also remove ./materialized/ghcXXX.
5960
# Update supported-ghc-versions.md to reflect any changes made here.
60-
nixpkgs.lib.optionalAttrs (nixpkgsName == "R2411") {
61+
nixpkgs.lib.optionalAttrs (builtins.elem nixpkgsName ["R2411" "R2505"]) {
6162
ghc96 = true;
6263
ghc98 = true;
6364
ghc910 = true;

default.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ self // {
9797
pkgs-2411 = import self.inputs.nixpkgs-2411 (nixpkgsArgs // {
9898
localSystem = { inherit system; };
9999
});
100+
pkgs-2505 = import self.inputs.nixpkgs-2505 (nixpkgsArgs // {
101+
localSystem = { inherit system; };
102+
});
100103
pkgs-unstable = import self.inputs.nixpkgs-unstable (nixpkgsArgs // {
101104
localSystem = { inherit system; };
102105
});

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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
nixpkgs-2311 = { url = "github:NixOS/nixpkgs/nixpkgs-23.11-darwin"; };
88
nixpkgs-2405 = { url = "github:NixOS/nixpkgs/nixpkgs-24.05-darwin"; };
99
nixpkgs-2411 = { url = "github:NixOS/nixpkgs/nixpkgs-24.11-darwin"; };
10+
nixpkgs-2505 = { url = "github:NixOS/nixpkgs/nixpkgs-25.05-darwin"; };
1011
nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; };
1112
flake-compat = { url = "github:input-output-hk/flake-compat/hkm/gitlab-fix"; flake = false; };
1213
"hls-1.10" = { url = "github:haskell/haskell-language-server/1.10.0.0"; flake = false; };

0 commit comments

Comments
 (0)