From ef116c9eac89281e9ed38bf39c1138b13ce1d41f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Nov 2020 12:17:27 +0000 Subject: [PATCH 1/2] python37Packages.colander: 1.8.2 -> 1.8.3 --- pkgs/development/python-modules/colander/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/colander/default.nix b/pkgs/development/python-modules/colander/default.nix index 0492e2717465..8a4933d19541 100644 --- a/pkgs/development/python-modules/colander/default.nix +++ b/pkgs/development/python-modules/colander/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "colander"; - version = "1.8.2"; + version = "1.8.3"; src = fetchPypi { inherit pname version; - sha256 = "54878d2ffd1afb020daca6cd5c6cfe6c0e44d0069fc825d57fe59aa6e4f6a499"; + sha256 = "259592a0d6a89cbe63c0c5771f9c0c2522387415af8d715f599583eac659f7d4"; }; propagatedBuildInputs = [ translationstring iso8601 enum34 ]; From 723c810ac33f2239c3fd29c8037dadc49fa793ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 30 Nov 2020 17:52:56 +0100 Subject: [PATCH 2/2] pythonPackages.ColanderAlchemy: 0.3.3 -> 0.3.4 --- .../colanderalchemy/default.nix | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/colanderalchemy/default.nix b/pkgs/development/python-modules/colanderalchemy/default.nix index 34e58e0927cd..aba5ebf609b8 100644 --- a/pkgs/development/python-modules/colanderalchemy/default.nix +++ b/pkgs/development/python-modules/colanderalchemy/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchpatch , fetchPypi , unittest2 , colander @@ -9,30 +8,21 @@ buildPythonPackage rec { pname = "ColanderAlchemy"; - version = "0.3.3"; + version = "0.3.4"; src = fetchPypi { inherit pname version; - sha256 = "11wcni2xmfmy001rj62q2pwf305vvngkrfm5c4zlwvgbvlsrvnnw"; + sha256 = "006wcfch2skwvma9bq3l06dyjnz309pa75h1rviq7i4pd9g463bl"; }; - patches = [ - (fetchpatch { - url = "https://github.com/stefanofontanelli/ColanderAlchemy/commit/b45fe35f2936a5ccb705e9344075191e550af6c9.patch"; - sha256 = "1kf278wjq49zd6fhpp55vdcawzdd107767shzfck522sv8gr6qvx"; - }) - ]; - - buildInputs = [ unittest2 ]; propagatedBuildInputs = [ colander sqlalchemy ]; + # Tests are not included in Pypi + doCheck = false; + meta = with stdenv.lib; { description = "Autogenerate Colander schemas based on SQLAlchemy models"; homepage = "https://github.com/stefanofontanelli/ColanderAlchemy"; license = licenses.mit; - # ColanderAlchemy's tests currently fail with colander >1.6.0 - # (see https://github.com/stefanofontanelli/ColanderAlchemy/issues/107) - broken = versionOlder "1.6.0" colander.version; }; - }