From c555bc38a34b899dfba66663a18c7ea343935b5e Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 23 Jul 2019 14:14:57 -0700 Subject: [PATCH 1/2] jsondiff: 1.1.2 -> 1.2.0 --- pkgs/development/python-modules/jsondiff/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix index fd31dc93fbfab0..73017ee68b1025 100644 --- a/pkgs/development/python-modules/jsondiff/default.nix +++ b/pkgs/development/python-modules/jsondiff/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsondiff"; - version = "1.1.2"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "7e18138aecaa4a8f3b7ac7525b8466234e6378dd6cae702b982c9ed851d2ae21"; + sha256 = "00v3689175aqzdscrxpffm712ylp8jvcpqdg51ca22ni6721p51l"; }; # No tests @@ -20,5 +20,4 @@ buildPythonPackage rec { homepage = https://github.com/ZoomerAnalytics/jsondiff; license = lib.licenses.mit; }; - -} \ No newline at end of file +} From d99c6ccecebe0723d8700d5677f699b632f56fd9 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 23 Jul 2019 14:15:39 -0700 Subject: [PATCH 2/2] jsondiff: patch setup.py to prevent creating bin/jsondiff pythonPackages.jsonpatch also creates bin/jsondiff, and packages depending on both are not usable. --- pkgs/development/python-modules/jsondiff/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix index 73017ee68b1025..6b254a7221af56 100644 --- a/pkgs/development/python-modules/jsondiff/default.nix +++ b/pkgs/development/python-modules/jsondiff/default.nix @@ -12,6 +12,10 @@ buildPythonPackage rec { sha256 = "00v3689175aqzdscrxpffm712ylp8jvcpqdg51ca22ni6721p51l"; }; + postPatch = '' + sed -e "/'jsondiff=jsondiff.cli:main_deprecated',/d" -i setup.py + ''; + # No tests doCheck = false;