diff --git a/pkgs/by-name/do/dokieli/package.nix b/pkgs/by-name/do/dokieli/package.nix index 5aed586fdfc5..20f9cae11f7d 100644 --- a/pkgs/by-name/do/dokieli/package.nix +++ b/pkgs/by-name/do/dokieli/package.nix @@ -3,7 +3,7 @@ fetchFromGitHub, makeWrapper, nix-update-script, - nodePackages, + serve, stdenv, xsel, yarn-berry_4, @@ -42,15 +42,11 @@ stdenv.mkDerivation (finalAttrs: { yarn-berry.yarnBerryConfigHook ]; - postFixup = - let - serve = lib.getExe' nodePackages.serve "serve"; - in - '' - makeWrapper ${serve} $out/bin/dokieli \ - --prefix PATH : ${lib.makeBinPath [ xsel ]} \ - --chdir $out - ''; + postFixup = '' + makeWrapper ${lib.getExe serve} $out/bin/dokieli \ + --prefix PATH : ${lib.makeBinPath [ xsel ]} \ + --chdir $out + ''; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; diff --git a/pkgs/by-name/se/serve/package.nix b/pkgs/by-name/se/serve/package.nix new file mode 100644 index 000000000000..342c0f367280 --- /dev/null +++ b/pkgs/by-name/se/serve/package.nix @@ -0,0 +1,44 @@ +{ + buildNpmPackage, + fetchFromGitHub, + lib, + makeWrapper, + nodejs, + pnpm_9, +}: + +buildNpmPackage (finalAttrs: { + pname = "serve"; + version = "14.2.4"; + + src = fetchFromGitHub { + owner = "vercel"; + repo = "serve"; + tag = finalAttrs.version; + hash = "sha256-QVbau4MrpgEQkwlWx4tU9H93zdM0mSZgIzXpjHRM5mk="; + }; + + npmDeps = null; + pnpmDeps = pnpm_9.fetchDeps { + inherit (finalAttrs) pname version src; + fetcherVersion = 2; + hash = "sha256-IJMu0XHwEn2TZP/He79FFGl/PeXOCTD51lIgmImpyKo="; + }; + + npmConfigHook = pnpm_9.configHook; + + dontNpmBuild = true; + + # takes too long to finish + dontNpmPrune = true; + + meta = { + description = "Static file serving and directory listing"; + homepage = "https://github.com/vercel/serve"; + downloadPage = "https://github.com/vercel/serve/releases"; + changelog = "https://github.com/vercel/serve/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ prince213 ]; + mainProgram = "serve"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index c8e24794e2c1..523735e7c897 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -191,6 +191,7 @@ mapAliases { rollup = throw "rollup has been removed because it was broken"; # added 2025-04-28 inherit (pkgs) rtlcss; # added 2023-08-29 s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18 + inherit (pkgs) serve; # added 2025-08-27 inherit (pkgs) serverless; # Added 2023-11-29 shout = throw "shout was removed because it was deprecated upstream in favor of thelounge."; # Added 2024-10-19 inherit (pkgs) snyk; # Added 2023-08-30 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 9167fa3d6624..9ace13598dd7 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -139,7 +139,6 @@ , "rimraf" , "sass" , "semver" -, "serve" , "sloc" , "smartdc" , "speed-test" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 8e8fa9375329..fdb5911a3af1 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -62110,136 +62110,6 @@ in bypassCache = true; reconstructLock = true; }; - serve = nodeEnv.buildNodePackage { - name = "serve"; - packageName = "serve"; - version = "14.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-14.2.4.tgz"; - sha512 = "qy1S34PJ/fcY8gjVGszDB3EXiPSk5FKhUa7tQe0UPRddxRidc2V6cNHPNewbE1D7MAkgLuWEt3Vw56vYy73tzQ=="; - }; - dependencies = [ - sources."@zeit/schemas-2.36.0" - sources."accepts-1.3.8" - sources."ajv-8.12.0" - ( - sources."ansi-align-3.0.1" - // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - } - ) - sources."ansi-regex-6.1.0" - sources."ansi-styles-6.2.1" - sources."arch-2.2.0" - sources."arg-5.0.2" - sources."balanced-match-1.0.2" - sources."boxen-7.0.0" - sources."brace-expansion-1.1.11" - sources."bytes-3.0.0" - sources."camelcase-7.0.1" - sources."chalk-5.0.1" - ( - sources."chalk-template-0.4.0" - // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - ]; - } - ) - sources."cli-boxes-3.0.0" - sources."clipboardy-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."compressible-2.0.18" - sources."compression-1.7.4" - sources."concat-map-0.0.1" - sources."content-disposition-0.5.2" - sources."cross-spawn-7.0.6" - sources."debug-2.6.9" - sources."deep-extend-0.6.0" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-8.0.0" - sources."execa-5.1.1" - sources."fast-deep-equal-3.1.3" - sources."get-stream-6.0.1" - sources."has-flag-4.0.0" - sources."human-signals-2.1.0" - sources."ini-1.3.8" - sources."is-docker-2.2.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-port-reachable-4.0.0" - sources."is-stream-2.0.1" - sources."is-wsl-2.2.0" - sources."isexe-2.0.0" - sources."json-schema-traverse-1.0.0" - sources."merge-stream-2.0.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."ms-2.0.0" - sources."negotiator-0.6.3" - sources."npm-run-path-4.0.1" - sources."on-headers-1.0.2" - sources."onetime-5.1.2" - sources."path-is-inside-1.0.2" - sources."path-key-3.1.1" - sources."path-to-regexp-3.3.0" - sources."punycode-2.3.1" - sources."range-parser-1.2.0" - sources."rc-1.2.8" - sources."registry-auth-token-3.3.2" - sources."registry-url-3.1.0" - sources."require-from-string-2.0.2" - sources."safe-buffer-5.1.2" - ( - sources."serve-handler-6.1.6" - // { - dependencies = [ - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" - ]; - } - ) - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.7" - ( - sources."string-width-5.1.2" - // { - dependencies = [ - sources."emoji-regex-9.2.2" - ]; - } - ) - sources."strip-ansi-7.1.0" - sources."strip-final-newline-2.0.0" - sources."strip-json-comments-2.0.1" - sources."supports-color-7.2.0" - sources."type-fest-2.19.0" - sources."update-check-1.5.4" - sources."uri-js-4.4.1" - sources."vary-1.1.2" - sources."which-2.0.2" - sources."widest-line-4.0.1" - sources."wrap-ansi-8.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Static file serving and directory listing"; - homepage = "https://github.com/vercel/serve#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; sloc = nodeEnv.buildNodePackage { name = "sloc"; packageName = "sloc";