upgrade nodejs_18 dependents in prevision for upcoming EOL

This commit is contained in:
Antoine du Hamel 2025-04-17 11:31:58 +02:00
parent 22005dd1da
commit dc8397c07b
No known key found for this signature in database
GPG key ID: 21D900FFDB233756
12 changed files with 18 additions and 18 deletions

View file

@ -489,7 +489,7 @@ in
environment = env;
path = with pkgs; [
nodejs_18
nodejs_20
yarn
ffmpeg-headless
openssl
@ -945,7 +945,7 @@ in
})
(lib.attrsets.setAttrByPath
[ cfg.user "packages" ]
[ peertubeEnv pkgs.nodejs_18 pkgs.yarn pkgs.ffmpeg-headless ]
[ peertubeEnv pkgs.nodejs_20 pkgs.yarn pkgs.ffmpeg-headless ]
)
(lib.mkIf cfg.redis.enableUnixSocket {
${config.services.peertube.user}.extraGroups = [ "redis-peertube" ];

View file

@ -151,7 +151,7 @@ in
WorkingDirectory = "/var/lib/${cfg.stateDirectoryName}";
DynamicUser = true;
PrivateTmp = true;
ExecStart = "${pkgs.nodejs_18}/bin/node ${pkgs.wiki-js}/server";
ExecStart = "${pkgs.nodejs_20}/bin/node ${pkgs.wiki-js}/server";
};
};
};

View file

@ -2,7 +2,7 @@
lib,
buildNpmPackage,
fetchFromGitHub,
nodejs_18,
nodejs_20,
installShellFiles,
makeWrapper,
stdenv,
@ -13,7 +13,7 @@ buildNpmPackage rec {
version = "3.12.0";
nodejs = nodejs_18;
nodejs = nodejs_20;
src = fetchFromGitHub {
owner = "CleverCloud";

View file

@ -2,7 +2,7 @@
lib,
buildNpmPackage,
fetchFromGitHub,
nodejs_18,
nodejs,
nix-update-script,
nixosTests,
}:
@ -10,7 +10,7 @@ buildNpmPackage rec {
pname = "db-rest";
version = "6.1.0";
nodejs = nodejs_18;
inherit nodejs;
src = fetchFromGitHub {
owner = "derhuerst";

View file

@ -10,7 +10,7 @@
fixup-yarn-lock,
jq,
fd,
nodejs_18,
nodejs_20,
which,
yarn,
}:
@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
fd
];
buildInputs = [ nodejs_18 ];
buildInputs = [ nodejs_20 ];
buildPhase = ''
# Build node modules

View file

@ -1,6 +1,6 @@
#!/usr/bin/env nix-shell
/*
#!nix-shell -i node -p nodejs_18
#!nix-shell -i node -p nodejs
*/
import { promises as fs } from 'node:fs';

View file

@ -6,14 +6,14 @@
fetchFromGitHub,
fetchNpmDeps,
mono,
nodejs_18,
nodejs_20,
slskd,
testers,
nix-update-script,
}:
let
nodejs = nodejs_18;
nodejs = nodejs_20;
# https://github.com/NixOS/nixpkgs/blob/d88947e91716390bdbefccdf16f7bebcc41436eb/pkgs/build-support/node/build-npm-package/default.nix#L62
npmHooks = buildPackages.npmHooks.override { inherit nodejs; };
in

View file

@ -2,7 +2,7 @@
pkgs,
lib,
makeWrapper,
nodejs ? pkgs.nodejs_18,
nodejs ? pkgs.nodejs_20,
}:
let

View file

@ -5,7 +5,7 @@
inherit system;
},
system ? builtins.currentSystem,
nodejs ? pkgs."nodejs_18",
nodejs ? pkgs."nodejs_20",
}:
let

View file

@ -5,7 +5,7 @@
inherit system;
},
system ? builtins.currentSystem,
nodejs ? pkgs."nodejs_18",
nodejs ? pkgs."nodejs_20",
}:
let

View file

@ -3,7 +3,7 @@
fetchzip,
fetchYarnDeps,
yarn2nix-moretea,
nodejs_18,
nodejs_20,
dos2unix,
}:
@ -37,7 +37,7 @@ yarn2nix-moretea.mkYarnPackage {
preFixup = ''
mkdir -p $out/bin
chmod a+x $out/libexec/meshcentral/deps/meshcentral/meshcentral.js
sed -i '1i#!${nodejs_18}/bin/node' $out/libexec/meshcentral/deps/meshcentral/meshcentral.js
sed -i '1i#!${nodejs_20}/bin/node' $out/libexec/meshcentral/deps/meshcentral/meshcentral.js
ln -s $out/libexec/meshcentral/deps/meshcentral/meshcentral.js $out/bin/meshcentral
'';

View file

@ -5,7 +5,7 @@
inherit system;
},
system ? builtins.currentSystem,
nodejs ? pkgs.nodejs_18,
nodejs ? pkgs.nodejs_20,
}:
let