diff --git a/flake.nix b/flake.nix index da653a7..d6dcb7e 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,7 @@ default = pkgs.buildNpmPackage { pname = "spacebar-server-ts"; name = "spacebar-server-ts"; + nodejs = pkgs.nodejs_24; meta = with lib; { description = "Spacebar server, a FOSS reimplementation of the Discord backend."; @@ -53,7 +54,7 @@ cp -r assets dist node_modules package.json $out/ for i in dist/**/start.js do - makeWrapper ${pkgs.nodejs}/bin/node $out/bin/start-`dirname ''${i/dist\//}` --prefix NODE_PATH : $out/node_modules --add-flags $out/$i + makeWrapper ${pkgs.nodejs_24}/bin/node $out/bin/start-`dirname ''${i/dist\//}` --prefix NODE_PATH : $out/node_modules --add-flags $out/$i done set +x @@ -72,7 +73,7 @@ ]; text = '' rm -rf node_modules - ${pkgs.nodejs}/bin/npm install --save + ${pkgs.nodejs_24}/bin/npm install --save DEPS_HASH=$(prefetch-npm-deps package-lock.json) TMPFILE=$(mktemp) jq '.npmDepsHash = "'"$DEPS_HASH"'"' hashes.json > "$TMPFILE" @@ -105,7 +106,7 @@ devShells.default = pkgs.mkShell { buildInputs = with pkgs; [ - nodejs + nodejs_24 nodePackages.typescript nodePackages.ts-node nodePackages.patch-package diff --git a/hashes.json b/hashes.json index c29cf60..2f9f9e5 100644 --- a/hashes.json +++ b/hashes.json @@ -1,3 +1,3 @@ { - "npmDepsHash": "sha256-945XQ3BPGLOtyqRWE/fy97lgUdKhZrhh9YOKiI8uFLU=" + "npmDepsHash": "sha256-oNUs+CD/ZDcOdWoBKFDCHxaqqmUiZGzdkgpHTbAl6yk=" } diff --git a/package-lock.json b/package-lock.json index ebe0fca..d1db30a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -69,7 +69,7 @@ "@types/morgan": "^1.9.10", "@types/multer": "^2.0.0", "@types/murmurhash-js": "^1.0.6", - "@types/node": "^22.18.6", + "@types/node": "^24.6.0", "@types/node-fetch": "^2.6.13", "@types/node-os-utils": "^1.3.4", "@types/nodemailer": "^7.0.2", @@ -3605,12 +3605,12 @@ } }, "node_modules/@types/node": { - "version": "22.18.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.6.tgz", - "integrity": "sha512-r8uszLPpeIWbNKtvWRt/DbVi5zbqZyj1PTmhRMqBMvDnaz1QpmSKujUtJLrqGZeoM8v72MfYggDceY4K1itzWQ==", + "version": "24.6.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.6.0.tgz", + "integrity": "sha512-F1CBxgqwOMc4GKJ7eY22hWhBVQuMYTtqI8L0FcszYcpYX0fzfDGpez22Xau8Mgm7O9fI+zA/TYIdq3tGWfweBA==", "license": "MIT", "dependencies": { - "undici-types": "~6.21.0" + "undici-types": "~7.13.0" } }, "node_modules/@types/node-fetch": { @@ -11287,9 +11287,9 @@ } }, "node_modules/undici-types": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", - "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.13.0.tgz", + "integrity": "sha512-Ov2Rr9Sx+fRgagJ5AX0qvItZG/JKKoBRAVITs1zk7IqZGTJUwgUr7qoYBpWwakpWilTZFM98rG/AFRocu10iIQ==", "license": "MIT" }, "node_modules/unique-filename": { diff --git a/package.json b/package.json index f13ed83..a7bde5a 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@types/morgan": "^1.9.10", "@types/multer": "^2.0.0", "@types/murmurhash-js": "^1.0.6", - "@types/node": "^22.18.6", + "@types/node": "^24.6.0", "@types/node-fetch": "^2.6.13", "@types/node-os-utils": "^1.3.4", "@types/nodemailer": "^7.0.2",