diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index d4fcd87951f..47d9639be91 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -110,6 +110,7 @@ mapAliases { stf = throw "stf was removed because it was broken"; # added 2023-08-21 surge = pkgs.surge-cli; # Added 2023-09-08 swagger = throw "swagger was removed because it was broken and abandoned upstream"; # added 2023-09-09 + inherit (pkgs) terser; # Added 2023-08-31 thelounge = pkgs.thelounge; # Added 2023-05-22 three = throw "three was removed because it was no longer needed"; # Added 2023-09-08 inherit (pkgs) titanium; # added 2023-08-17 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 56f65d70115..ee7a6ae5f50 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -242,7 +242,6 @@ , {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"} , "teck-programmer" , "tern" -, "terser" , "textlint" , "textlint-plugin-latex" , "textlint-rule-abbr-within-parentheses" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 6fc85413c17..c3d28fc12a2 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -106636,37 +106636,6 @@ in bypassCache = true; reconstructLock = true; }; - terser = nodeEnv.buildNodePackage { - name = "terser"; - packageName = "terser"; - version = "5.19.2"; - src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz"; - sha512 = "qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA=="; - }; - dependencies = [ - sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/source-map-0.3.5" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" - sources."acorn-8.10.0" - sources."buffer-from-1.1.2" - sources."commander-2.20.3" - sources."source-map-0.6.1" - sources."source-map-support-0.5.21" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "JavaScript parser, mangler/compressor and beautifier toolkit for ES6+"; - homepage = "https://terser.org"; - license = "BSD-2-Clause"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; diff --git a/pkgs/development/tools/misc/terser/default.nix b/pkgs/development/tools/misc/terser/default.nix new file mode 100644 index 00000000000..8b862bcc2cd --- /dev/null +++ b/pkgs/development/tools/misc/terser/default.nix @@ -0,0 +1,22 @@ +{ buildNpmPackage, fetchFromGitHub, lib }: + +buildNpmPackage rec { + pname = "terser"; + version = "5.19.3"; + + src = fetchFromGitHub { + owner = "terser"; + repo = "terser"; + rev = "v${version}"; + hash = "sha256-ZI5ElHnQwoCJspGL/v0PqddMUAAhQGWDZA9utWZD/nM="; + }; + + npmDepsHash = "sha256-M7LGXoZFBQrXpkiofnam7tgFkk6+N7ckPxTcwAAuqxU="; + + meta = with lib; { + description = "JavaScript parser, mangler and compressor toolkit for ES6+"; + homepage = "https://terser.org"; + license = licenses.bsd2; + maintainers = with maintainers; [ talyz ]; + }; +} diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 394b775f3db..dbd515de565 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -41,6 +41,7 @@ , dart-sass-embedded , jq , moreutils +, terser , plugins ? [] }@args: @@ -223,7 +224,7 @@ let postgresql redis nodePackages.uglify-js - nodePackages.terser + terser nodePackages.patch-package yarn nodejs_16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f5c5ff18fa..e6bc065e94f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20430,6 +20430,8 @@ with pkgs; terrascan = callPackage ../tools/security/terrascan { }; + terser = callPackage ../development/tools/misc/terser { }; + tesh = callPackage ../tools/text/tesh {}; texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };