Skip to content

Commit 02566f7

Browse files
committed
use 2.25-maintenance branch for nix_2_25
1 parent 3cf0c56 commit 02566f7

File tree

3 files changed

+25
-1
lines changed

3 files changed

+25
-1
lines changed

flake.lock

Lines changed: 18 additions & 0 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
@@ -29,6 +29,8 @@
2929
nix-darwin.url = "github:qowoz/nix-darwin/darwin-sudo";
3030
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
3131
nix-index-database.url = "github:nix-community/nix-index-database";
32+
nix.flake = false;
33+
nix.url = "github:NixOS/nix/2.25-maintenance";
3234
nixos-facter-modules.url = "github:nix-community/nixos-facter-modules";
3335
nixpkgs-update-github-releases.flake = false;
3436
nixpkgs-update-github-releases.url = "github:nix-community/nixpkgs-update-github-releases";

modules/nixos/cgroups.nix

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
{
2+
inputs,
23
pkgs,
34
...
45
}:
56
{
67
nix = {
7-
package = pkgs.nixVersions.nix_2_25;
8+
package = pkgs.nixVersions.nix_2_25.overrideAttrs (o: {
9+
version = o.version + inputs.nix.shortRev;
10+
src = inputs.nix;
11+
});
812

913
settings = {
1014
experimental-features = [

0 commit comments

Comments
 (0)