Skip to content

Commit ae6ed05

Browse files
authored
node22: bump (#465)
2 parents b6811df + fb16671 commit ae6ed05

File tree

3 files changed

+46
-5
lines changed

3 files changed

+46
-5
lines changed

flake.lock

Lines changed: 34 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: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
inputs.nixpkgs-23_05.url = "github:nixos/nixpkgs/nixos-23.05";
44
inputs.nixpkgs-24_11.url = "github:nixos/nixpkgs/nixos-24.11";
55
inputs.nixpkgs-25_05.url = "github:nixos/nixpkgs/nixos-25.05";
6+
inputs.nixpkgs-master.url = "github:nixos/nixpkgs/master";
7+
inputs.nixpkgs-staging.url = "github:nixos/nixpkgs/staging-next";
68
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
79
inputs.fenix.url = "github:nix-community/fenix";
810
inputs.fenix.inputs.nixpkgs.follows = "nixpkgs";
@@ -17,7 +19,7 @@
1719
inputs.replit-rtld-loader.url = "github:replit/replit_rtld_loader";
1820
inputs.replit-rtld-loader.inputs.nixpkgs.follows = "nixpkgs";
1921

20-
outputs = { self, nixpkgs, nixpkgs-23_05, nixpkgs-24_11, nixpkgs-25_05, prybar, java-language-server, nil, fenix, replit-rtld-loader, ... }:
22+
outputs = { self, nixpkgs, nixpkgs-23_05, nixpkgs-24_11, nixpkgs-25_05, nixpkgs-master, nixpkgs-staging, prybar, java-language-server, nil, fenix, replit-rtld-loader, ... }:
2123
let
2224
mkPkgs = nixpkgs-spec: system: import nixpkgs-spec {
2325
inherit system;
@@ -38,6 +40,9 @@
3840
pkgs-23_05 = mkPkgs nixpkgs-23_05 "x86_64-linux";
3941
pkgs-24_11 = mkPkgs nixpkgs-24_11 "x86_64-linux";
4042
pkgs-25_05 = mkPkgs nixpkgs-25_05 "x86_64-linux";
43+
# TODO: once nodejs update lands in unstable, switch to that
44+
pkgs-master = mkPkgs nixpkgs-master "x86_64-linux";
45+
pkgs-staging = mkPkgs nixpkgs-staging "x86_64-linux";
4146

4247
patched-unstable = nixpkgs.legacyPackages.x86_64-linux.applyPatches {
4348
name = "nixpkgs-unstable-patched";
@@ -120,6 +125,8 @@
120125
inherit pkgs-23_05;
121126
inherit pkgs-24_11;
122127
inherit pkgs-25_05;
128+
inherit pkgs-master;
129+
inherit pkgs-staging;
123130
}
124131
);
125132
}

pkgs/modules/default.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ pkgs, pkgs-23_05, pkgs-24_11, pkgs-25_05 }:
1+
{ pkgs, pkgs-23_05, pkgs-24_11, pkgs-25_05, pkgs-master, pkgs-staging, ... }:
22
with builtins;
33
let
44
mkModule = path: pkgs.callPackage ../moduleit/entrypoint.nix {
@@ -54,16 +54,16 @@ let
5454
nodejs = pkgs-24_11.nodejs-18_x;
5555
})
5656
(import ./nodejs {
57-
nodejs = pkgs.nodejs_20;
57+
nodejs = pkgs-master.nodejs_20;
5858
})
5959
(import ./nodejs {
60-
nodejs = pkgs.nodejs_22;
60+
nodejs = pkgs-master.nodejs_22;
6161
})
6262
(import ./nodejs {
6363
nodejs = pkgs-24_11.nodejs_23;
6464
})
6565
(import ./nodejs {
66-
nodejs = pkgs.nodejs_24;
66+
nodejs = pkgs-staging.nodejs_24;
6767
})
6868
(import ./nodejs-with-prybar {
6969
nodejs = pkgs-24_11.nodejs-18_x;

0 commit comments

Comments
 (0)