diff options
-rw-r--r-- | pkgs/applications/networking/zerobin/default.nix | 4 | ||||
-rw-r--r-- | pkgs/build-support/writers/scripts.nix | 2 | ||||
-rw-r--r-- | pkgs/development/node-packages/node-packages.nix | 18 | ||||
-rw-r--r-- | pkgs/servers/web-apps/discourse/default.nix | 3 |
4 files changed, 5 insertions, 22 deletions
diff --git a/pkgs/applications/networking/zerobin/default.nix b/pkgs/applications/networking/zerobin/default.nix index e75f121d5fee0..62201ba6ca089 100644 --- a/pkgs/applications/networking/zerobin/default.nix +++ b/pkgs/applications/networking/zerobin/default.nix @@ -1,7 +1,7 @@ { lib , python3Packages , fetchFromGitHub -, nodePackages +, uglify-js }: python3Packages.buildPythonApplication rec { @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ python3Packages.doit python3Packages.pyscss - nodePackages.uglify-js + uglify-js ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix index 93fac09c07ba5..bceac1b0c9590 100644 --- a/pkgs/build-support/writers/scripts.nix +++ b/pkgs/build-support/writers/scripts.nix @@ -485,7 +485,7 @@ rec { # returns an executable # # Example: - # writeJS "example" { libraries = [ pkgs.nodePackages.uglify-js ]; } '' + # writeJS "example" { libraries = [ pkgs.uglify-js ]; } '' # var UglifyJS = require("uglify-js"); # var code = "function add(first, second) { return first + second; }"; # var result = UglifyJS.minify(code); diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index e3391a0379816..8a088f092e21a 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -90192,24 +90192,6 @@ in bypassCache = true; reconstructLock = true; }; - uglify-js = nodeEnv.buildNodePackage { - name = "uglify-js"; - packageName = "uglify-js"; - version = "3.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.18.0.tgz"; - sha512 = "SyVVbcNBCk0dzr9XL/R/ySrmYf0s372K6/hFklzgcp2lBFyXtw4I7BOdDjlLhE1aVqaI/SHWXWmYdlZxuyF38A=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "JavaScript parser, mangler/compressor and beautifier toolkit"; - homepage = "https://github.com/mishoo/UglifyJS#readme"; - license = "BSD-2-Clause"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; undollar = nodeEnv.buildNodePackage { name = "undollar"; packageName = "undollar"; diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 79d7d096f6688..8d2ee2ea83bfb 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -41,6 +41,7 @@ , jq , moreutils , terser +, uglify-js , plugins ? [] }@args: @@ -214,7 +215,7 @@ let nativeBuildInputs = runtimeDeps ++ [ postgresql redis - nodePackages.uglify-js + uglify-js terser yarn jq |