diff --git a/main/flake.lock b/main/flake.lock index b398f91..73900fd 100644 --- a/main/flake.lock +++ b/main/flake.lock @@ -198,6 +198,22 @@ "type": "github" } }, + "nixpkgs-unstable-2024-04-03": { + "locked": { + "lastModified": 1712143413, + "narHash": "sha256-kI6WYXuj8/2AtBF4o0gYnkYNO1xtc6PaPbW/qmaV67A=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "62e885a4013446453b10fd7780eba4337f6f42e0", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "62e885a4013446453b10fd7780eba4337f6f42e0", + "type": "github" + } + }, "nixpkgs-unstable-2024-05-30": { "locked": { "lastModified": 1717070961, @@ -228,6 +244,7 @@ "nixpkgs-stable-2023-07-25": "nixpkgs-stable-2023-07-25", "nixpkgs-unstable-2023-10-21": "nixpkgs-unstable-2023-10-21", "nixpkgs-unstable-2024-02-20": "nixpkgs-unstable-2024-02-20", + "nixpkgs-unstable-2024-04-03": "nixpkgs-unstable-2024-04-03", "nixpkgs-unstable-2024-05-30": "nixpkgs-unstable-2024-05-30" } }, diff --git a/main/flake.nix b/main/flake.nix index 195f986..f852e2c 100644 --- a/main/flake.nix +++ b/main/flake.nix @@ -10,6 +10,7 @@ nixpkgs-master-2024-01-27.url = "github:nixos/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb"; nixpkgs-unstable-2023-10-21.url = "github:nixos/nixpkgs/038b2922be3fc096e1d456f93f7d0f4090628729"; nixpkgs-unstable-2024-02-20.url = "github:nixos/nixpkgs/b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa"; + nixpkgs-unstable-2024-04-03.url = "github:nixos/nixpkgs/62e885a4013446453b10fd7780eba4337f6f42e0"; nixpkgs-unstable-2024-05-30.url = "github:nixos/nixpkgs/aa61b27554a5fc282758bf0324781e3464ef2cde"; flake-utils.url = "github:numtide/flake-utils"; nix-github-actions.url = "github:nix-community/nix-github-actions"; diff --git a/main/nodejs/checks.nix b/main/nodejs/checks.nix index 854548b..5665c90 100644 --- a/main/nodejs/checks.nix +++ b/main/nodejs/checks.nix @@ -50,6 +50,7 @@ in nodejs-16-20-2 = nodeCheck { packageName = "nodejs-16-20-2"; node = "16.20.2"; yarn = "1.22.19"; pnpm = "8.5.1"; }; nodejs-18-17-1 = nodeCheck { packageName = "nodejs-18-17-1"; node = "18.17.1"; yarn = "1.22.19"; pnpm = "8.6.12"; }; nodejs-18-18-0 = nodeCheck { packageName = "nodejs-18-18-0"; node = "18.18.0"; yarn = "1.22.19"; pnpm = "8.8.0"; }; + nodejs-18-19-1 = nodeCheck { packageName = "nodejs-18-19-1"; node = "18.19.1"; yarn = "1.22.22"; pnpm = "8.15.5"; }; nodejs-18-20-2 = nodeCheck { packageName = "nodejs-18-20-2"; node = "18.20.2"; yarn = "1.22.22"; pnpm = "8.15.5"; }; nodejs-20-11-0 = nodeCheck { packageName = "nodejs-20-11-0"; node = "20.11.0"; yarn = "1.22.19"; pnpm = "8.14.0"; }; nodejs-20-11-1 = nodeCheck { packageName = "nodejs-20-11-1"; node = "20.11.1"; yarn = "1.22.19"; pnpm = "8.15.1"; }; diff --git a/main/nodejs/v18.nix b/main/nodejs/v18.nix index e21170b..489dfc8 100644 --- a/main/nodejs/v18.nix +++ b/main/nodejs/v18.nix @@ -7,6 +7,7 @@ rec { nodejs-18-17-x = nodejs-18-17-1; nodejs-18-18-x = nodejs-18-18-0; + nodejs-18-19-x = nodejs-18-19-1; nodejs-18-20-x = nodejs-18-20-2; nodejs-18-17-1 = ( @@ -45,6 +46,24 @@ rec { } ); + nodejs-18-19-1 = ( + let + nixpkgs = import inputs.nixpkgs-unstable-2024-04-03 { inherit system; config = { }; }; + nodejs = nixpkgs.nodejs_18; + yarn = nixpkgs.yarn.override { inherit nodejs; }; + pnpm = nixpkgs.nodePackages.pnpm.override { inherit nodejs; }; + pnpm-bin = runCommand "pnpm" { } '' + mkdir -p "$out/bin" + ln -s "${pnpm}/lib/node_modules/.bin/pnpm" "$out/bin/pnpm" + ln -s "${pnpm}/lib/node_modules/.bin/pnpx" "$out/bin/pnpx" + ''; + in + symlinkJoin { + name = "nodejs"; + paths = [ nodejs pnpm pnpm-bin yarn ]; + } + ); + nodejs-18-20-2 = ( let nixpkgs = import inputs.nixpkgs-unstable-2024-05-30 { inherit system; config = { }; };