From 8dd955cc10329cbe0461b69bd796ecbd06b8b441 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 21 Mar 2016 21:09:20 +0100 Subject: [PATCH 1/7] virtinst: remove sqlalchemy7 dependency sqlalchemy is never used: ``` $ nix-shell default.nix -A virtinst $ unpackPhase && cd virtinst-* $ grep -r sqlalchemy . $ ``` --- pkgs/applications/virtualization/virtinst/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index c9a62ce5f92..6064972fe95 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; pythonPath = with pythonPackages; - [ setuptools eventlet greenlet gflags netaddr sqlalchemy7 carrot routes + [ setuptools eventlet greenlet gflags netaddr carrot routes PasteDeploy m2crypto ipy twisted sqlalchemy_migrate distutils_extra simplejson readline glanceclient cheetah lockfile httplib2 # !!! should libvirt be a build-time dependency? Note that From 41729a9074769ee5119d3ceb67547b93af03f8c9 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 21 Mar 2016 21:57:20 +0100 Subject: [PATCH 2/7] pythonPackages.webtest: 2.0.15 -> 2.0.20 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a8e30995336..7b28cbceaad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22376,12 +22376,12 @@ in modules // { webtest = buildPythonPackage rec { - version = "2.0.15"; + version = "2.0.20"; name = "webtest-${version}"; src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/W/WebTest/WebTest-${version}.zip"; - sha256 = "c320adc2cd862ea71ca9e2012e6157eb12f5f8d1632d1541f2eabf984aaa3ecc"; + url = "http://pypi.python.org/packages/source/W/WebTest/WebTest-${version}.tar.gz"; + sha256 = "0bv0qhdjakdsdgj4sk21gnpp8xp8bga4x03p6gjb83ihrsb7n4xv"; }; preConfigure = '' From 7be460d54cefbd43030f4488e8d7edeea1e2c48b Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 21 Mar 2016 22:19:31 +0100 Subject: [PATCH 3/7] pythonPackges.beaker: 1.7.0 -> 1.8.0 --- pkgs/top-level/python-packages.nix | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b28cbceaad..9e607dd0f2e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1640,27 +1640,32 @@ in modules // { }); beaker = buildPythonPackage rec { - name = "Beaker-1.7.0"; + name = "Beaker-${version}"; + version = "1.8.0"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/B/Beaker/${name}.tar.gz"; - sha256 = "0vv4y22b3ly1212n9nnhgvc8yz32adlfl7w7s1wj0i5srpjcgvlq"; + # The pypy release do not contains the tests + src = pkgs.fetchFromGitHub { + owner = "bbangert"; + repo = "beaker"; + rev = "${version}"; + sha256 = "17yfr7a307n8rdl09was4j60xqk2s0hk0hywdkigrpj4qnw0is7g"; }; buildInputs = - [ self.sqlalchemy7 - self.pycryptopp - self.nose + [ self.nose self.mock self.webtest ]; - - # http://hydra.nixos.org/build/4511591/log/raw - doCheck = false; + propagatedBuildInputs = [ + self.sqlalchemy + self.pycrypto + ] ++ optionals (isPy26 || isPy27) [ + self.funcsigs + self.pycryptopp + ]; meta = { + description = "A Session and Caching library with WSGI Middleware"; maintainers = with maintainers; [ garbas iElectric ]; platforms = platforms.all; }; From 9d5fcad5e7e420f75c85f9e00b1135985b792059 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 21 Mar 2016 22:49:00 +0100 Subject: [PATCH 4/7] pythonPackages.pythondaemon: init at 2.1.1 --- pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9e607dd0f2e..5ebb2c58f12 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20025,6 +20025,28 @@ in modules // { }; + pythondaemon = buildPythonPackage rec { + name = "python-daemon-${version}"; + version = "2.1.1"; + + src = pkgs.fetchurl { + url = " https://pypi.python.org/packages/source/p/python-daemon/${name}.tar.gz"; + sha256 = "17v80qb98p1gv4j9mq6wb55cv7hc4j1hzw5y2f4s5hrpxs3w3a2q"; + }; + + # A test fail within chroot builds. + doCheck = false; + + buildInputs = with self; [ mock testscenarios ]; + propagatedBuildInputs = with self; [ docutils lockfile ]; + + meta = { + description = "Library to implement a well-behaved Unix daemon process"; + homepage = https://alioth.debian.org/projects/python-daemon/; + licenses = [ licenses.gpl3Plus licenses.asl20 ]; + }; + }; + sympy = buildPythonPackage rec { name = "sympy-0.7.6.1"; disabled = isPy34 || isPy35 || isPyPy; # some tests fail From 3cd7934783939e9ea14c9493252d37a73a4dd259 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 21 Mar 2016 23:05:55 +0100 Subject: [PATCH 5/7] pythonPakcages.pid: init at 2.0.1 --- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5ebb2c58f12..ae189293f2d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20012,6 +20012,22 @@ in modules // { }; }; + pid = buildPythonPackage rec { + name = "pid-${version}"; + version = "2.0.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pid/${name}.tar.gz"; + sha256 = "0cylj8p25nwkdfgy4pzai21wyzmrxdqlwwbzqag9gb5qcjfdwk05"; + }; + + meta = { + description = "Pidfile featuring stale detection and file-locking"; + homepage = https://github.com/trbs/pid/; + license = licenses.asl20; + }; + }; + pydns = buildPythonPackage rec { name = "pydns-2.3.6"; disabled = isPy3k; From bbb78ae98174c9580827262e511eaa57c176ff8e Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 21 Mar 2016 23:14:16 +0100 Subject: [PATCH 6/7] pythonPackages.coilmq: 0.6.1 -> 1.0.0 --- pkgs/top-level/python-packages.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ae189293f2d..9db9d2ebda4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3277,23 +3277,19 @@ in modules // { coilmq = buildPythonPackage (rec { - name = "coilmq-0.6.1"; + name = "CoilMQ-${version}"; + version = "1.0.0"; src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/C/CoilMQ/CoilMQ-0.6.1.tar.gz"; - sha256 = "9755733bdae33a9d87630232d166a7da2382f68c2cffb3bb81503806e8d310cb"; + url = "http://pypi.python.org/packages/source/C/CoilMQ/${name}.tar.gz"; + sha256 = "0wwa6fsqw1mxsryvgp0yrdjil8axyj0kslzi7lr45cnhgp5ab375"; }; - propagatedBuildInputs = with self; [ self.stompclient ]; + propagatedBuildInputs = with self; [ stompclient pythondaemon redis pid]; - preConfigure = '' - sed -i '/distribute/d' setup.py - ''; + buildInputs = with self; [ pytest six click coverage sqlalchemy ]; - buildInputs = with self; [ self.coverage self.sqlalchemy7 ]; - - # ValueError: Could not parse auth file: - # /tmp/nix-build-.../CoilMQ-0.6.1/coilmq/tests/resources/auth.ini + # The teste data is not included in the distribution doCheck = false; meta = { From ac6851b4f58858b42f5a2be66684f64833069906 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 21 Mar 2016 23:35:10 +0100 Subject: [PATCH 7/7] pythonPackages.geeknote: upgrade sqlalchemy dependency --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9db9d2ebda4..83af9f52382 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25323,7 +25323,7 @@ in modules // { thrift beautifulsoup4 markdown2 - sqlalchemy7 + sqlalchemy html2text evernote ];