git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #105446 from r-ryantm/auto-update/python3.7-colander
commit96349663719863f8ec38720689afbfeec2742d62 authorSandro <sandro.jaeckel@gmail.com> dateMon 30 Nov 2020, 20:51 (6 years ago) parent618b732723c810
2 files changed+7−17
pkgs/development/python-modules/colander/default.nix+2−2 pkgs/development/python-modules/colanderalchemy/default.nix+5−15
pkgs/development/python-modules/colander/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "colander";
6− version = "1.8.2";
6+ version = "1.8.3";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "54878d2ffd1afb020daca6cd5c6cfe6c0e44d0069fc825d57fe59aa6e4f6a499";
10+ sha256 = "259592a0d6a89cbe63c0c5771f9c0c2522387415af8d715f599583eac659f7d4";
1111 };
1212
1313 propagatedBuildInputs = [ translationstring iso8601 enum34 ];
pkgs/development/python-modules/colanderalchemy/default.nix+5−15
@@ -1,6 +1,5 @@
11{ stdenv
22, buildPythonPackage
3−, fetchpatch
43, fetchPypi
54, unittest2
65, colander
@@ -9,30 +8,21 @@
98
109buildPythonPackage rec {
1110 pname = "ColanderAlchemy";
12− version = "0.3.3";
11+ version = "0.3.4";
1312
1413 src = fetchPypi {
1514 inherit pname version;
16− sha256 = "11wcni2xmfmy001rj62q2pwf305vvngkrfm5c4zlwvgbvlsrvnnw";
15+ sha256 = "006wcfch2skwvma9bq3l06dyjnz309pa75h1rviq7i4pd9g463bl";
1716 };
1817
19− patches = [
20− (fetchpatch {
21− url = "https://github.com/stefanofontanelli/ColanderAlchemy/commit/b45fe35f2936a5ccb705e9344075191e550af6c9.patch";
22− sha256 = "1kf278wjq49zd6fhpp55vdcawzdd107767shzfck522sv8gr6qvx";
23− })
24− ];
25−
26− buildInputs = [ unittest2 ];
2718 propagatedBuildInputs = [ colander sqlalchemy ];
2819
20+ # Tests are not included in Pypi
21+ doCheck = false;
22+
2923 meta = with stdenv.lib; {
3024 description = "Autogenerate Colander schemas based on SQLAlchemy models";
3125 homepage = "https://github.com/stefanofontanelli/ColanderAlchemy";
3226 license = licenses.mit;
33− # ColanderAlchemy's tests currently fail with colander >1.6.0
34− # (see https://github.com/stefanofontanelli/ColanderAlchemy/issues/107)
35− broken = versionOlder "1.6.0" colander.version;
3627 };
37−
3828}