From b958b715a1d24e7c71961e9bd37cffb02e70f06c Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Wed, 27 May 2020 11:43:37 +0200 Subject: [PATCH 1/2] pythonPackages.svgwrite: 1.3.1 -> 1.4 --- pkgs/development/python-modules/svgwrite/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/svgwrite/default.nix b/pkgs/development/python-modules/svgwrite/default.nix index 08c3f6e52ca..29c7ab69793 100644 --- a/pkgs/development/python-modules/svgwrite/default.nix +++ b/pkgs/development/python-modules/svgwrite/default.nix @@ -1,21 +1,26 @@ { lib , buildPythonPackage , fetchFromGitHub +, isPy3k +, pythonOlder , pyparsing , pytest }: buildPythonPackage rec { pname = "svgwrite"; - version = "1.3.1"; + version = "1.4"; src = fetchFromGitHub { owner = "mozman"; repo = "svgwrite"; rev = "v${version}"; - sha256 = "14wz0y118a5wwfzin6cirr9254p4y825lnrnackihdbpw22gcw11"; + sha256 = "15xjz5b4dw1sg3a5k4wmzky4h5v1n937id8vl6hha1a2xj42z2s5"; }; + # svgwrite requires Python 3.6 or newer + disabled = !isPy3k || pythonOlder "3.6"; + propagatedBuildInputs = [ pyparsing ]; From c9e0014c21746e7d866911a5e8b090f18c3c0921 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Wed, 27 May 2020 13:16:46 +0200 Subject: [PATCH 2/2] pythonPackages.svgwrite: remove pyparsing from dependencies --- pkgs/development/python-modules/svgwrite/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/svgwrite/default.nix b/pkgs/development/python-modules/svgwrite/default.nix index 29c7ab69793..7799583f8dc 100644 --- a/pkgs/development/python-modules/svgwrite/default.nix +++ b/pkgs/development/python-modules/svgwrite/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , isPy3k , pythonOlder -, pyparsing , pytest }: @@ -19,11 +18,7 @@ buildPythonPackage rec { }; # svgwrite requires Python 3.6 or newer - disabled = !isPy3k || pythonOlder "3.6"; - - propagatedBuildInputs = [ - pyparsing - ]; + disabled = pythonOlder "3.6"; checkInputs = [ pytest