From f56221596a841f4a5a319b2ca5d0bb874cb32fab Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 6 Nov 2025 14:33:26 -0500 Subject: [PATCH] js-beautify: migrate from nodePackages --- pkgs/by-name/js/js-beautify/package.nix | 46 ++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 138 ------------------ 4 files changed, 47 insertions(+), 139 deletions(-) create mode 100644 pkgs/by-name/js/js-beautify/package.nix diff --git a/pkgs/by-name/js/js-beautify/package.nix b/pkgs/by-name/js/js-beautify/package.nix new file mode 100644 index 000000000000..fd8dca953546 --- /dev/null +++ b/pkgs/by-name/js/js-beautify/package.nix @@ -0,0 +1,46 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nodejs, +}: + +buildNpmPackage (finalAttrs: { + pname = "js-beautify"; + version = "1.15.4"; + + src = fetchFromGitHub { + owner = "beautifier"; + repo = "js-beautify"; + tag = "v${finalAttrs.version}"; + hash = "sha256-7heFAt8ArwBox0R2UFAYyzqyARPLnVtlWmPr0txuxOM="; + }; + + dontNpmBuild = true; + + preBuild = '' + patchShebangs ./* + + substituteInPlace Makefile \ + --replace-fail "/bin/bash" "bash" \ + --replace-fail "\$(SCRIPT_DIR)/node" "${nodejs}/bin/node" \ + --replace-fail "\$(SCRIPT_DIR)/npm" "${nodejs}/bin/npm" + ''; + + buildPhase = '' + runHook preBuild + make js + runHook postBuild + ''; + + npmDepsHash = "sha256-Tr8kYawvPBt+jC7SW8dnKJVWynQyOpKbRD8yd+qbvIs="; + + meta = { + changelog = "https://github.com/beautifier/js-beautify/blob/v${finalAttrs.version}/CHANGELOG.md"; + description = "Beautifier for javascript"; + homepage = "https://beautifier.io/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "js-beautify"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 830f5ba99fba..76ad3eaa942e 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -146,6 +146,7 @@ mapAliases { ionic = throw "ionic was replaced by @ionic/cli"; # added 2023-08-19 inherit (pkgs) jake; # added 2023-08-19 inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19 + inherit (pkgs) js-beautify; # Added 2025-11-06 inherit (pkgs) jsonplaceholder; # Added 2025-11-04 joplin = pkgs.joplin-cli; # Added 2025-11-02 inherit (pkgs) kaput-cli; # added 2024-12-03 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 443b3e9768bd..5c0a0546ad15 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -79,7 +79,6 @@ , "he" , "hs-airdrop" , "imapnotify" -, "js-beautify" , "js-yaml" , "jsdoc" , "jshint" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 76cef919a441..d5bb1a068661 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -2165,15 +2165,6 @@ let sha512 = "yx6KAqlt3TAHBduS2fMQtJDL2ufIHnDRArrJEOoTTuizxqmjLT+psGYOHpmMl3gvQpFJ11Hs76guUUktzAF9Bg=="; }; }; - "@one-ini/wasm-0.1.1" = { - name = "_at_one-ini_slash_wasm"; - packageName = "@one-ini/wasm"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz"; - sha512 = "XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw=="; - }; - }; "@orval/angular-7.7.0" = { name = "_at_orval_slash_angular"; packageName = "@orval/angular"; @@ -8609,15 +8600,6 @@ let sha512 = "LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="; }; }; - "commander-10.0.1" = { - name = "commander"; - packageName = "commander"; - version = "10.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz"; - sha512 = "y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug=="; - }; - }; "commander-11.1.0" = { name = "commander"; packageName = "commander"; @@ -11220,15 +11202,6 @@ let sha512 = "pk+k0oK0PVXdlT4oRp4lwh+unuKB7Ng4iZ2HB+EZ7QCEQizX360Rp/F4aRpgpRgdP2ufB35N+1KppHmYjqIGSg=="; }; }; - "editorconfig-1.0.4" = { - name = "editorconfig"; - packageName = "editorconfig"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz"; - sha512 = "L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q=="; - }; - }; "ee-first-1.1.1" = { name = "ee-first"; packageName = "ee-first"; @@ -17574,15 +17547,6 @@ let sha512 = "WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg=="; }; }; - "js-cookie-3.0.5" = { - name = "js-cookie"; - packageName = "js-cookie"; - version = "3.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz"; - sha512 = "cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw=="; - }; - }; "js-levenshtein-1.1.6" = { name = "js-levenshtein"; packageName = "js-levenshtein"; @@ -21247,15 +21211,6 @@ let sha512 = "sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw=="; }; }; - "minimatch-9.0.1" = { - name = "minimatch"; - packageName = "minimatch"; - version = "9.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz"; - sha512 = "0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w=="; - }; - }; "minimatch-9.0.5" = { name = "minimatch"; packageName = "minimatch"; @@ -42187,99 +42142,6 @@ in bypassCache = true; reconstructLock = true; }; - js-beautify = nodeEnv.buildNodePackage { - name = "js-beautify"; - packageName = "js-beautify"; - version = "1.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.15.4.tgz"; - sha512 = "9/KXeZUKKJwqCXUdBxFJ3vPh467OCckSBmYDwSK/EtV090K+iMJ7zx2S3HLVDIWFQdqMIsZWbnaGiba18aWhaA=="; - }; - dependencies = [ - sources."@isaacs/cliui-8.0.2" - sources."@one-ini/wasm-0.1.1" - sources."abbrev-2.0.0" - sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" - sources."balanced-match-1.0.2" - sources."brace-expansion-2.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-10.0.1" - sources."config-chain-1.1.13" - sources."cross-spawn-7.0.6" - sources."eastasianwidth-0.2.0" - sources."editorconfig-1.0.4" - sources."emoji-regex-9.2.2" - sources."foreground-child-3.3.1" - ( - sources."glob-10.4.5" - // { - dependencies = [ - sources."minimatch-9.0.5" - ]; - } - ) - sources."ini-1.3.8" - sources."is-fullwidth-code-point-3.0.0" - sources."isexe-2.0.0" - sources."jackspeak-3.4.3" - sources."js-cookie-3.0.5" - sources."lru-cache-10.4.3" - sources."minimatch-9.0.1" - sources."minipass-7.1.2" - sources."nopt-7.2.1" - sources."package-json-from-dist-1.0.1" - sources."path-key-3.1.1" - sources."path-scurry-1.11.1" - sources."proto-list-1.2.4" - sources."semver-7.7.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."string-width-5.1.2" - ( - sources."string-width-cjs-4.2.3" - // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."strip-ansi-6.0.1" - ]; - } - ) - ( - sources."strip-ansi-7.1.0" - // { - dependencies = [ - sources."ansi-regex-6.1.0" - ]; - } - ) - sources."strip-ansi-cjs-6.0.1" - sources."which-2.0.2" - sources."wrap-ansi-8.1.0" - ( - sources."wrap-ansi-cjs-7.0.0" - // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - } - ) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "beautifier.io for node"; - homepage = "https://beautifier.io/"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml";