From f1edefed506ec83259579faa83c7c7802b69c72d Mon Sep 17 00:00:00 2001 From: Alexandre Peyroux Date: Sun, 21 May 2017 09:50:14 +0200 Subject: [PATCH] jsbeautifier: 1.6.4 -> 1.6.14 (#25947) * jsbeautifier: 1.6.4 -> 1.6.14 * pythonPackages.jsbeautifier: move to python-modules --- .../python-modules/jsbeautifier/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +----------------- 2 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/jsbeautifier/default.nix diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix new file mode 100644 index 00000000000..fa4ba7bffb5 --- /dev/null +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, buildPythonApplication, EditorConfig, pytest, six }: + +buildPythonApplication rec { + name = "jsbeautifier-1.6.14"; + + propagatedBuildInputs = [ six ]; + + buildInputs = [ EditorConfig pytest ]; + + src = fetchurl { + url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz"; + sha256 = "50b2af556aa1da7283a6a92eaa699668312cb91f2ba6b78a4422b1d42af964a2"; + }; + + meta = with stdenv.lib; { + homepage = "http://jsbeautifier.org"; + description = "JavaScript unobfuscator and beautifier."; + license = licenses.mit; + maintainers = with maintainers; [ apeyroux ]; + }; + } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2296a39d3cf..6c65cf012e7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7643,25 +7643,7 @@ in { }; }; - jsbeautifier = buildPythonApplication rec { - name = "jsbeautifier-1.6.4"; - - propagatedBuildInputs = with self; [ six ]; - - buildInputs = with self; [ EditorConfig pytest six ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz"; - sha256 = "074n8f4ncz5pf0jkkf6i6by30qnaj5208sszaf9p86kgdigcdaf8"; - }; - - meta = { - homepage = "http://jsbeautifier.org"; - description = "JavaScript unobfuscator and beautifier."; - license = stdenv.lib.licenses.mit; - maintainers = with maintainers; [ apeyroux ]; - }; - }; + jsbeautifier = callPackage ../development/python-modules/jsbeautifier {}; jug = buildPythonPackage rec { version = "1.4.0";