From 946807c888cc5bf9cd13832ae705a3db7113a0e1 Mon Sep 17 00:00:00 2001 From: Alexandre Peyroux Date: Fri, 5 Apr 2019 21:56:45 +0200 Subject: [PATCH 1/2] pythonPackages.jsbeautifier: fix build (#58608) --- .../python-modules/jsbeautifier/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index 9b2d3a5b832..fea40e9c9e3 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonApplication, EditorConfig, pytest, six }: +{ lib, fetchPypi, buildPythonApplication, EditorConfig, fetchpatch, pytest, six }: buildPythonApplication rec { pname = "jsbeautifier"; @@ -13,6 +13,15 @@ buildPythonApplication rec { sha256 = "7d02baa9b0459bf9c5407c1b99ad5566de04a3b664b18a58ac64f52832034204"; }; + patches = [ + (fetchpatch { + url = "https://github.com/beautify-web/js-beautify/commit/78e35a11cbb805fc044241d6465800ee2bd57ebc.patch"; + sha256 = "1ah7nshk96yljy37i20v4fga834dix9cdbhkdc3flfm4904n4523"; + }) + ]; + + patchFlags = [ "-p2" ]; + meta = with lib; { homepage = "http://jsbeautifier.org"; description = "JavaScript unobfuscator and beautifier."; From 72c24b18e97fff21557478ee4ad5ab6b9c50fc99 Mon Sep 17 00:00:00 2001 From: Alexandre Peyroux Date: Fri, 5 Apr 2019 22:02:01 +0200 Subject: [PATCH 2/2] pythonPackages.jsbeautifier: 1.8.9 -> 1.9.1 --- pkgs/development/python-modules/jsbeautifier/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index fea40e9c9e3..2ca26ad65e8 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -2,15 +2,14 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.8.9"; + version = "1.9.1"; - propagatedBuildInputs = [ six ]; - - buildInputs = [ EditorConfig pytest ]; + propagatedBuildInputs = [ six EditorConfig ]; + checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "7d02baa9b0459bf9c5407c1b99ad5566de04a3b664b18a58ac64f52832034204"; + sha256 = "0q8ld072dkccssagjxyvc9633fb6ynflvz70924phgp3zxmim960"; }; patches = [