From e4c1bb1c21668ee9dc597eb2ce989e58021fe9da Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 13:20:11 -0500 Subject: [PATCH 01/10] nodePackages.ni: alias to pkgs.ni Same package. no need for it to be here. --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 51 ------------------- 4 files changed, 1 insertion(+), 53 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 4846153350fb..48505c180f38 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -33,6 +33,7 @@ let in mapAliases { + "@antfu/ni" = pkgs.ni; # Added 2025-11-08 "@antora/cli" = pkgs.antora; # Added 2023-05-06 "@astrojs/language-server" = pkgs.astro-language-server; # Added 2024-02-12 "@babel/cli" = diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 37347bee4e52..f458fbe78de2 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -1,7 +1,6 @@ # Use this file to add `meta.mainProgram` to packages in `nodePackages`. { # Packages that provide multiple executables where one is clearly the `mainProgram`. - "@antfu/ni" = "ni"; "@microsoft/rush" = "rush"; # Packages that provide a single executable. diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 6b644d17d2ac..ea9336d4cfc3 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -1,6 +1,5 @@ [ "@angular/cli" -, "@antfu/ni" , "@commitlint/cli" , "@microsoft/rush" , "@tailwindcss/aspect-ratio" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index f1f1bbb3dfd6..d1052067781d 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -4224,15 +4224,6 @@ let sha512 = "QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg=="; }; }; - "ansis-3.17.0" = { - name = "ansis"; - packageName = "ansis"; - version = "3.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansis/-/ansis-3.17.0.tgz"; - sha512 = "0qWUglt9JEqLFr3w1I1pbrChn1grhaiAR2ocX1PP/flRmxgtwTzPFFFnfIlD6aMOLQZgSuCRlidD70lvx8yhzg=="; - }; - }; "any-base-1.1.0" = { name = "any-base"; packageName = "any-base"; @@ -11721,15 +11712,6 @@ let sha512 = "vAcPiyomt1ioKAsAL2uxSABHJ4Ju/e4UeDM+g1OlR0vV4YhLGMNsdLNvZTpEDY4JCSt0E4hASCNM5t2ETtsbyg=="; }; }; - "fzf-0.5.2" = { - name = "fzf"; - packageName = "fzf"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fzf/-/fzf-0.5.2.tgz"; - sha512 = "Tt4kuxLXFKHy8KT40zwsUPUkg1CrsgY25FxA2U/j/0WgEDCk3ddc/zLTCCcbSHX9FcKtLuVaDGtGE/STWC+j3Q=="; - }; - }; "gauge-2.7.4" = { name = "gauge"; packageName = "gauge"; @@ -20280,15 +20262,6 @@ let sha512 = "UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="; }; }; - "package-manager-detector-1.0.0" = { - name = "package-manager-detector"; - packageName = "package-manager-detector"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.0.0.tgz"; - sha512 = "7elnH+9zMsRo7aS72w6MeRugTpdRvInmEB4Kmm9BVvPw/SLG8gXUGQ+4wF0Mys0RSWPz0B9nuBbDe8vFeA2sfg=="; - }; - }; "pacote-20.0.0" = { name = "pacote"; packageName = "pacote"; @@ -29748,30 +29721,6 @@ in bypassCache = true; reconstructLock = true; }; - "@antfu/ni" = nodeEnv.buildNodePackage { - name = "_at_antfu_slash_ni"; - packageName = "@antfu/ni"; - version = "24.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@antfu/ni/-/ni-24.2.0.tgz"; - sha512 = "+B9wzpv+KOhqbOgHjHcBAX7IwIKdDt4SFzYlxIPr4srANFJfjAABC7nU8KNFba+DYLymRe2EPSUfE7+reJb5UA=="; - }; - dependencies = [ - sources."ansis-3.17.0" - sources."fzf-0.5.2" - sources."package-manager-detector-1.0.0" - sources."tinyexec-0.3.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Use the right package manager"; - homepage = "https://github.com/antfu-collective/ni#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@commitlint/cli" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_cli"; packageName = "@commitlint/cli"; From 6c3af5d19523f5c0b3f5ae4686924d96b131a7fa Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 13:50:57 -0500 Subject: [PATCH 02/10] json-diff: migrate from nodePackages --- pkgs/by-name/js/json-diff/package.nix | 32 ++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 52 ------------------- 4 files changed, 33 insertions(+), 53 deletions(-) create mode 100644 pkgs/by-name/js/json-diff/package.nix diff --git a/pkgs/by-name/js/json-diff/package.nix b/pkgs/by-name/js/json-diff/package.nix new file mode 100644 index 000000000000..ea94a368396f --- /dev/null +++ b/pkgs/by-name/js/json-diff/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "json-diff"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "andreyvit"; + repo = "json-diff"; + tag = "v${finalAttrs.version}"; + hash = "sha256-b8CtttEmPUIuFba6yn0DhVsSM1RA8Jsl4+zGvk3EZ2s="; + }; + + npmDepsHash = "sha256-hpnmBD9fyudjc3dzxZ5L5mhkCfRbw7BaAHKGf76qVDU="; + + npmBuildScript = "test"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Structural diff for JSON files"; + homepage = "https://github.com/andreyvit/json-diff"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "json-diff"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 48505c180f38..5f77fefbe91b 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -193,6 +193,7 @@ mapAliases { inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19 inherit (pkgs) js-beautify; # Added 2025-11-06 inherit (pkgs) jshint; # Added 2025-11-06 + inherit (pkgs) json-diff; # Added 2025-11-07 inherit (pkgs) jsonplaceholder; # Added 2025-11-04 inherit (pkgs) json-server; # Added 2025-11-06 joplin = pkgs.joplin-cli; # Added 2025-11-02 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index ea9336d4cfc3..2a3e6b302f54 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -40,7 +40,6 @@ , "js-yaml" , "jsdoc" , "json" -, "json-diff" , "json-refs" , "jsonlint" , "katex" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index d1052067781d..5b2dacd615f0 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -741,15 +741,6 @@ let sha512 = "JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g=="; }; }; - "@ewoudenberg/difflib-0.1.0" = { - name = "_at_ewoudenberg_slash_difflib"; - packageName = "@ewoudenberg/difflib"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@ewoudenberg/difflib/-/difflib-0.1.0.tgz"; - sha512 = "OU5P5mJyD3OoWYMWY+yIgwvgNS9cFAU10f+DDuvtogcWQOoJIsQ4Hy2McSfUfhKjq8L0FuWVb4Rt7kgA+XK86A=="; - }; - }; "@exodus/schemasafe-1.3.0" = { name = "_at_exodus_slash_schemasafe"; packageName = "@exodus/schemasafe"; @@ -9390,15 +9381,6 @@ let sha512 = "yXcCvhkPKmq5M2cQXss6Qbig+LZnzRIT40XCYm/QCRnJaPG867StB1qnsBLxOGrPH1YEIRWW2gJq7LLMyw+NmA=="; }; }; - "dreamopt-0.8.0" = { - name = "dreamopt"; - packageName = "dreamopt"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dreamopt/-/dreamopt-0.8.0.tgz"; - sha512 = "vyJTp8+mC+G+5dfgsY+r3ckxlz+QMX40VjPQsZc5gxVAxLmi64TBoVkP54A/pRAXMXsbu2GMMBrZPxNv23waMg=="; - }; - }; "dtrace-provider-0.6.0" = { name = "dtrace-provider"; packageName = "dtrace-provider"; @@ -12837,15 +12819,6 @@ let sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; }; }; - "heap-0.2.7" = { - name = "heap"; - packageName = "heap"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/heap/-/heap-0.2.7.tgz"; - sha512 = "2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg=="; - }; - }; "help-me-3.0.0" = { name = "help-me"; packageName = "help-me"; @@ -35780,31 +35753,6 @@ in bypassCache = true; reconstructLock = true; }; - json-diff = nodeEnv.buildNodePackage { - name = "json-diff"; - packageName = "json-diff"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/json-diff/-/json-diff-1.0.6.tgz"; - sha512 = "tcFIPRdlc35YkYdGxcamJjllUhXWv4n2rK9oJ2RsAzV4FBkuV4ojKEDgcZ+kpKxDmJKv+PFK65+1tVVOnSeEqA=="; - }; - dependencies = [ - sources."@ewoudenberg/difflib-0.1.0" - sources."colors-1.4.0" - sources."dreamopt-0.8.0" - sources."heap-0.2.7" - sources."wordwrap-1.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "JSON diff"; - homepage = "https://github.com/andreyvit/json-diff"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; json-refs = nodeEnv.buildNodePackage { name = "json-refs"; packageName = "json-refs"; From 983751956ff932c3357fa18b0d0d42461fce1820 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 14:56:06 -0500 Subject: [PATCH 03/10] commitlint: migrate from nodePackages --- pkgs/by-name/co/commitlint/package.nix | 68 +++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 403 ------------------ pkgs/top-level/all-packages.nix | 2 - 6 files changed, 69 insertions(+), 407 deletions(-) create mode 100644 pkgs/by-name/co/commitlint/package.nix diff --git a/pkgs/by-name/co/commitlint/package.nix b/pkgs/by-name/co/commitlint/package.nix new file mode 100644 index 000000000000..b273859cf1a0 --- /dev/null +++ b/pkgs/by-name/co/commitlint/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + nodejs, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "commitlint"; + version = "20.1.0"; + + src = fetchFromGitHub { + owner = "conventional-changelog"; + repo = "commitlint"; + rev = "v${finalAttrs.version}"; + hash = "sha256-o8AnIewSmg8vRjs8LU6QwRyl2hMQ2iK5W7WL137treU="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-Kg19sEgstrWj+JLzdZFnMeb0F5lFX3Z0VPNyiYPi6nY="; + }; + + nativeBuildInputs = [ + yarnConfigHook + nodejs + ]; + + buildPhase = '' + runHook preBuild + + pkgs=("config-validator" "rules" "parse" "is-ignored" "lint" + "resolve-extends" "execute-rule" "load" "read" "types" "cli") + for p in "''${pkgs[@]}" ; do + cd @commitlint/$p/ + yarn run tsc --build --force + cd ../.. + done + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + yarn install --offline --production --ignore-scripts + mkdir -p $out/bin + mkdir -p $out/lib/node_modules/@commitlint/root + mv * $out/lib/node_modules/@commitlint/root/ + ln -s $out/lib/node_modules/@commitlint/root/@commitlint/cli/cli.js $out/bin/commitlint + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/conventional-changelog/commitlint/releases/tag/v${finalAttrs.version}"; + description = "Lint your commit messages"; + homepage = "https://commitlint.js.org/"; + license = lib.licenses.mit; + mainProgram = "commitlint"; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 5f77fefbe91b..3c9930c12c27 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -39,6 +39,7 @@ mapAliases { "@babel/cli" = throw "@babel/cli was removed because upstream highly suggests installing it in your project instead of globally."; # Added 2025-11-06 "@bitwarden/cli" = pkgs.bitwarden-cli; # added 2023-07-25 + "@commitlint/cli" = pkgs.commitlint; # Added 2025-11-08 "@commitlint/config-conventional" = throw "@commitlint/config-conventional has been dropped, as it is a library and your JS project should lock it instead."; # added 2024-12-16 "@emacs-eask/cli" = pkgs.eask; # added 2023-08-17 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index f458fbe78de2..6979f88e5242 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -5,7 +5,6 @@ # Packages that provide a single executable. "@angular/cli" = "ng"; - "@commitlint/cli" = "commitlint"; aws-cdk = "cdk"; cdk8s-cli = "cdk8s"; clipboard-cli = "clipboard"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 2a3e6b302f54..6ffa0b2e5281 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -1,6 +1,5 @@ [ "@angular/cli" -, "@commitlint/cli" , "@microsoft/rush" , "@tailwindcss/aspect-ratio" , "@tailwindcss/forms" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 5b2dacd615f0..b882ae1a03f7 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -444,141 +444,6 @@ let sha512 = "Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA=="; }; }; - "@commitlint/config-validator-19.8.0" = { - name = "_at_commitlint_slash_config-validator"; - packageName = "@commitlint/config-validator"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-19.8.0.tgz"; - sha512 = "+r5ZvD/0hQC3w5VOHJhGcCooiAVdynFlCe2d6I9dU+PvXdV3O+fU4vipVg+6hyLbQUuCH82mz3HnT/cBQTYYuA=="; - }; - }; - "@commitlint/ensure-19.8.0" = { - name = "_at_commitlint_slash_ensure"; - packageName = "@commitlint/ensure"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-19.8.0.tgz"; - sha512 = "kNiNU4/bhEQ/wutI1tp1pVW1mQ0QbAjfPRo5v8SaxoVV+ARhkB8Wjg3BSseNYECPzWWfg/WDqQGIfV1RaBFQZg=="; - }; - }; - "@commitlint/execute-rule-19.8.0" = { - name = "_at_commitlint_slash_execute-rule"; - packageName = "@commitlint/execute-rule"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-19.8.0.tgz"; - sha512 = "fuLeI+EZ9x2v/+TXKAjplBJWI9CNrHnyi5nvUQGQt4WRkww/d95oVRsc9ajpt4xFrFmqMZkd/xBQHZDvALIY7A=="; - }; - }; - "@commitlint/format-19.8.0" = { - name = "_at_commitlint_slash_format"; - packageName = "@commitlint/format"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/format/-/format-19.8.0.tgz"; - sha512 = "EOpA8IERpQstxwp/WGnDArA7S+wlZDeTeKi98WMOvaDLKbjptuHWdOYYr790iO7kTCif/z971PKPI2PkWMfOxg=="; - }; - }; - "@commitlint/is-ignored-19.8.0" = { - name = "_at_commitlint_slash_is-ignored"; - packageName = "@commitlint/is-ignored"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-19.8.0.tgz"; - sha512 = "L2Jv9yUg/I+jF3zikOV0rdiHUul9X3a/oU5HIXhAJLE2+TXTnEBfqYP9G5yMw/Yb40SnR764g4fyDK6WR2xtpw=="; - }; - }; - "@commitlint/lint-19.8.0" = { - name = "_at_commitlint_slash_lint"; - packageName = "@commitlint/lint"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/lint/-/lint-19.8.0.tgz"; - sha512 = "+/NZKyWKSf39FeNpqhfMebmaLa1P90i1Nrb1SrA7oSU5GNN/lksA4z6+ZTnsft01YfhRZSYMbgGsARXvkr/VLQ=="; - }; - }; - "@commitlint/load-19.8.0" = { - name = "_at_commitlint_slash_load"; - packageName = "@commitlint/load"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/load/-/load-19.8.0.tgz"; - sha512 = "4rvmm3ff81Sfb+mcWT5WKlyOa+Hd33WSbirTVUer0wjS1Hv/Hzr07Uv1ULIV9DkimZKNyOwXn593c+h8lsDQPQ=="; - }; - }; - "@commitlint/message-19.8.0" = { - name = "_at_commitlint_slash_message"; - packageName = "@commitlint/message"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/message/-/message-19.8.0.tgz"; - sha512 = "qs/5Vi9bYjf+ZV40bvdCyBn5DvbuelhR6qewLE8Bh476F7KnNyLfdM/ETJ4cp96WgeeHo6tesA2TMXS0sh5X4A=="; - }; - }; - "@commitlint/parse-19.8.0" = { - name = "_at_commitlint_slash_parse"; - packageName = "@commitlint/parse"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/parse/-/parse-19.8.0.tgz"; - sha512 = "YNIKAc4EXvNeAvyeEnzgvm1VyAe0/b3Wax7pjJSwXuhqIQ1/t2hD3OYRXb6D5/GffIvaX82RbjD+nWtMZCLL7Q=="; - }; - }; - "@commitlint/read-19.8.0" = { - name = "_at_commitlint_slash_read"; - packageName = "@commitlint/read"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/read/-/read-19.8.0.tgz"; - sha512 = "6ywxOGYajcxK1y1MfzrOnwsXO6nnErna88gRWEl3qqOOP8MDu/DTeRkGLXBFIZuRZ7mm5yyxU5BmeUvMpNte5w=="; - }; - }; - "@commitlint/resolve-extends-19.8.0" = { - name = "_at_commitlint_slash_resolve-extends"; - packageName = "@commitlint/resolve-extends"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-19.8.0.tgz"; - sha512 = "CLanRQwuG2LPfFVvrkTrBR/L/DMy3+ETsgBqW1OvRxmzp/bbVJW0Xw23LnnExgYcsaFtos967lul1CsbsnJlzQ=="; - }; - }; - "@commitlint/rules-19.8.0" = { - name = "_at_commitlint_slash_rules"; - packageName = "@commitlint/rules"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/rules/-/rules-19.8.0.tgz"; - sha512 = "IZ5IE90h6DSWNuNK/cwjABLAKdy8tP8OgGVGbXe1noBEX5hSsu00uRlLu6JuruiXjWJz2dZc+YSw3H0UZyl/mA=="; - }; - }; - "@commitlint/to-lines-19.8.0" = { - name = "_at_commitlint_slash_to-lines"; - packageName = "@commitlint/to-lines"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-19.8.0.tgz"; - sha512 = "3CKLUw41Cur8VMjh16y8LcsOaKbmQjAKCWlXx6B0vOUREplp6em9uIVhI8Cv934qiwkbi2+uv+mVZPnXJi1o9A=="; - }; - }; - "@commitlint/top-level-19.8.0" = { - name = "_at_commitlint_slash_top-level"; - packageName = "@commitlint/top-level"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/top-level/-/top-level-19.8.0.tgz"; - sha512 = "Rphgoc/omYZisoNkcfaBRPQr4myZEHhLPx2/vTXNLjiCw4RgfPR1wEgUpJ9OOmDCiv5ZyIExhprNLhteqH4FuQ=="; - }; - }; - "@commitlint/types-19.8.0" = { - name = "_at_commitlint_slash_types"; - packageName = "@commitlint/types"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/types/-/types-19.8.0.tgz"; - sha512 = "LRjP623jPyf3Poyfb0ohMj8I3ORyBDOwXAgxxVPbSD0unJuW2mJWeiRfaQinjtccMqC5Wy1HOMfa4btKjbNxbg=="; - }; - }; "@conventional-changelog/git-client-1.0.1" = { name = "_at_conventional-changelog_slash_git-client"; packageName = "@conventional-changelog/git-client"; @@ -3027,15 +2892,6 @@ let sha512 = "3qe4oQAPNwVNwK4C9c8u+VJqv9kez+2MR4qJpoPFfXtgxxif1QbFusvXzK0/Wra2VX07smostI2VMmJNSpZjuQ=="; }; }; - "@types/conventional-commits-parser-5.0.1" = { - name = "_at_types_slash_conventional-commits-parser"; - packageName = "@types/conventional-commits-parser"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/conventional-commits-parser/-/conventional-commits-parser-5.0.1.tgz"; - sha512 = "7uz5EHdzz2TqoMfV7ee61Egf5y6NkcO4FB/1iCCQnbeiI1F3xzv3vK5dBCXUCLQgGYS+mUeigK1iKQzvED+QnQ=="; - }; - }; "@types/cors-2.8.17" = { name = "_at_types_slash_cors"; packageName = "@types/cors"; @@ -7590,15 +7446,6 @@ let sha512 = "tuUH8H/19VjtD9Ig7l6TQRh+Z0Yt0NZ6w/cCkkyzUbGQTnUEmKfGtkC9gGfVgCfOL1Rzno5NgNF4KY8vR+Jo3w=="; }; }; - "conventional-changelog-angular-7.0.0" = { - name = "conventional-changelog-angular"; - packageName = "conventional-changelog-angular"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-7.0.0.tgz"; - sha512 = "ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ=="; - }; - }; "conventional-changelog-angular-8.0.0" = { name = "conventional-changelog-angular"; packageName = "conventional-changelog-angular"; @@ -7716,15 +7563,6 @@ let sha512 = "tQMagCOC59EVgNZcC5zl7XqO30Wki9i9J3acbUvkaosCT6JX3EeFwJD7Qqp4MCikRnzS18WXV3BLIQ66ytu6+Q=="; }; }; - "conventional-commits-parser-5.0.0" = { - name = "conventional-commits-parser"; - packageName = "conventional-commits-parser"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-5.0.0.tgz"; - sha512 = "ZPMl0ZJbw74iS9LuX9YIAiW8pfM5p3yh2o/NbXHbkFuZzY5jvdi5jFycEOkmBW5H5I7nA+D6f3UcsCLP2vvSEA=="; - }; - }; "conventional-commits-parser-6.1.0" = { name = "conventional-commits-parser"; packageName = "conventional-commits-parser"; @@ -7887,15 +7725,6 @@ let sha512 = "itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg=="; }; }; - "cosmiconfig-typescript-loader-6.1.0" = { - name = "cosmiconfig-typescript-loader"; - packageName = "cosmiconfig-typescript-loader"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-6.1.0.tgz"; - sha512 = "tJ1w35ZRUiM5FeTzT7DtYWAFFv37ZLqSRkGi2oeCK1gPhvaWjkAtfXvLmvE1pRfxxp9aQo6ba/Pvg1dKj05D4g=="; - }; - }; "cp-file-10.0.0" = { name = "cp-file"; packageName = "cp-file"; @@ -8400,15 +8229,6 @@ let sha512 = "ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA=="; }; }; - "dargs-8.1.0" = { - name = "dargs"; - packageName = "dargs"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dargs/-/dargs-8.1.0.tgz"; - sha512 = "wAV9QHOsNbwnWdNW2FYvE1P56wtgSbM+3SZcdGiWQILwVjACCXDCI3Ai8QlCjMDB8YK5zySiXZYBiwGmNY3lnw=="; - }; - }; "dash-ast-1.0.0" = { name = "dash-ast"; packageName = "dash-ast"; @@ -11199,15 +11019,6 @@ let sha512 = "v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw=="; }; }; - "find-up-7.0.0" = { - name = "find-up"; - packageName = "find-up"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-7.0.0.tgz"; - sha512 = "YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g=="; - }; - }; "find-up-simple-1.0.1" = { name = "find-up-simple"; packageName = "find-up-simple"; @@ -11964,15 +11775,6 @@ let sha512 = "PdNkH2snpXsKIzho6OWMZKEl+KZG6Zm+1ghQIDi0tEq1sz/S1tDjvNuYrX2ZpomalHAB89OUQim8O6vN+jesNQ=="; }; }; - "git-raw-commits-4.0.0" = { - name = "git-raw-commits"; - packageName = "git-raw-commits"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-4.0.0.tgz"; - sha512 = "ICsMM1Wk8xSGMowkOmPrzo2Fgmfo4bMHLNX6ytHjajRJUqvHOw/TFapQ+QG75c3X/tTDDhOSRPGC52dDbNM8FQ=="; - }; - }; "git-raw-commits-5.0.0" = { name = "git-raw-commits"; packageName = "git-raw-commits"; @@ -13386,15 +13188,6 @@ let sha512 = "f8KcQ1D80V7RnqVm+/lirO9zkOxjGxhaTC1IPrBGd3MEfNgmNG67tSUO9gTi2F3Blr2Az6g1vocaxzkVnWl9MA=="; }; }; - "import-meta-resolve-4.1.0" = { - name = "import-meta-resolve"; - packageName = "import-meta-resolve"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz"; - sha512 = "I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw=="; - }; - }; "imurmurhash-0.1.4" = { name = "imurmurhash"; packageName = "imurmurhash"; @@ -14700,15 +14493,6 @@ let sha512 = "9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w=="; }; }; - "is-text-path-2.0.0" = { - name = "is-text-path"; - packageName = "is-text-path"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-text-path/-/is-text-path-2.0.0.tgz"; - sha512 = "+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw=="; - }; - }; "is-typed-array-1.1.15" = { name = "is-typed-array"; packageName = "is-typed-array"; @@ -16329,15 +16113,6 @@ let sha512 = "yv3cSQZmfpbIKo4Yo45B1taEvxjNvcpF1CEOc0Y6dEyvhPIfEJE3twDwPgWTPQubcSgXyBwBKG6wpQvWMDOf6Q=="; }; }; - "lodash.kebabcase-4.1.1" = { - name = "lodash.kebabcase"; - packageName = "lodash.kebabcase"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz"; - sha512 = "N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g=="; - }; - }; "lodash.memoize-3.0.4" = { name = "lodash.memoize"; packageName = "lodash.memoize"; @@ -16356,15 +16131,6 @@ let sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; }; }; - "lodash.mergewith-4.6.2" = { - name = "lodash.mergewith"; - packageName = "lodash.mergewith"; - version = "4.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz"; - sha512 = "GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ=="; - }; - }; "lodash.omitby-4.6.0" = { name = "lodash.omitby"; packageName = "lodash.omitby"; @@ -16383,24 +16149,6 @@ let sha512 = "Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="; }; }; - "lodash.snakecase-4.1.1" = { - name = "lodash.snakecase"; - packageName = "lodash.snakecase"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz"; - sha512 = "QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw=="; - }; - }; - "lodash.startcase-4.4.0" = { - name = "lodash.startcase"; - packageName = "lodash.startcase"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz"; - sha512 = "+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg=="; - }; - }; "lodash.template-4.5.0" = { name = "lodash.template"; packageName = "lodash.template"; @@ -16491,15 +16239,6 @@ let sha512 = "7lYL8bLopMoy4CTICbxygAUq6CdRJ36vFc80DucPueUee+d5NBRxz3FdT9Pes/HEx5mPoT9jwnsEJWz1N7uq7Q=="; }; }; - "lodash.upperfirst-4.3.1" = { - name = "lodash.upperfirst"; - packageName = "lodash.upperfirst"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz"; - sha512 = "sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg=="; - }; - }; "lodash.zip-4.2.0" = { name = "lodash.zip"; packageName = "lodash.zip"; @@ -24798,15 +24537,6 @@ let sha512 = "9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg=="; }; }; - "split2-4.2.0" = { - name = "split2"; - packageName = "split2"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz"; - sha512 = "UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg=="; - }; - }; "sprintf-js-1.0.3" = { name = "sprintf-js"; packageName = "sprintf-js"; @@ -25842,15 +25572,6 @@ let sha512 = "3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA=="; }; }; - "text-extensions-2.4.0" = { - name = "text-extensions"; - packageName = "text-extensions"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/text-extensions/-/text-extensions-2.4.0.tgz"; - sha512 = "te/NtwBwfiNRLf9Ijqx3T0nlqZiQ2XrrtBvu+cLL8ZRrGkO0NHTug8MYFKyoSrv/sHTaSKfilUkizV6XhxMJ3g=="; - }; - }; "text-hex-1.0.0" = { name = "text-hex"; packageName = "text-hex"; @@ -29694,130 +29415,6 @@ in bypassCache = true; reconstructLock = true; }; - "@commitlint/cli" = nodeEnv.buildNodePackage { - name = "_at_commitlint_slash_cli"; - packageName = "@commitlint/cli"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/cli/-/cli-19.8.0.tgz"; - sha512 = "t/fCrLVu+Ru01h0DtlgHZXbHV2Y8gKocTR5elDOqIRUzQd0/6hpt2VIWOj9b3NDo7y4/gfxeR2zRtXq/qO6iUg=="; - }; - dependencies = [ - sources."@babel/code-frame-7.26.2" - sources."@babel/helper-validator-identifier-7.25.9" - sources."@commitlint/config-validator-19.8.0" - sources."@commitlint/ensure-19.8.0" - sources."@commitlint/execute-rule-19.8.0" - sources."@commitlint/format-19.8.0" - sources."@commitlint/is-ignored-19.8.0" - sources."@commitlint/lint-19.8.0" - sources."@commitlint/load-19.8.0" - sources."@commitlint/message-19.8.0" - sources."@commitlint/parse-19.8.0" - sources."@commitlint/read-19.8.0" - sources."@commitlint/resolve-extends-19.8.0" - sources."@commitlint/rules-19.8.0" - sources."@commitlint/to-lines-19.8.0" - sources."@commitlint/top-level-19.8.0" - sources."@commitlint/types-19.8.0" - sources."@types/conventional-commits-parser-5.0.1" - sources."@types/node-22.13.10" - sources."JSONStream-1.3.5" - sources."ajv-8.17.1" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" - sources."array-ify-1.0.0" - sources."callsites-3.1.0" - sources."chalk-5.4.1" - sources."cliui-8.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."compare-func-2.0.0" - sources."conventional-changelog-angular-7.0.0" - sources."conventional-commits-parser-5.0.0" - sources."cosmiconfig-9.0.0" - sources."cosmiconfig-typescript-loader-6.1.0" - sources."dargs-8.1.0" - sources."dot-prop-5.3.0" - sources."emoji-regex-8.0.0" - sources."env-paths-2.2.1" - sources."error-ex-1.3.2" - sources."escalade-3.2.0" - sources."fast-deep-equal-3.1.3" - sources."fast-uri-3.0.6" - sources."find-up-7.0.0" - sources."get-caller-file-2.0.5" - sources."git-raw-commits-4.0.0" - sources."global-directory-4.0.1" - ( - sources."import-fresh-3.3.1" - // { - dependencies = [ - sources."resolve-from-4.0.0" - ]; - } - ) - sources."import-meta-resolve-4.1.0" - sources."ini-4.1.1" - sources."is-arrayish-0.2.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-obj-2.0.0" - sources."is-text-path-2.0.0" - sources."jiti-2.4.2" - sources."js-tokens-4.0.0" - sources."js-yaml-4.1.0" - sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-traverse-1.0.0" - sources."jsonparse-1.3.1" - sources."lines-and-columns-1.2.4" - sources."locate-path-7.2.0" - sources."lodash.camelcase-4.3.0" - sources."lodash.isplainobject-4.0.6" - sources."lodash.kebabcase-4.1.1" - sources."lodash.merge-4.6.2" - sources."lodash.mergewith-4.6.2" - sources."lodash.snakecase-4.1.1" - sources."lodash.startcase-4.4.0" - sources."lodash.uniq-4.5.0" - sources."lodash.upperfirst-4.3.1" - sources."meow-12.1.1" - sources."minimist-1.2.8" - sources."p-limit-4.0.0" - sources."p-locate-6.0.0" - sources."parent-module-1.0.1" - sources."parse-json-5.2.0" - sources."path-exists-5.0.0" - sources."picocolors-1.1.1" - sources."require-directory-2.1.1" - sources."require-from-string-2.0.2" - sources."resolve-from-5.0.0" - sources."semver-7.7.1" - sources."split2-4.2.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."text-extensions-2.4.0" - sources."through-2.3.8" - sources."tinyexec-0.3.2" - sources."typescript-5.8.2" - sources."undici-types-6.20.0" - sources."unicorn-magic-0.1.0" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.8" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - sources."yocto-queue-1.2.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Lint your commit messages"; - homepage = "https://commitlint.js.org/"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@microsoft/rush" = nodeEnv.buildNodePackage { name = "_at_microsoft_slash_rush"; packageName = "@microsoft/rush"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b166db126cb..b5c15f512d01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1202,8 +1202,6 @@ with pkgs; cgit-pink = callPackage ../applications/version-management/cgit/pink.nix { }; - commitlint = nodePackages."@commitlint/cli"; - datalad = with python3Packages; toPythonApplication datalad; datalad-gooey = with python3Packages; toPythonApplication datalad-gooey; From 56283c0a7934dd5f8c34d2181d67114db787d9cb Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 15:01:25 -0500 Subject: [PATCH 04/10] coc-nginx: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 1 + .../vim/plugins/nodePackagePlugins.nix | 11 +-- pkgs/by-name/co/coc-nginx/package.nix | 71 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ----- 6 files changed, 75 insertions(+), 28 deletions(-) create mode 100644 pkgs/by-name/co/coc-nginx/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index c073c194ca1e..2d47d0dc68f8 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -24,6 +24,7 @@ let "coc-json" "coc-lists" "coc-markdownlint" + "coc-nginx" "coc-pairs" "coc-prettier" "coc-pyright" diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 03fe172d2380..a19baf3d6f55 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -10,20 +10,13 @@ let "coc-ltex" "coc-tsserver" "coc-ultisnips" - "coc-nginx" ]; - - packageNameOverrides = { - "coc-nginx" = "@yaegassy/coc-nginx"; - }; - - getPackageName = name: packageNameOverrides.${name} or name; in lib.genAttrs nodePackageNames ( name: buildVimPlugin { pname = name; - inherit (nodePackages.${getPackageName name}) version meta; - src = "${nodePackages.${getPackageName name}}/lib/node_modules/${getPackageName name}"; + inherit (nodePackages.${name}) version meta; + src = "${nodePackages.${name}}/lib/node_modules/${name}"; } ) diff --git a/pkgs/by-name/co/coc-nginx/package.nix b/pkgs/by-name/co/coc-nginx/package.nix new file mode 100644 index 000000000000..7ffe64dc2314 --- /dev/null +++ b/pkgs/by-name/co/coc-nginx/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, + esbuild, + buildGoModule, +}: +let + esbuild' = + let + version = "0.16.17"; + in + esbuild.override { + buildGoModule = + args: + buildGoModule ( + args + // { + inherit version; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + } + ); + }; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "coc-nginx"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "yaegassy"; + repo = "coc-nginx"; + tag = "v${finalAttrs.version}"; + hash = "sha256-9dca1YUQZCbzmGe+9qVJABCWZCGUUZDvtznMQEP/CCQ="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-CBw2E93EWmBOCppj1gxYuAynHBZDJBPh58X099TP5mE="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + esbuild' + ]; + + env.ESBUILD_BINARY_PATH = lib.getExe esbuild'; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "nginx-language-server extension for coc.nvim"; + homepage = "https://github.com/yaegassy/coc-nginx"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 3c9930c12c27..f8f4c7bddebc 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -66,6 +66,7 @@ mapAliases { "@webassemblyjs/wasm-text-gen-1.11.1" = pkgs.wasm-text-gen; # Added 2025-11-06 "@webassemblyjs/wast-refmt-1.11.1" = pkgs.wast-refmt; # Added 2025-11-06 "@withgraphite/graphite-cli" = pkgs.graphite-cli; # added 2024-01-25 + "@yaegassy/coc-nginx" = pkgs.coc-nginx; # Added 2025-11-08 "@zwave-js/server" = pkgs.zwave-js-server; # Added 2023-09-09 inherit (pkgs) autoprefixer; # added 2024-06-25 inherit (pkgs) asar; # added 2023-08-26 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 6ffa0b2e5281..be35ffa34b4d 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -76,5 +76,4 @@ , "vega-cli" , "vercel" , "wavedrom-cli" -, "@yaegassy/coc-nginx" ] diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index b882ae1a03f7..f7a1dc56e47d 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -40129,22 +40129,4 @@ in bypassCache = true; reconstructLock = true; }; - "@yaegassy/coc-nginx" = nodeEnv.buildNodePackage { - name = "_at_yaegassy_slash_coc-nginx"; - packageName = "@yaegassy/coc-nginx"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@yaegassy/coc-nginx/-/coc-nginx-0.4.1.tgz"; - sha512 = "GJeiQWiBDxKsWPowBLBjxnPzaRT50L9tLDtD9dZcKh8OQTdrOJGa7cqNz7T/xuqSq3r+AyD1mmeNSL7141HMsQ=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "nginx-language-server extension for coc.nvim"; - homepage = "https://github.com/yaegassy/coc-nginx#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; } From 28da13991574008ffb5c72b06e0b93631b120bde Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 15:13:26 -0500 Subject: [PATCH 05/10] code-theme-converter: migrate from nodePackages --- .../co/code-theme-converter/package.nix | 43 ++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 684 ------------------ 4 files changed, 44 insertions(+), 685 deletions(-) create mode 100644 pkgs/by-name/co/code-theme-converter/package.nix diff --git a/pkgs/by-name/co/code-theme-converter/package.nix b/pkgs/by-name/co/code-theme-converter/package.nix new file mode 100644 index 000000000000..01ceba741263 --- /dev/null +++ b/pkgs/by-name/co/code-theme-converter/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "code-theme-converter"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "tobiastimm"; + repo = "code-theme-converter"; + tag = "v${finalAttrs.version}"; + hash = "sha256-b6b0s6FXyHwoAJnPTaLu9fMQJVpBSqfGBk/KqDbaK9U="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-M8zLr/BPQfS50ZsTwN/YdJAlYUtS9edE/jh+l1wBqR8="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Convert any Visual Studio Code Theme to Sublime Text 3 or IntelliJ IDEA"; + homepage = "https://github.com/tobiastimm/code-theme-converter"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index f8f4c7bddebc..cb18bf8fd1d2 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -130,6 +130,7 @@ mapAliases { inherit (pkgs) coc-wxml; # Added 2025-11-05 inherit (pkgs) coc-yaml; # Added 2025-11-05 inherit (pkgs) coc-yank; # Added 2025-11-05 + inherit (pkgs) code-theme-converter; # Added 2025-11-08 coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19 coffee-script = pkgs.coffeescript; # added 2023-08-18 inherit (pkgs) concurrently; # added 2024-08-05 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index be35ffa34b4d..abcad7ed111e 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -17,7 +17,6 @@ , "coc-ltex" , "coc-tsserver" , "coc-ultisnips" -, "code-theme-converter" , "conventional-changelog-cli" , "cpy-cli" , "dhcp" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index f7a1dc56e47d..7b2cbcb8c933 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -3513,15 +3513,6 @@ let sha512 = "/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ=="; }; }; - "@xmldom/xmldom-0.8.10" = { - name = "_at_xmldom_slash_xmldom"; - packageName = "@xmldom/xmldom"; - version = "0.8.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz"; - sha512 = "2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw=="; - }; - }; "@xmldom/xmldom-0.9.8" = { name = "_at_xmldom_slash_xmldom"; packageName = "@xmldom/xmldom"; @@ -3531,15 +3522,6 @@ let sha512 = "p96FSY54r+WJ50FIOsCOjyj/wavs8921hG5+kVMmZgKcvIKxMXHTrjNJvRgWa/zuX3B6t2lijLNFaOyuxUH+2A=="; }; }; - "@xstate/fsm-1.6.5" = { - name = "_at_xstate_slash_fsm"; - packageName = "@xstate/fsm"; - version = "1.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@xstate/fsm/-/fsm-1.6.5.tgz"; - sha512 = "b5o1I6aLNeYlU/3CPlj/Z91ybk1gUsKT+5NAJI+2W4UjvS5KLG28K9v5UvNoFVjHV8PajVZ00RH3vnjyQO7ZAw=="; - }; - }; "@yarnpkg/lockfile-1.0.2" = { name = "_at_yarnpkg_slash_lockfile"; packageName = "@yarnpkg/lockfile"; @@ -5178,15 +5160,6 @@ let sha512 = "YFgPTVRhUMncZr8tM3ige7gnViMGhKoGF23qaiISRG8xtYebTGHrMSMXsTXo6O1KbtdEI+4jzvGY1K/wdT9GUA=="; }; }; - "bl-1.2.3" = { - name = "bl"; - packageName = "bl"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz"; - sha512 = "pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww=="; - }; - }; "bl-4.1.0" = { name = "bl"; packageName = "bl"; @@ -6069,15 +6042,6 @@ let sha512 = "ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw=="; }; }; - "capture-stack-trace-1.0.2" = { - name = "capture-stack-trace"; - packageName = "capture-stack-trace"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.2.tgz"; - sha512 = "X/WM2UQs6VMHUtjUDnZTRI+i1crWteJySFzr9UpGoQa4WQffXVTTXuekjl7TjZRlcF2XfjgITT0HxZ9RnxeT0w=="; - }; - }; "cardinal-2.1.1" = { name = "cardinal"; packageName = "cardinal"; @@ -6114,15 +6078,6 @@ let sha512 = "prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A=="; }; }; - "caw-2.0.1" = { - name = "caw"; - packageName = "caw"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz"; - sha512 = "Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA=="; - }; - }; "ccount-2.0.1" = { name = "ccount"; packageName = "ccount"; @@ -6771,15 +6726,6 @@ let sha512 = "iWDjmP8kvsMdBmLTHxFaqXikO8EdFRDfim7k6vUHglY/2xJ5jLrPsnQGijdfp4U+sr/BeecG0wKm02dSIAeQ1g=="; }; }; - "cmd-shim-2.1.0" = { - name = "cmd-shim"; - packageName = "cmd-shim"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.1.0.tgz"; - sha512 = "A5C0Cyf2H8sKsHqX0tvIWRXw5/PK++3Dc0lDbsugr90nOECLLuSPahVQBG8pgmgiXgm/TzBWMqI2rWdZwHduAw=="; - }; - }; "cmdln-3.2.1" = { name = "cmdln"; packageName = "cmdln"; @@ -7059,15 +7005,6 @@ let sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="; }; }; - "commander-5.1.0" = { - name = "commander"; - packageName = "commander"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz"; - sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; - }; - }; "commander-7.2.0" = { name = "commander"; packageName = "commander"; @@ -7788,15 +7725,6 @@ let sha512 = "mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A=="; }; }; - "create-error-class-3.0.2" = { - name = "create-error-class"; - packageName = "create-error-class"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; - sha512 = "gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw=="; - }; - }; "create-hash-1.2.0" = { name = "create-hash"; packageName = "create-hash"; @@ -7842,15 +7770,6 @@ let sha512 = "Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q=="; }; }; - "cross-spawn-6.0.6" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "6.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz"; - sha512 = "VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw=="; - }; - }; "cross-spawn-7.0.6" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -8436,15 +8355,6 @@ let sha512 = "FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="; }; }; - "decompress-4.2.1" = { - name = "decompress"; - packageName = "decompress"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz"; - sha512 = "e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ=="; - }; - }; "decompress-response-3.3.0" = { name = "decompress-response"; packageName = "decompress-response"; @@ -8472,42 +8382,6 @@ let sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="; }; }; - "decompress-tar-4.1.1" = { - name = "decompress-tar"; - packageName = "decompress-tar"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz"; - sha512 = "JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ=="; - }; - }; - "decompress-tarbz2-4.1.1" = { - name = "decompress-tarbz2"; - packageName = "decompress-tarbz2"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz"; - sha512 = "s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A=="; - }; - }; - "decompress-targz-4.1.1" = { - name = "decompress-targz"; - packageName = "decompress-targz"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz"; - sha512 = "4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w=="; - }; - }; - "decompress-unzip-4.0.1" = { - name = "decompress-unzip"; - packageName = "decompress-unzip"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz"; - sha512 = "1fqeluvxgnn86MOh66u8FjbtJpAFv5wgCT9Iw8rcBqQcCo5tO8eiJw7NNTrvt9n4CRBVq7CstiS922oPgyGLrw=="; - }; - }; "deep-equal-1.1.2" = { name = "deep-equal"; packageName = "deep-equal"; @@ -9183,24 +9057,6 @@ let sha512 = "vo835pntK7kzYStk7xUHDifiYJvXxVhUapt85uk2AI94gUUAQX9HNRtrcMHNSc3YHJUEHGbYIGsM99uIbgAtxw=="; }; }; - "download-5.0.3" = { - name = "download"; - packageName = "download"; - version = "5.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/download/-/download-5.0.3.tgz"; - sha512 = "rE0V29BV5FyylK3Uw5hmP90TBuwGHAqPYfaRHW/VHsKe9Xqi7RACVg0k0FokeE+MTWr9mtUy75GyszRACiD3Ow=="; - }; - }; - "download-git-repo-1.1.0" = { - name = "download-git-repo"; - packageName = "download-git-repo"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/download-git-repo/-/download-git-repo-1.1.0.tgz"; - sha512 = "yXcCvhkPKmq5M2cQXss6Qbig+LZnzRIT40XCYm/QCRnJaPG867StB1qnsBLxOGrPH1YEIRWW2gJq7LLMyw+NmA=="; - }; - }; "dtrace-provider-0.6.0" = { name = "dtrace-provider"; packageName = "dtrace-provider"; @@ -10299,15 +10155,6 @@ let sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="; }; }; - "execa-1.0.0" = { - name = "execa"; - packageName = "execa"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; - sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; - }; - }; "execa-5.1.1" = { name = "execa"; packageName = "execa"; @@ -10848,33 +10695,6 @@ let sha512 = "/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw=="; }; }; - "file-type-3.9.0" = { - name = "file-type"; - packageName = "file-type"; - version = "3.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz"; - sha512 = "RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA=="; - }; - }; - "file-type-5.2.0" = { - name = "file-type"; - packageName = "file-type"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz"; - sha512 = "Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ=="; - }; - }; - "file-type-6.2.0" = { - name = "file-type"; - packageName = "file-type"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz"; - sha512 = "YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg=="; - }; - }; "file-uri-to-path-1.0.0" = { name = "file-uri-to-path"; packageName = "file-uri-to-path"; @@ -10902,24 +10722,6 @@ let sha512 = "BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ=="; }; }; - "filename-reserved-regex-2.0.0" = { - name = "filename-reserved-regex"; - packageName = "filename-reserved-regex"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz"; - sha512 = "lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ=="; - }; - }; - "filenamify-2.1.0" = { - name = "filenamify"; - packageName = "filenamify"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz"; - sha512 = "ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA=="; - }; - }; "filesize-6.4.0" = { name = "filesize"; packageName = "filesize"; @@ -11604,15 +11406,6 @@ let sha512 = "sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g=="; }; }; - "get-proxy-2.1.0" = { - name = "get-proxy"; - packageName = "get-proxy"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz"; - sha512 = "zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw=="; - }; - }; "get-stdin-4.0.1" = { name = "get-stdin"; packageName = "get-stdin"; @@ -11649,24 +11442,6 @@ let sha512 = "dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA=="; }; }; - "get-stream-2.3.1" = { - name = "get-stream"; - packageName = "get-stream"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; - sha512 = "AUGhbbemXxrZJRD5cDvKtQxLuYaIbNtDTK8YqupCI393Q2KSTreEsLUN3ZxAWFGiKTzL6nKuzfcIvieflUX9qA=="; - }; - }; - "get-stream-3.0.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; - sha512 = "GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ=="; - }; - }; "get-stream-4.1.0" = { name = "get-stream"; packageName = "get-stream"; @@ -11757,15 +11532,6 @@ let sha512 = "MDMwbhASQuVeD4JKd1fKgNgCRL3fGqMM4WaqpNhWO0JiMOAjbQdumbs4BbBZEy9/M00EHEjKN3HieVhCUlwjeQ=="; }; }; - "git-clone-0.1.0" = { - name = "git-clone"; - packageName = "git-clone"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/git-clone/-/git-clone-0.1.0.tgz"; - sha512 = "zs9rlfa7HyaJAKG9o+V7C6qfMzyc+tb1IIXdUFcOBcR1U7siKy/uPdauLlrH1mc0vOgUwIv4BF+QxPiiTYz3Rw=="; - }; - }; "git-diff-tree-1.1.0" = { name = "git-diff-tree"; packageName = "git-diff-tree"; @@ -12135,15 +11901,6 @@ let sha512 = "XfBk1CxOOScDcMr9O1yKkNaQyy865NbYs+F7dr4H0LZMVgCj2Le59k6PqbNHoL5ToeaEQUYh6c6yMfVcc6SJxA=="; }; }; - "got-6.7.1" = { - name = "got"; - packageName = "got"; - version = "6.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz"; - sha512 = "Y/K3EDuiQN9rTZhBvPRWMLXIKdeD1Rj0nzunfoi0Yyn5WBEbzxXKU9Ub2X41oZBagVWOBU3MuDonFMgPWQFnwg=="; - }; - }; "got-9.6.0" = { name = "got"; packageName = "got"; @@ -12360,15 +12117,6 @@ let sha512 = "55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg=="; }; }; - "has-symbol-support-x-1.4.2" = { - name = "has-symbol-support-x"; - packageName = "has-symbol-support-x"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz"; - sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="; - }; - }; "has-symbols-1.1.0" = { name = "has-symbols"; packageName = "has-symbols"; @@ -12378,15 +12126,6 @@ let sha512 = "1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ=="; }; }; - "has-to-string-tag-x-1.4.1" = { - name = "has-to-string-tag-x"; - packageName = "has-to-string-tag-x"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz"; - sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw=="; - }; - }; "has-tostringtag-1.0.2" = { name = "has-tostringtag"; packageName = "has-tostringtag"; @@ -14133,15 +13872,6 @@ let sha512 = "1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw=="; }; }; - "is-natural-number-4.0.1" = { - name = "is-natural-number"; - packageName = "is-natural-number"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz"; - sha512 = "Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ=="; - }; - }; "is-npm-5.0.0" = { name = "is-npm"; packageName = "is-npm"; @@ -14232,15 +13962,6 @@ let sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; }; }; - "is-object-1.0.2" = { - name = "is-object"; - packageName = "is-object"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz"; - sha512 = "2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA=="; - }; - }; "is-observable-1.1.0" = { name = "is-observable"; packageName = "is-observable"; @@ -14358,15 +14079,6 @@ let sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; }; }; - "is-redirect-1.0.0" = { - name = "is-redirect"; - packageName = "is-redirect"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz"; - sha512 = "cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw=="; - }; - }; "is-reference-3.0.3" = { name = "is-reference"; packageName = "is-reference"; @@ -14754,15 +14466,6 @@ let sha512 = "7731a/t2llyrk8Hdwl1x3LkhIFGzxHQGpJA7Ur9cIRViakQF2y25Lwhx8Ziy1B068+kBYUmYPBzw5uo3DdWrdQ=="; }; }; - "isurl-1.0.0" = { - name = "isurl"; - packageName = "isurl"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz"; - sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="; - }; - }; "jackspeak-3.4.3" = { name = "jackspeak"; packageName = "jackspeak"; @@ -18570,15 +18273,6 @@ let sha512 = "+I10J3wKNoKddNxn0CNpoZ3eTZuqxjNM3b1GImVx22+ePI+Y15P8g/j3WsbP0fhzzrFzrtjOAoq5NCCucswXOQ=="; }; }; - "nice-try-1.0.5" = { - name = "nice-try"; - packageName = "nice-try"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"; - sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; - }; - }; "nijs-0.0.25" = { name = "nijs"; packageName = "nijs"; @@ -18966,15 +18660,6 @@ let sha512 = "tlEhXU3689VLUHYEZTS/BC61vfeN2xSSZwoWDT6WLuenZTpDmGmNT5mtl15erTR0/A15ldK06/NEKg9jYJ9OTQ=="; }; }; - "npm-conf-1.1.3" = { - name = "npm-conf"; - packageName = "npm-conf"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz"; - sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw=="; - }; - }; "npm-install-checks-7.1.1" = { name = "npm-install-checks"; packageName = "npm-install-checks"; @@ -19083,15 +18768,6 @@ let sha512 = "LeVMZBBVy+oQb5R6FDV9OlJCcWDU+al10oKpe+nsvcHnG24Z3uM3SvJYKfGJlfGjVU8v9liejCrUR/M5HO5NEQ=="; }; }; - "npm-run-path-2.0.2" = { - name = "npm-run-path"; - packageName = "npm-run-path"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; - sha512 = "lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw=="; - }; - }; "npm-run-path-4.0.1" = { name = "npm-run-path"; packageName = "npm-run-path"; @@ -19767,15 +19443,6 @@ let sha512 = "QtoWLjXAW++uTX67HZQz1dbTpqBfiidsB6VtQUC9iR85S120+s0T5sO6s+B5MLzFcZkrEd/DGMmCjR+f2Qpxwg=="; }; }; - "p-finally-1.0.0" = { - name = "p-finally"; - packageName = "p-finally"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; - sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="; - }; - }; "p-limit-2.3.0" = { name = "p-limit"; packageName = "p-limit"; @@ -20370,15 +20037,6 @@ let sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; }; }; - "path-key-2.0.1" = { - name = "path-key"; - packageName = "path-key"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; - sha512 = "fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="; - }; - }; "path-key-3.1.1" = { name = "path-key"; packageName = "path-key"; @@ -20793,15 +20451,6 @@ let sha512 = "dL9Xc2Aj3YyBnwvCNuHmFl2LWvQacm/HEAsoVwLiuu0POboMChETt5wexpU1P6F6MnibIucXlVsMFFgNUT2IyA=="; }; }; - "plist-3.1.0" = { - name = "plist"; - packageName = "plist"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz"; - sha512 = "uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ=="; - }; - }; "plur-4.0.0" = { name = "plur"; packageName = "plur"; @@ -20946,15 +20595,6 @@ let sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; }; - "prepend-http-1.0.4" = { - name = "prepend-http"; - packageName = "prepend-http"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz"; - sha512 = "PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg=="; - }; - }; "prepend-http-2.0.0" = { name = "prepend-http"; packageName = "prepend-http"; @@ -23421,15 +23061,6 @@ let sha512 = "yEsN6TuxZhZ1Tl9iB81frTNS292m0I/IG7+w8lTvfcJQP2x3vnpOoevjBoE3Np5A6KnZM2+RtVenihj9t6NiYg=="; }; }; - "seek-bzip-1.0.6" = { - name = "seek-bzip"; - packageName = "seek-bzip"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.6.tgz"; - sha512 = "e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ=="; - }; - }; "semver-4.3.6" = { name = "semver"; packageName = "semver"; @@ -23718,15 +23349,6 @@ let sha512 = "Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg=="; }; }; - "shebang-command-1.2.0" = { - name = "shebang-command"; - packageName = "shebang-command"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; - sha512 = "EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg=="; - }; - }; "shebang-command-2.0.0" = { name = "shebang-command"; packageName = "shebang-command"; @@ -23736,15 +23358,6 @@ let sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; }; }; - "shebang-regex-1.0.0" = { - name = "shebang-regex"; - packageName = "shebang-regex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha512 = "wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ=="; - }; - }; "shebang-regex-3.0.0" = { name = "shebang-regex"; packageName = "shebang-regex"; @@ -24015,15 +23628,6 @@ let sha512 = "oVTC072yJCXdkjUXAA3rRsRo1op6XfAH1/AXJQznxdwwiYTEvYB6eG9SOU8FeVaEuz+LuoPDYEY5BBMj+uRHVQ=="; }; }; - "slash-2.0.0" = { - name = "slash"; - packageName = "slash"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz"; - sha512 = "ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="; - }; - }; "slash-3.0.0" = { name = "slash"; packageName = "slash"; @@ -25095,24 +24699,6 @@ let sha512 = "3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="; }; }; - "strip-dirs-2.1.0" = { - name = "strip-dirs"; - packageName = "strip-dirs"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz"; - sha512 = "JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g=="; - }; - }; - "strip-eof-1.0.0" = { - name = "strip-eof"; - packageName = "strip-eof"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; - sha512 = "7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q=="; - }; - }; "strip-final-newline-2.0.0" = { name = "strip-final-newline"; packageName = "strip-final-newline"; @@ -25185,15 +24771,6 @@ let sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; }; }; - "strip-outer-1.0.1" = { - name = "strip-outer"; - packageName = "strip-outer"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz"; - sha512 = "k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg=="; - }; - }; "strnum-1.1.2" = { name = "strnum"; packageName = "strnum"; @@ -25473,15 +25050,6 @@ let sha512 = "ZoROL70jptorGAlgAYiLoBLItEKw/fUxg9BSYK/dF/GAGYFJOJJJMvjPAKDJraCXFwadD456FCuvLWgfhMsPwg=="; }; }; - "tar-stream-1.6.2" = { - name = "tar-stream"; - packageName = "tar-stream"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz"; - sha512 = "rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A=="; - }; - }; "tar-stream-2.2.0" = { name = "tar-stream"; packageName = "tar-stream"; @@ -25707,15 +25275,6 @@ let sha512 = "MyqZCTGLDZ77u4k+jqg4UlrzPTPZ49NDlaekU6uuFaJLzPIN1woaRXCbGeqOfxwc3Y37ZROGAJ614Rdv7Olt+g=="; }; }; - "timed-out-4.0.1" = { - name = "timed-out"; - packageName = "timed-out"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz"; - sha512 = "G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA=="; - }; - }; "timers-browserify-1.4.2" = { name = "timers-browserify"; packageName = "timers-browserify"; @@ -25770,15 +25329,6 @@ let sha512 = "LhVdShQD/4Mk4zXNroIQZJC+Ap3zgLcDuwEdcmLv9CCO73NWockQDwyUnW/m8VX/EElfL6FcYx7EeutN4HJA6A=="; }; }; - "to-buffer-1.1.1" = { - name = "to-buffer"; - packageName = "to-buffer"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz"; - sha512 = "lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="; - }; - }; "to-object-path-0.3.0" = { name = "to-object-path"; packageName = "to-object-path"; @@ -25968,15 +25518,6 @@ let sha512 = "jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ=="; }; }; - "trim-repeated-1.0.0" = { - name = "trim-repeated"; - packageName = "trim-repeated"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz"; - sha512 = "pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg=="; - }; - }; "triple-beam-1.4.1" = { name = "triple-beam"; packageName = "triple-beam"; @@ -27057,15 +26598,6 @@ let sha512 = "PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ=="; }; }; - "unzip-response-2.0.1" = { - name = "unzip-response"; - packageName = "unzip-response"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz"; - sha512 = "N0XH6lqDtFH84JxptQoZYmloF4nzrQqqrAymNj+/gW60AO2AZgOcf4O/nUXJcYfyQkqvMo9lSupBZmmgvuVXlw=="; - }; - }; "upath-1.2.0" = { name = "upath"; packageName = "upath"; @@ -27165,15 +26697,6 @@ let sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; }; }; - "url-parse-lax-1.0.0" = { - name = "url-parse-lax"; - packageName = "url-parse-lax"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; - sha512 = "BVA4lR5PIviy2PMseNd2jbFQ+jwSwQGdJejf5ctd1rEXt0Ypd7yanUK9+lYechVlN5VaTJGsu2U/3MDDu6KgBA=="; - }; - }; "url-parse-lax-3.0.0" = { name = "url-parse-lax"; packageName = "url-parse-lax"; @@ -27183,15 +26706,6 @@ let sha512 = "NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ=="; }; }; - "url-to-options-1.0.1" = { - name = "url-to-options"; - packageName = "url-to-options"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz"; - sha512 = "0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A=="; - }; - }; "urlpattern-polyfill-10.0.0" = { name = "urlpattern-polyfill"; packageName = "urlpattern-polyfill"; @@ -32512,204 +32026,6 @@ in bypassCache = true; reconstructLock = true; }; - code-theme-converter = nodeEnv.buildNodePackage { - name = "code-theme-converter"; - packageName = "code-theme-converter"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/code-theme-converter/-/code-theme-converter-1.2.1.tgz"; - sha512 = "uPhR9IKtN1z6gt9mpRH5OAdYjJQgQq7CCQpm5VmCpLe2QdGDzi4xfB3ybXGaBRX+UN4whtz3pZvgZssJvBwcqQ=="; - }; - dependencies = [ - sources."@xmldom/xmldom-0.8.10" - sources."@xstate/fsm-1.6.5" - sources."ansi-styles-3.2.1" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."bl-1.2.3" - sources."brace-expansion-1.1.11" - sources."buffer-5.7.1" - sources."buffer-alloc-1.2.0" - sources."buffer-alloc-unsafe-1.1.0" - sources."buffer-crc32-0.2.13" - sources."buffer-fill-1.0.0" - sources."capture-stack-trace-1.0.2" - sources."caw-2.0.1" - sources."chalk-2.4.2" - sources."cmd-shim-2.1.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."commander-5.1.0" - sources."concat-map-0.0.1" - sources."config-chain-1.1.13" - sources."core-util-is-1.0.3" - sources."create-error-class-3.0.2" - sources."cross-spawn-6.0.6" - sources."decompress-4.2.1" - sources."decompress-tar-4.1.1" - ( - sources."decompress-tarbz2-4.1.1" - // { - dependencies = [ - sources."file-type-6.2.0" - ]; - } - ) - sources."decompress-targz-4.1.1" - ( - sources."decompress-unzip-4.0.1" - // { - dependencies = [ - sources."file-type-3.9.0" - sources."get-stream-2.3.1" - ]; - } - ) - sources."download-5.0.3" - sources."download-git-repo-1.1.0" - sources."duplexer3-0.1.5" - sources."end-of-stream-1.4.4" - sources."escape-string-regexp-1.0.5" - ( - sources."execa-1.0.0" - // { - dependencies = [ - sources."get-stream-4.1.0" - ]; - } - ) - sources."fd-slicer-1.1.0" - sources."file-type-5.2.0" - sources."filename-reserved-regex-2.0.0" - sources."filenamify-2.1.0" - sources."fs-constants-1.0.0" - sources."fs-extra-8.1.0" - sources."fs.realpath-1.0.0" - sources."get-proxy-2.1.0" - sources."get-stream-3.0.0" - sources."git-clone-0.1.0" - sources."glob-7.2.3" - sources."got-6.7.1" - sources."graceful-fs-4.2.11" - sources."has-flag-3.0.0" - sources."has-symbol-support-x-1.4.2" - sources."has-to-string-tag-x-1.4.1" - sources."ieee754-1.2.1" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."is-natural-number-4.0.1" - sources."is-object-1.0.2" - sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.2.0" - sources."is-stream-1.1.0" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isurl-1.0.0" - sources."js2xmlparser-4.0.2" - sources."json5-2.2.3" - sources."jsonfile-4.0.0" - sources."lowercase-keys-1.0.1" - ( - sources."make-dir-1.3.0" - // { - dependencies = [ - sources."pify-3.0.0" - ]; - } - ) - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."nice-try-1.0.5" - ( - sources."npm-conf-1.1.3" - // { - dependencies = [ - sources."pify-3.0.0" - ]; - } - ) - sources."npm-run-path-2.0.2" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."p-finally-1.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - sources."pend-1.2.0" - sources."pify-2.3.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."plist-3.1.0" - sources."prepend-http-1.0.4" - sources."process-nextick-args-2.0.1" - sources."proto-list-1.2.4" - sources."pump-3.0.2" - sources."ramda-0.27.2" - ( - sources."readable-stream-2.3.8" - // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - } - ) - sources."rimraf-2.7.1" - sources."safe-buffer-5.2.1" - ( - sources."seek-bzip-1.0.6" - // { - dependencies = [ - sources."commander-2.20.3" - ]; - } - ) - sources."semver-5.7.2" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.7" - sources."slash-2.0.0" - ( - sources."string_decoder-1.1.1" - // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - } - ) - sources."strip-dirs-2.1.0" - sources."strip-eof-1.0.0" - sources."strip-outer-1.0.1" - sources."supports-color-5.5.0" - sources."tar-stream-1.6.2" - sources."through-2.3.8" - sources."timed-out-4.0.1" - sources."to-buffer-1.1.1" - sources."trim-repeated-1.0.0" - sources."tunnel-agent-0.6.0" - sources."unbzip2-stream-1.4.3" - sources."universalify-0.1.2" - sources."unzip-response-2.0.1" - sources."url-parse-lax-1.0.0" - sources."url-to-options-1.0.1" - sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" - sources."which-1.3.1" - sources."wrappy-1.0.2" - sources."xmlbuilder-15.1.1" - sources."xmlcreate-2.0.4" - sources."xtend-4.0.2" - sources."yauzl-2.10.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Convert any vscode theme with ease"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; conventional-changelog-cli = nodeEnv.buildNodePackage { name = "conventional-changelog-cli"; packageName = "conventional-changelog-cli"; From 00d6652c4cf4fcdabfd2cde2e67b739a72a15f33 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 15:24:32 -0500 Subject: [PATCH 06/10] diff2html-cli: migrate from nodePackages --- pkgs/by-name/di/diff2html-cli/package.nix | 47 +++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 182 ------------------ 5 files changed, 48 insertions(+), 184 deletions(-) create mode 100644 pkgs/by-name/di/diff2html-cli/package.nix diff --git a/pkgs/by-name/di/diff2html-cli/package.nix b/pkgs/by-name/di/diff2html-cli/package.nix new file mode 100644 index 000000000000..f978092e7352 --- /dev/null +++ b/pkgs/by-name/di/diff2html-cli/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "diff2html-cli"; + version = "5.2.15"; + + src = fetchFromGitHub { + owner = "rtfpessoa"; + repo = "diff2html-cli"; + rev = finalAttrs.version; + hash = "sha256-aQoWn5n+xpYjhDQjw9v5HzWf/Hhmm6AK22OG4Ugq6Gk="; + }; + + postPatch = '' + substituteInPlace package.json \ + --replace-fail "4.2.1" "${finalAttrs.version}"; + ''; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-9JkzWhsXUrjnMcDDJfqm+tZ+WV5j3CHJbpn9j7v/KLg="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + ]; + + meta = { + description = "Generate pretty HTML diffs from unified and git diff output in your terminal"; + homepage = "https://diff2html.xyz#cli"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "diff2html"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index cb18bf8fd1d2..dc1d6b7986f5 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -144,6 +144,7 @@ mapAliases { dat = throw "dat was removed because it was broken"; # added 2023-08-21 inherit (pkgs) degit; # added 2023-08-18 inherit (pkgs) diagnostic-languageserver; # added 2024-06-25 + inherit (pkgs) diff2html-cli; # Added 2025-11-08 inherit (pkgs) dockerfile-language-server-nodejs; # added 2023-08-18 inherit (pkgs) dotenv-cli; # added 2024-06-26 eask = pkgs.eask; # added 2023-08-17 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 6979f88e5242..e49eb1dbc12c 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -10,7 +10,6 @@ clipboard-cli = "clipboard"; conventional-changelog-cli = "conventional-changelog"; cpy-cli = "cpy"; - diff2html-cli = "diff2html"; fast-cli = "fast"; fauna-shell = "fauna"; fkill-cli = "fkill"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index abcad7ed111e..23004c2d7a22 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -20,7 +20,6 @@ , "conventional-changelog-cli" , "cpy-cli" , "dhcp" -, "diff2html-cli" , "dotenv-vault" , "elasticdump" , "emoj" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 7b2cbcb8c933..82a019701046 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -8184,15 +8184,6 @@ let sha512 = "NxuWFXR3+HJULO6F6VprWnUQbx0MXgfEuOfz3m+pw8LYZV06SHRjcaBVvVlwH132xJq12mljySVDLcbMcFM7EA=="; }; }; - "data-uri-to-buffer-4.0.1" = { - name = "data-uri-to-buffer"; - packageName = "data-uri-to-buffer"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz"; - sha512 = "0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A=="; - }; - }; "data-uri-to-buffer-6.0.2" = { name = "data-uri-to-buffer"; packageName = "data-uri-to-buffer"; @@ -8823,24 +8814,6 @@ let sha512 = "uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A=="; }; }; - "diff-7.0.0" = { - name = "diff"; - packageName = "diff"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz"; - sha512 = "PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw=="; - }; - }; - "diff2html-3.4.51" = { - name = "diff2html"; - packageName = "diff2html"; - version = "3.4.51"; - src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.51.tgz"; - sha512 = "/rVCSDyokkzSCEGaGjkkElXtIRwyNDRzIa3S8VUhR6pjk25p6+AMnb1s2zGmhjl66D5m/HnV3IeZoxnWsvTy+w=="; - }; - }; "diffie-hellman-5.0.3" = { name = "diffie-hellman"; packageName = "diffie-hellman"; @@ -10596,15 +10569,6 @@ let sha512 = "OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw=="; }; }; - "fetch-blob-3.2.0" = { - name = "fetch-blob"; - packageName = "fetch-blob"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz"; - sha512 = "7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ=="; - }; - }; "fifo-0.1.4" = { name = "fifo"; packageName = "fifo"; @@ -11091,15 +11055,6 @@ let sha512 = "wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww=="; }; }; - "formdata-polyfill-4.0.10" = { - name = "formdata-polyfill"; - packageName = "formdata-polyfill"; - version = "4.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz"; - sha512 = "buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g=="; - }; - }; "formidable-1.2.6" = { name = "formidable"; packageName = "formidable"; @@ -12396,15 +12351,6 @@ let sha512 = "Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg=="; }; }; - "hogan.js-3.0.2" = { - name = "hogan.js"; - packageName = "hogan.js"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz"; - sha512 = "RqGs4wavGYJWE07t35JQccByczmNUXQT0E12ZYV1VKYu5UiAU9lsos/yBAcf840+zrUQQxgVduCR5/B8nNtibg=="; - }; - }; "homedir-polyfill-1.0.3" = { name = "homedir-polyfill"; packageName = "homedir-polyfill"; @@ -17823,15 +17769,6 @@ let sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="; }; }; - "mkdirp-0.3.0" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; - sha512 = "OHsdUcVAQ6pOtg5JYWpCBo9W/GySVuwvP9hueRMW7UqshC0tbfzLv8wjySTPm3tfUZ/21CE9E1pJagOA91Pxew=="; - }; - }; "mkdirp-0.3.5" = { name = "mkdirp"; packageName = "mkdirp"; @@ -18381,15 +18318,6 @@ let sha512 = "h66cRVEWnPQFxh5Y1hk9MNs6jvlB26CjT727ZztkIkPN+eyRI2c9powQrBJ9pty2Kj7IBySDnYHig7QElmU4Pg=="; }; }; - "node-domexception-1.0.0" = { - name = "node-domexception"; - packageName = "node-domexception"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz"; - sha512 = "/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ=="; - }; - }; "node-emoji-1.11.0" = { name = "node-emoji"; packageName = "node-emoji"; @@ -18426,15 +18354,6 @@ let sha512 = "c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="; }; }; - "node-fetch-3.3.2" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz"; - sha512 = "dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA=="; - }; - }; "node-fetch-h2-2.3.0" = { name = "node-fetch-h2"; packageName = "node-fetch-h2"; @@ -18498,15 +18417,6 @@ let sha512 = "5s0JxqhDx9/rksG2BTMVN1enjWSvPidpoSgViZU4ZXULyTe+7jxcCRLB6f42Z0l1xYJpleCBtSyY6Lwg3uu5CQ=="; }; }; - "nopt-1.0.10" = { - name = "nopt"; - packageName = "nopt"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; - sha512 = "NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg=="; - }; - }; "nopt-2.0.0" = { name = "nopt"; packageName = "nopt"; @@ -27624,15 +27534,6 @@ let sha512 = "bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ=="; }; }; - "web-streams-polyfill-3.3.3" = { - name = "web-streams-polyfill"; - packageName = "web-streams-polyfill"; - version = "3.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz"; - sha512 = "d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw=="; - }; - }; "web-vitals-0.2.4" = { name = "web-vitals"; packageName = "web-vitals"; @@ -32187,89 +32088,6 @@ in bypassCache = true; reconstructLock = true; }; - diff2html-cli = nodeEnv.buildNodePackage { - name = "diff2html-cli"; - packageName = "diff2html-cli"; - version = "5.2.15"; - src = fetchurl { - url = "https://registry.npmjs.org/diff2html-cli/-/diff2html-cli-5.2.15.tgz"; - sha512 = "w1WJSzyiXDSVsz6cYPE7eu0f3KptN1fT2s/i0ENavaB9aT1Fj/3zjH00mYB14JiPdj3X0hl4PsrtBNjgGKdpkA=="; - }; - dependencies = [ - sources."abbrev-1.1.1" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."bundle-name-4.1.0" - sources."clipboardy-4.0.0" - sources."cliui-8.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."cross-spawn-7.0.6" - sources."data-uri-to-buffer-4.0.1" - sources."default-browser-5.2.1" - sources."default-browser-id-5.0.0" - sources."define-lazy-prop-3.0.0" - sources."diff-7.0.0" - sources."diff2html-3.4.51" - sources."emoji-regex-8.0.0" - sources."escalade-3.2.0" - sources."execa-8.0.1" - sources."fetch-blob-3.2.0" - sources."formdata-polyfill-4.0.10" - sources."get-caller-file-2.0.5" - sources."get-stream-8.0.1" - sources."hogan.js-3.0.2" - sources."human-signals-5.0.0" - sources."is-docker-3.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."is-inside-container-1.0.0" - sources."is-stream-3.0.0" - sources."is-wsl-3.1.0" - sources."is64bit-2.0.0" - sources."isexe-2.0.0" - sources."merge-stream-2.0.0" - sources."mimic-fn-4.0.0" - sources."mkdirp-0.3.0" - sources."node-domexception-1.0.0" - sources."node-fetch-3.3.2" - sources."nopt-1.0.10" - ( - sources."npm-run-path-5.3.0" - // { - dependencies = [ - sources."path-key-4.0.0" - ]; - } - ) - sources."onetime-6.0.0" - sources."open-10.1.0" - sources."path-key-3.1.1" - sources."require-directory-2.1.1" - sources."run-applescript-7.0.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."strip-final-newline-3.0.0" - sources."system-architecture-0.1.0" - sources."web-streams-polyfill-3.3.3" - sources."which-2.0.2" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.8" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Fast Diff to colorized HTML"; - homepage = "https://diff2html.xyz/index.html#cli"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; dotenv-vault = nodeEnv.buildNodePackage { name = "dotenv-vault"; packageName = "dotenv-vault"; From bf8b1fcf7123fdcf9ac4141c2d285f7e73823836 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 16:01:07 -0500 Subject: [PATCH 07/10] katex: migrate from nodePackages --- pkgs/by-name/ka/katex/package.nix | 67 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 21 ------ 4 files changed, 68 insertions(+), 22 deletions(-) create mode 100644 pkgs/by-name/ka/katex/package.nix diff --git a/pkgs/by-name/ka/katex/package.nix b/pkgs/by-name/ka/katex/package.nix new file mode 100644 index 000000000000..3c01de945680 --- /dev/null +++ b/pkgs/by-name/ka/katex/package.nix @@ -0,0 +1,67 @@ +{ + lib, + stdenv, + fetchFromGitHub, + yarn-berry, + nodejs, + makeBinaryWrapper, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "katex"; + version = "0.16.25"; + + src = fetchFromGitHub { + owner = "katex"; + repo = "katex"; + rev = "v${finalAttrs.version}"; + hash = "sha256-XwKjoXkn96YNxrBv2qcUSqKMtHxz9+levevc4Rz1SYw="; + }; + + offlineCache = yarn-berry.fetchYarnBerryDeps { + inherit (finalAttrs) src; + hash = "sha256-vPYzt+ZBbi1sR7T1I08f/syTnN8hnUTqH4fKCBiFIM0="; + }; + + nativeBuildInputs = [ + yarn-berry.yarnBerryConfigHook + yarn-berry + nodejs + makeBinaryWrapper + ]; + + buildPhase = '' + runHook preBuild + + yarn build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + yarn config set nodeLinker "node-modules" + yarn install --mode=skip-build --inline-builds + mkdir -p $out/lib/node_modules/katex/ + mkdir $out/bin + mv * $out/lib/node_modules/katex/ + makeWrapper ${lib.getExe nodejs} $out/bin/katex \ + --add-flags "$out/lib/node_modules/katex/cli.js" \ + --set NODE_PATH "$out/lib/node_modules/katex/node_modules" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/KaTeX/KaTeX/releases/tag/v${finalAttrs.version}"; + description = "Render TeX to HTML"; + homepage = "https://katex.org/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pyrox0 ]; + mainProgram = "katex"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index dc1d6b7986f5..f05a7ab63cd5 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -203,6 +203,7 @@ mapAliases { joplin = pkgs.joplin-cli; # Added 2025-11-02 inherit (pkgs) kaput-cli; # added 2024-12-03 karma = pkgs.karma-runner; # added 2023-07-29 + inherit (pkgs) katex; # Added 2025-11-08 keyoxide = pkgs.keyoxide-cli; # Added 2025-10-20 leetcode-cli = self.vsc-leetcode-cli; # added 2023-08-31 inherit (pkgs) lerna; # added 2025-02-12 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 23004c2d7a22..c3283adf1511 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -39,7 +39,6 @@ , "json" , "json-refs" , "jsonlint" -, "katex" , "lcov-result-merger" , "live-server" , "livedown" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 82a019701046..8639481e8a11 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -34589,27 +34589,6 @@ in bypassCache = true; reconstructLock = true; }; - katex = nodeEnv.buildNodePackage { - name = "katex"; - packageName = "katex"; - version = "0.16.21"; - src = fetchurl { - url = "https://registry.npmjs.org/katex/-/katex-0.16.21.tgz"; - sha512 = "XvqR7FgOHtWupfMiigNzmh+MgUVmDGU2kXZm899ZkPfcuoPuFxyHmXsgATDpFZDAXCI8tvinaVcDo8PIIJSo4A=="; - }; - dependencies = [ - sources."commander-8.3.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Fast math typesetting for the web"; - homepage = "https://katex.org"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; lcov-result-merger = nodeEnv.buildNodePackage { name = "lcov-result-merger"; packageName = "lcov-result-merger"; From 30910d713d9989ca5eccd95ae08e98838668cd85 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 16:10:48 -0500 Subject: [PATCH 08/10] localtunnel: migrate from nodePackages --- pkgs/by-name/lo/localtunnel/package.nix | 44 +++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 77 ------------------- 5 files changed, 45 insertions(+), 79 deletions(-) create mode 100644 pkgs/by-name/lo/localtunnel/package.nix diff --git a/pkgs/by-name/lo/localtunnel/package.nix b/pkgs/by-name/lo/localtunnel/package.nix new file mode 100644 index 000000000000..34781bea138e --- /dev/null +++ b/pkgs/by-name/lo/localtunnel/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnInstallHook, + nodejs, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "localtunnel"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "localtunnel"; + repo = "localtunnel"; + rev = "v${finalAttrs.version}"; + hash = "sha256-6gEK1VjF25Kbe2drxbxUKDNJGqZ+OXgkulPkAkMR2+k="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-zq9ygsKDU4lIsNxc6ovW+IXVztQoEaJAekzBrwCK7ik="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnInstallHook + nodejs + ]; + + updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/localtunnel/localtunnel/blob/v${finalAttrs.version}/CHANGELOG.md"; + description = "CLI for localtunnel"; + homepage = "https://localtunnel.me"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "lt"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index f05a7ab63cd5..c20bcd79d4cf 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -209,6 +209,7 @@ mapAliases { inherit (pkgs) lerna; # added 2025-02-12 less = pkgs.lessc; # added 2024-06-15 less-plugin-clean-css = pkgs.lessc.plugins.clean-css; # added 2024-06-15 + inherit (pkgs) localtunnel; # Added 2025-11-08 lodash = throw "lodash was removed because it provides no executable"; # added 2025-03-18 lua-fmt = throw "'lua-fmt' has been removed because it has critical bugs that break formatting"; # Added 2025-11-07 inherit (pkgs) lv_font_conv; # added 2024-06-28 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index e49eb1dbc12c..b9b549847bca 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -16,7 +16,6 @@ grunt-cli = "grunt"; gulp-cli = "gulp"; jsonlint = "jsonlint"; - localtunnel = "lt"; poor-mans-t-sql-formatter-cli = "sqlformat"; pulp = "pulp"; purescript-language-server = "purescript-language-server"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c3283adf1511..fe92e3018860 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -42,7 +42,6 @@ , "lcov-result-merger" , "live-server" , "livedown" -, "localtunnel" , "madoko" , "mathjax" , "multi-file-swagger" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 8639481e8a11..b0a4ab1b2f51 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -4845,15 +4845,6 @@ let sha512 = "lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw=="; }; }; - "axios-0.21.4" = { - name = "axios"; - packageName = "axios"; - version = "0.21.4"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"; - sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; - }; - }; "axios-1.8.3" = { name = "axios"; packageName = "axios"; @@ -8247,15 +8238,6 @@ let sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; }; }; - "debug-4.3.2" = { - name = "debug"; - packageName = "debug"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; - sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; - }; - }; "debug-4.3.4" = { name = "debug"; packageName = "debug"; @@ -19155,15 +19137,6 @@ let sha512 = "9asTNB9IkKEzWMcHmVZE7Ts3kC9G7AFHfs8i7caD8HbI76gEjdkId4z/AkP83xdZsH7PLAnnbl47qZkXuxpArw=="; }; }; - "openurl-1.1.1" = { - name = "openurl"; - packageName = "openurl"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz"; - sha512 = "d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA=="; - }; - }; "opn-5.3.0" = { name = "opn"; packageName = "opn"; @@ -28200,15 +28173,6 @@ let sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; }; }; - "yargs-17.1.1" = { - name = "yargs"; - packageName = "yargs"; - version = "17.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz"; - sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ=="; - }; - }; "yargs-17.7.2" = { name = "yargs"; packageName = "yargs"; @@ -35595,47 +35559,6 @@ in bypassCache = true; reconstructLock = true; }; - localtunnel = nodeEnv.buildNodePackage { - name = "localtunnel"; - packageName = "localtunnel"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.2.tgz"; - sha512 = "n418Cn5ynvJd7m/N1d9WVJISLJF/ellZnfsLnx8WBWGzxv/ntNcFkJ1o6se5quUhCplfLGBNL5tYHiq5WF3Nug=="; - }; - dependencies = [ - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."axios-0.21.4" - sources."cliui-7.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."debug-4.3.2" - sources."emoji-regex-8.0.0" - sources."escalade-3.2.0" - sources."follow-redirects-1.15.9" - sources."get-caller-file-2.0.5" - sources."is-fullwidth-code-point-3.0.0" - sources."ms-2.1.2" - sources."openurl-1.1.1" - sources."require-directory-2.1.1" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.8" - sources."yargs-17.1.1" - sources."yargs-parser-20.2.9" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Expose localhost to the world"; - homepage = "https://github.com/localtunnel/localtunnel#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; madoko = nodeEnv.buildNodePackage { name = "madoko"; packageName = "madoko"; From fed8fa12ce8ff110214f91b25c97c8f90268dacd Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 17:02:11 -0500 Subject: [PATCH 09/10] conventional-changelog-cli: migrate from nodePackages --- .../co/conventional-changelog-cli/package.nix | 68 ++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 318 ------------------ 5 files changed, 69 insertions(+), 320 deletions(-) create mode 100644 pkgs/by-name/co/conventional-changelog-cli/package.nix diff --git a/pkgs/by-name/co/conventional-changelog-cli/package.nix b/pkgs/by-name/co/conventional-changelog-cli/package.nix new file mode 100644 index 000000000000..c3d264d6ec0f --- /dev/null +++ b/pkgs/by-name/co/conventional-changelog-cli/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nodejs, + pnpm, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "conventional-changelog-cli"; + version = "7.1.1"; + + src = fetchFromGitHub { + owner = "conventional-changelog"; + repo = "conventional-changelog"; + tag = "conventional-changelog-v${finalAttrs.version}"; + hash = "sha256-Pgx5gM4SdSL6WCkStByA7AP2O96MjAjyeMOI+Lo2mt0="; + }; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + fetcherVersion = 2; + hash = "sha256-ZfG3F0J1hIhZlF2OadhVdbxhQrFcMYDG9gEXR04DgEI="; + }; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + ]; + + buildPhase = '' + runHook preBuild + + pnpm run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/node_modules/conventional-changelog/ + mkdir $out/bin + mv * $out/lib/node_modules/conventional-changelog/ + chmod +x $out/lib/node_modules/conventional-changelog/packages/conventional-changelog/dist/cli/index.js + ln -s $out/lib/node_modules/conventional-changelog/packages/conventional-changelog/dist/cli/index.js $out/bin/conventional-changelog + patchShebangs $out/bin/conventional-changelog + + runHook postInstall + ''; + + postInstall = '' + substituteInPlace $out/lib/node_modules/conventional-changelog/packages/*/package.json \ + --replace-warn '"exports": "./src/index.ts"' '"exports": "./dist/index.js"' + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/conventional-changelog/conventional-changelog/releases/tag/conventional-changelog-v${finalAttrs.version}"; + description = "Generate a CHANGELOG from git metadata"; + homepage = "https://github.com/conventional-changelog/conventional-changelog"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.pyrox0 ]; + mainProgram = "conventional-changelog"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index c20bcd79d4cf..b0133d617fb8 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -135,6 +135,7 @@ mapAliases { coffee-script = pkgs.coffeescript; # added 2023-08-18 inherit (pkgs) concurrently; # added 2024-08-05 inherit (pkgs) configurable-http-proxy; # added 2023-08-19 + inherit (pkgs) conventional-changelog-cli; # Added 2025-11-08 copy-webpack-plugin = throw "copy-webpack-plugin was removed because it is a JS library, so your project should lock it with a JS package manager instead."; # Added 2024-12-16 inherit (pkgs) cordova; # added 2023-08-18 create-cycle-app = throw "create-cycle-app has been removed because it is unmaintained and has issues installing with recent nodejs versions."; # Added 2025-11-01 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index b9b549847bca..d907f1456299 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -8,7 +8,6 @@ aws-cdk = "cdk"; cdk8s-cli = "cdk8s"; clipboard-cli = "clipboard"; - conventional-changelog-cli = "conventional-changelog"; cpy-cli = "cpy"; fast-cli = "fast"; fauna-shell = "fauna"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index fe92e3018860..c92752a7f4b9 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -17,7 +17,6 @@ , "coc-ltex" , "coc-tsserver" , "coc-ultisnips" -, "conventional-changelog-cli" , "cpy-cli" , "dhcp" , "dotenv-vault" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index b0a4ab1b2f51..4bb78775ca20 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -444,15 +444,6 @@ let sha512 = "Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA=="; }; }; - "@conventional-changelog/git-client-1.0.1" = { - name = "_at_conventional-changelog_slash_git-client"; - packageName = "@conventional-changelog/git-client"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@conventional-changelog/git-client/-/git-client-1.0.1.tgz"; - sha512 = "PJEqBwAleffCMETaVm/fUgHldzBE35JFk3/9LL6NUA5EXa3qednu+UT6M7E5iBu3zIQZCULYIiZ90fBYHt6xUw=="; - }; - }; "@cspotcode/source-map-support-0.8.1" = { name = "_at_cspotcode_slash_source-map-support"; packageName = "@cspotcode/source-map-support"; @@ -732,15 +723,6 @@ let sha512 = "xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ=="; }; }; - "@hutson/parse-repository-url-5.0.0" = { - name = "_at_hutson_slash_parse-repository-url"; - packageName = "@hutson/parse-repository-url"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-5.0.0.tgz"; - sha512 = "e5+YUKENATs1JgYHMzTr2MW/NDcXGfYFAuOQU8gJgF/kEh4EqKgfGrfLI67bMD4tbhZVlkigz/9YYwWcbOFthg=="; - }; - }; "@ibm-cloud/openapi-ruleset-1.29.2" = { name = "_at_ibm-cloud_slash_openapi-ruleset"; packageName = "@ibm-cloud/openapi-ruleset"; @@ -3234,15 +3216,6 @@ let sha512 = "JuRQ9KXLEjaUNjTWpzuR231Z2WpIwczOkBEIvbHNCzQefFIT0L8IqE6NV6ULLyC1SI/i234JnDoMkfg+RjQj2g=="; }; }; - "@types/semver-7.5.8" = { - name = "_at_types_slash_semver"; - packageName = "@types/semver"; - version = "7.5.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz"; - sha512 = "I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ=="; - }; - }; "@types/supports-color-8.1.3" = { name = "_at_types_slash_supports-color"; packageName = "@types/supports-color"; @@ -3702,15 +3675,6 @@ let sha512 = "ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g=="; }; }; - "add-stream-1.0.0" = { - name = "add-stream"; - packageName = "add-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz"; - sha512 = "qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ=="; - }; - }; "addr-to-ip-port-1.5.4" = { name = "addr-to-ip-port"; packageName = "addr-to-ip-port"; @@ -4377,15 +4341,6 @@ let sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="; }; }; - "array-ify-1.0.0" = { - name = "array-ify"; - packageName = "array-ify"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz"; - sha512 = "c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng=="; - }; - }; "array-iterate-1.1.4" = { name = "array-iterate"; packageName = "array-iterate"; @@ -7050,15 +7005,6 @@ let sha512 = "3D+EY5nsRhqnOwDxveBv5T8wGo4DEvYxjDtPGmdOX+gfr5gE92c2RC0w2wa+xEefm07QuVqqcF3nZJUZ92l/og=="; }; }; - "compare-func-2.0.0" = { - name = "compare-func"; - packageName = "compare-func"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz"; - sha512 = "zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA=="; - }; - }; "component-bind-1.0.0" = { name = "component-bind"; packageName = "component-bind"; @@ -7365,141 +7311,6 @@ let sha512 = "nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="; }; }; - "conventional-changelog-6.0.0" = { - name = "conventional-changelog"; - packageName = "conventional-changelog"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-6.0.0.tgz"; - sha512 = "tuUH8H/19VjtD9Ig7l6TQRh+Z0Yt0NZ6w/cCkkyzUbGQTnUEmKfGtkC9gGfVgCfOL1Rzno5NgNF4KY8vR+Jo3w=="; - }; - }; - "conventional-changelog-angular-8.0.0" = { - name = "conventional-changelog-angular"; - packageName = "conventional-changelog-angular"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-8.0.0.tgz"; - sha512 = "CLf+zr6St0wIxos4bmaKHRXWAcsCXrJU6F4VdNDrGRK3B8LDLKoX3zuMV5GhtbGkVR/LohZ6MT6im43vZLSjmA=="; - }; - }; - "conventional-changelog-atom-5.0.0" = { - name = "conventional-changelog-atom"; - packageName = "conventional-changelog-atom"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-5.0.0.tgz"; - sha512 = "WfzCaAvSCFPkznnLgLnfacRAzjgqjLUjvf3MftfsJzQdDICqkOOpcMtdJF3wTerxSpv2IAAjX8doM3Vozqle3g=="; - }; - }; - "conventional-changelog-codemirror-5.0.0" = { - name = "conventional-changelog-codemirror"; - packageName = "conventional-changelog-codemirror"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-5.0.0.tgz"; - sha512 = "8gsBDI5Y3vrKUCxN6Ue8xr6occZ5nsDEc4C7jO/EovFGozx8uttCAyfhRrvoUAWi2WMm3OmYs+0mPJU7kQdYWQ=="; - }; - }; - "conventional-changelog-conventionalcommits-8.0.0" = { - name = "conventional-changelog-conventionalcommits"; - packageName = "conventional-changelog-conventionalcommits"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-8.0.0.tgz"; - sha512 = "eOvlTO6OcySPyyyk8pKz2dP4jjElYunj9hn9/s0OB+gapTO8zwS9UQWrZ1pmF2hFs3vw1xhonOLGcGjy/zgsuA=="; - }; - }; - "conventional-changelog-core-8.0.0" = { - name = "conventional-changelog-core"; - packageName = "conventional-changelog-core"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-8.0.0.tgz"; - sha512 = "EATUx5y9xewpEe10UEGNpbSHRC6cVZgO+hXQjofMqpy+gFIrcGvH3Fl6yk2VFKh7m+ffenup2N7SZJYpyD9evw=="; - }; - }; - "conventional-changelog-ember-5.0.0" = { - name = "conventional-changelog-ember"; - packageName = "conventional-changelog-ember"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-5.0.0.tgz"; - sha512 = "RPflVfm5s4cSO33GH/Ey26oxhiC67akcxSKL8CLRT3kQX2W3dbE19sSOM56iFqUJYEwv9mD9r6k79weWe1urfg=="; - }; - }; - "conventional-changelog-eslint-6.0.0" = { - name = "conventional-changelog-eslint"; - packageName = "conventional-changelog-eslint"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-6.0.0.tgz"; - sha512 = "eiUyULWjzq+ybPjXwU6NNRflApDWlPEQEHvI8UAItYW/h22RKkMnOAtfCZxMmrcMO1OKUWtcf2MxKYMWe9zJuw=="; - }; - }; - "conventional-changelog-express-5.0.0" = { - name = "conventional-changelog-express"; - packageName = "conventional-changelog-express"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-5.0.0.tgz"; - sha512 = "D8Q6WctPkQpvr2HNCCmwU5GkX22BVHM0r4EW8vN0230TSyS/d6VQJDAxGb84lbg0dFjpO22MwmsikKL++Oo/oQ=="; - }; - }; - "conventional-changelog-jquery-6.0.0" = { - name = "conventional-changelog-jquery"; - packageName = "conventional-changelog-jquery"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-6.0.0.tgz"; - sha512 = "2kxmVakyehgyrho2ZHBi90v4AHswkGzHuTaoH40bmeNqUt20yEkDOSpw8HlPBfvEQBwGtbE+5HpRwzj6ac2UfA=="; - }; - }; - "conventional-changelog-jshint-5.0.0" = { - name = "conventional-changelog-jshint"; - packageName = "conventional-changelog-jshint"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-5.0.0.tgz"; - sha512 = "gGNphSb/opc76n2eWaO6ma4/Wqu3tpa2w7i9WYqI6Cs2fncDSI2/ihOfMvXveeTTeld0oFvwMVNV+IYQIk3F3g=="; - }; - }; - "conventional-changelog-preset-loader-5.0.0" = { - name = "conventional-changelog-preset-loader"; - packageName = "conventional-changelog-preset-loader"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-5.0.0.tgz"; - sha512 = "SetDSntXLk8Jh1NOAl1Gu5uLiCNSYenB5tm0YVeZKePRIgDW9lQImromTwLa3c/Gae298tsgOM+/CYT9XAl0NA=="; - }; - }; - "conventional-changelog-writer-8.0.1" = { - name = "conventional-changelog-writer"; - packageName = "conventional-changelog-writer"; - version = "8.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-8.0.1.tgz"; - sha512 = "hlqcy3xHred2gyYg/zXSMXraY2mjAYYo0msUCpK+BGyaVJMFCKWVXPIHiaacGO2GGp13kvHWXFhYmxT4QQqW3Q=="; - }; - }; - "conventional-commits-filter-5.0.0" = { - name = "conventional-commits-filter"; - packageName = "conventional-commits-filter"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-5.0.0.tgz"; - sha512 = "tQMagCOC59EVgNZcC5zl7XqO30Wki9i9J3acbUvkaosCT6JX3EeFwJD7Qqp4MCikRnzS18WXV3BLIQ66ytu6+Q=="; - }; - }; - "conventional-commits-parser-6.1.0" = { - name = "conventional-commits-parser"; - packageName = "conventional-commits-parser"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-6.1.0.tgz"; - sha512 = "5nxDo7TwKB5InYBl4ZC//1g9GRwB/F3TXOGR9hgUjMGfvSP4Vu5NkpNro2+1+TIEy1vwxApl5ircECr2ri5JIw=="; - }; - }; "convert-hrtime-3.0.0" = { name = "convert-hrtime"; packageName = "convert-hrtime"; @@ -11478,15 +11289,6 @@ let sha512 = "PdNkH2snpXsKIzho6OWMZKEl+KZG6Zm+1ghQIDi0tEq1sz/S1tDjvNuYrX2ZpomalHAB89OUQim8O6vN+jesNQ=="; }; }; - "git-raw-commits-5.0.0" = { - name = "git-raw-commits"; - packageName = "git-raw-commits"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-5.0.0.tgz"; - sha512 = "I2ZXrXeOc0KrCvC7swqtIFXFN+rbjnC7b2T943tvemIOVNl+XP8YnA9UVwqFhzzLClnSA60KR/qEjLpXzs73Qg=="; - }; - }; "git-repo-info-2.1.1" = { name = "git-repo-info"; packageName = "git-repo-info"; @@ -11496,15 +11298,6 @@ let sha512 = "8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg=="; }; }; - "git-semver-tags-8.0.0" = { - name = "git-semver-tags"; - packageName = "git-semver-tags"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-8.0.0.tgz"; - sha512 = "N7YRIklvPH3wYWAR2vysaqGLPRcpwQ0GKdlqTiVN5w1UmCdaeY3K8s6DMKRCh54DDdzyt/OAB6C8jgVtb7Y2Fg=="; - }; - }; "git-spawned-stream-1.0.1" = { name = "git-spawned-stream"; packageName = "git-spawned-stream"; @@ -11919,15 +11712,6 @@ let sha512 = "V2FaKiOhpR3DRXZuYdRLn/qiY0yI5XmqbTKrYbdemJ+xOh2d2MOweI/XFgMzd/9+1twdvMwllnZbWZNJ+BOm4A=="; }; }; - "handlebars-4.7.8" = { - name = "handlebars"; - packageName = "handlebars"; - version = "4.7.8"; - src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz"; - sha512 = "vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ=="; - }; - }; "har-schema-2.0.0" = { name = "har-schema"; packageName = "har-schema"; @@ -18138,15 +17922,6 @@ let sha512 = "LvnlJC5lg6MRazqzfRtIMvLmtOhCm9z/dkdVaHuCxQHLmD7NzLsExnqv7VMuRfL4tC0mXcLlnFsh9SF0PdIjSw=="; }; }; - "neo-async-2.6.2" = { - name = "neo-async"; - packageName = "neo-async"; - version = "2.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"; - sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; - }; - }; "nested-error-stacks-2.1.1" = { name = "nested-error-stacks"; packageName = "nested-error-stacks"; @@ -24987,15 +24762,6 @@ let sha512 = "nHc6S/bwIilKHNRgK/3jlhDoIHcp45YgyiwcAk46Tr0LfEqGBVpmiAyuiuxeVE44m3mXnEeVhaipLOEWmH+Njw=="; }; }; - "tempfile-5.0.0" = { - name = "tempfile"; - packageName = "tempfile"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tempfile/-/tempfile-5.0.0.tgz"; - sha512 = "bX655WZI/F7EoTDw9JvQURqAXiPHi8o8+yFxPF2lWYyz1aHnmMRuXWqL6YB6GmeO0o4DIYWHLgGNi/X64T+X4Q=="; - }; - }; "tempy-3.1.0" = { name = "tempy"; packageName = "tempy"; @@ -25770,15 +25536,6 @@ let sha512 = "ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A=="; }; }; - "uglify-js-3.19.3" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "3.19.3"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz"; - sha512 = "v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ=="; - }; - }; "uid-number-0.0.5" = { name = "uid-number"; packageName = "uid-number"; @@ -31891,81 +31648,6 @@ in bypassCache = true; reconstructLock = true; }; - conventional-changelog-cli = nodeEnv.buildNodePackage { - name = "conventional-changelog-cli"; - packageName = "conventional-changelog-cli"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-5.0.0.tgz"; - sha512 = "9Y8fucJe18/6ef6ZlyIlT2YQUbczvoQZZuYmDLaGvcSBP+M6h+LAvf7ON7waRxKJemcCII8Yqu5/8HEfskTxJQ=="; - }; - dependencies = [ - sources."@babel/code-frame-7.26.2" - sources."@babel/helper-validator-identifier-7.25.9" - sources."@conventional-changelog/git-client-1.0.1" - sources."@hutson/parse-repository-url-5.0.0" - sources."@types/normalize-package-data-2.4.4" - sources."@types/semver-7.5.8" - sources."add-stream-1.0.0" - sources."array-ify-1.0.0" - sources."compare-func-2.0.0" - sources."conventional-changelog-6.0.0" - sources."conventional-changelog-angular-8.0.0" - sources."conventional-changelog-atom-5.0.0" - sources."conventional-changelog-codemirror-5.0.0" - sources."conventional-changelog-conventionalcommits-8.0.0" - sources."conventional-changelog-core-8.0.0" - sources."conventional-changelog-ember-5.0.0" - sources."conventional-changelog-eslint-6.0.0" - sources."conventional-changelog-express-5.0.0" - sources."conventional-changelog-jquery-6.0.0" - sources."conventional-changelog-jshint-5.0.0" - sources."conventional-changelog-preset-loader-5.0.0" - sources."conventional-changelog-writer-8.0.1" - sources."conventional-commits-filter-5.0.0" - sources."conventional-commits-parser-6.1.0" - sources."dot-prop-5.3.0" - sources."find-up-simple-1.0.1" - sources."git-raw-commits-5.0.0" - sources."git-semver-tags-8.0.0" - sources."handlebars-4.7.8" - sources."hosted-git-info-7.0.2" - sources."index-to-position-0.1.2" - sources."is-obj-2.0.0" - sources."js-tokens-4.0.0" - sources."lru-cache-10.4.3" - sources."meow-13.2.0" - sources."minimist-1.2.8" - sources."neo-async-2.6.2" - sources."normalize-package-data-6.0.2" - sources."parse-json-8.1.0" - sources."picocolors-1.1.1" - sources."read-package-up-11.0.0" - sources."read-pkg-9.0.1" - sources."semver-7.7.1" - sources."source-map-0.6.1" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.5.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.21" - sources."temp-dir-3.0.0" - sources."tempfile-5.0.0" - sources."type-fest-4.37.0" - sources."uglify-js-3.19.3" - sources."unicorn-magic-0.1.0" - sources."validate-npm-package-license-3.0.4" - sources."wordwrap-1.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Generate a changelog from git metadata"; - homepage = "https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-cli#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; cpy-cli = nodeEnv.buildNodePackage { name = "cpy-cli"; packageName = "cpy-cli"; From 6c88cb115865a3279ae173c144b21789714e0e77 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 17:15:56 -0500 Subject: [PATCH 10/10] nrm: migrate from nodePackages --- pkgs/by-name/nr/nrm/package.nix | 65 +++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 71 ------------------- 4 files changed, 66 insertions(+), 72 deletions(-) create mode 100644 pkgs/by-name/nr/nrm/package.nix diff --git a/pkgs/by-name/nr/nrm/package.nix b/pkgs/by-name/nr/nrm/package.nix new file mode 100644 index 000000000000..dda095ebb145 --- /dev/null +++ b/pkgs/by-name/nr/nrm/package.nix @@ -0,0 +1,65 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nodejs, + pnpm, + makeBinaryWrapper, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "nrm"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "pana"; + repo = "nrm"; + tag = "v${finalAttrs.version}"; + hash = "sha256-2P0dSZa17A3NslNatCx1edLnrcDtGGpOlk6srcvjL1Y="; + }; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + makeBinaryWrapper + ]; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + fetcherVersion = 2; + hash = "sha256-PENYS5xO2LwT3+TGl/wU2r0ALEj/JQfbkpf/0MJs0uw="; + }; + + buildPhase = '' + runHook preBuild + + pnpm run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/node_modules/nrm + mkdir $out/bin + mv * $out/lib/node_modules/nrm/ + makeWrapper ${lib.getExe nodejs} $out/bin/nrm \ + --add-flags "$out/lib/node_modules/nrm/dist/index.js" \ + --set "NODE_PATH" "$out/lib/node_modules/nrm/node_modules" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/Pana/nrm/releases/tag/v${finalAttrs.version}"; + description = "Helps you switch between npm registries easily"; + homepage = "https://github.com/Pana/nrm"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "nrm"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index b0133d617fb8..71d845fa6d3f 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -240,6 +240,7 @@ mapAliases { }); # added 2024-10-04 inherit (pkgs) npm-check-updates; # added 2023-08-22 npm-merge-driver = throw "'npm-merge-driver' has been removed, since the upstream repo was archived on Aug 11, 2021"; # Added 2025-11-07 + inherit (pkgs) nrm; # Added 2025-11-08 ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04 orval = throw "orval has been removed because it was broken"; # added 2025-03-23 parcel = throw "parcel has been removed because it was broken"; # added 2025-03-12 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c92752a7f4b9..38761a8c7dff 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -48,7 +48,6 @@ , "node-gyp-build" , "node2nix" , "np" -, "nrm" , "peerflix" , "peerflix-server" , "poor-mans-t-sql-formatter-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 4bb78775ca20..455d9400a826 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -6960,15 +6960,6 @@ let sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; }; }; - "commander-8.3.0" = { - name = "commander"; - packageName = "commander"; - version = "8.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz"; - sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="; - }; - }; "comment-json-4.2.5" = { name = "comment-json"; packageName = "comment-json"; @@ -25653,15 +25644,6 @@ let sha512 = "5WsVTFcH1ut/kkhAaHf4PVgI8c7++GiVcpCGxPouI6ZVjsqPnSDf8h/8HtVqc0t4fzRXwnMK70EcZeAs3PIddg=="; }; }; - "undici-5.28.2" = { - name = "undici"; - packageName = "undici"; - version = "5.28.2"; - src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.28.2.tgz"; - sha512 = "wh1pHJHnUeQV5Xa8/kyQhO7WFa8M34l026L5P/+2TYiakvGy5Rdc8jWZVyG7ieht/0WgJLEd3kcU5gKx+6GC8w=="; - }; - }; "undici-5.28.4" = { name = "undici"; packageName = "undici"; @@ -36191,59 +36173,6 @@ in bypassCache = true; reconstructLock = true; }; - nrm = nodeEnv.buildNodePackage { - name = "nrm"; - packageName = "nrm"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nrm/-/nrm-2.0.1.tgz"; - sha512 = "4QDRVI64plGF/tXei29gYGl9zNkB0YwtASnjGaB7EUmqnMPoKLNlL43lrylg4HA8DBGoKI+9SuomDDXJone4rw=="; - }; - dependencies = [ - sources."@fastify/busboy-2.1.1" - sources."@inquirer/checkbox-4.1.3" - sources."@inquirer/core-10.1.8" - sources."@inquirer/figures-1.0.11" - sources."@inquirer/select-4.0.10" - sources."@inquirer/type-3.0.5" - sources."@types/node-22.13.10" - sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."cli-width-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-8.3.0" - sources."define-lazy-prop-2.0.0" - sources."emoji-regex-8.0.0" - sources."has-flag-4.0.0" - sources."ini-4.1.3" - sources."is-docker-2.2.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-wsl-2.2.0" - sources."mute-stream-2.0.0" - sources."open-8.4.2" - sources."signal-exit-4.1.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."supports-color-7.2.0" - sources."type-fest-0.21.3" - sources."undici-5.28.2" - sources."undici-types-6.20.0" - sources."wrap-ansi-6.2.0" - sources."yoctocolors-cjs-2.1.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "npm registry manager can help you switch different npm registries easily and quickly"; - homepage = "https://github.com/Pana/nrm"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; peerflix = nodeEnv.buildNodePackage { name = "peerflix"; packageName = "peerflix";