Unverified Commit 26d9cafa authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #324399 from SuperSandro2000/323702-followu-up 

uglify-js: remove remaining aliases, entry from nodePackages
parents 4166ce0a 2040dfa8

pkgs/applications/networking/zerobin/default.nix

+2 −2
Original line number Diff line number Diff line 
{ 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; [

pkgs/build-support/writers/scripts.nix

+1 −1
Original line number Diff line number Diff line
@@ -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);

pkgs/development/node-packages/node-packages.nix

+0 −18
Original line number Diff line number Diff line
@@ -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";

pkgs/servers/web-apps/discourse/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -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