From 04403e4c67fb89dd12b93902c3cbd37171d6690b Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Fri, 3 Jun 2016 09:32:00 +0200 Subject: [PATCH 1/6] python-gnutls: fix search path to gnutls --- pkgs/top-level/python-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c213e472deb..36bf69d046c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6283,7 +6283,13 @@ in modules // { sha256 = "1yrdxcj5rzvz8iglircz6icvyggz5fmdcd010n6w3j60yp4p84kc"; }; + # https://github.com/AGProjects/python-gnutls/issues/2 + disabled = isPy3k; + propagatedBuildInputs = with self; [ pkgs.gnutls ]; + patchPhase = '' + substituteInPlace gnutls/library/__init__.py --replace "/usr/local/lib" "${pkgs.gnutls33.out}/lib" + ''; }; gitdb = buildPythonPackage rec { From 19eac13f3dccb42ec23c4dcdcc9c0f9028411de7 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Fri, 3 Jun 2016 20:00:36 +0200 Subject: [PATCH 2/6] pythonPackages.klein: init -> 15.3.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 36bf69d046c3..8a871cb8e5f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11716,6 +11716,22 @@ in modules // { }; }; + klein = buildPythonPackage rec { + name = "klein-15.3.1"; + src = pkgs.fetchurl { + url = "mirror://pypi/k/klein/${name}.tar.gz"; + sha256 = "1hl2psnn1chm698rimyn9dgcpl1mxgc8dj11b3ipp8z37yfjs3z9"; + }; + + propagatedBuildInputs = with self; [ werkzeug twisted ]; + + meta = { + description = "Klein Web Micro-Framework"; + homepage = "https://github.com/twisted/klein"; + license = licenses.mit; + }; + }; + kombu = buildPythonPackage rec { name = "kombu-${version}"; version = "3.0.35"; From 93a9643aeddcb28f7535d05826088553d9b7a49d Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Fri, 3 Jun 2016 20:01:26 +0200 Subject: [PATCH 3/6] pythonPackages.pydispatcher: init -> 2.0.5 --- pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8a871cb8e5f8..ff6ee1e401dd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17435,6 +17435,21 @@ in modules // { }; }); + pydispatcher = buildPythonPackage (rec { + version = "2.0.5"; + disabled = isPy35; + name = "pydispatcher-${version}"; + src = pkgs.fetchurl { + url = "mirror://pypi/P/PyDispatcher/PyDispatcher-${version}.tar.gz"; + sha256 = "1bswbmhlbqdxlgbxlb6xrlm4k253sg8nvpl1whgsys8p3fg0cw2m"; + }; + + meta = { + homepage = http://pydispatcher.sourceforge.net/; + description = "Signal-registration and routing infrastructure for use in multiple contexts"; + license = licenses.bsd3; + }; + }); pydot = buildPythonPackage rec { name = "pydot-1.0.2"; From fc71e1e178347cb1cacfa31d7e1f9ed37dac2fd1 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Fri, 3 Jun 2016 20:00:07 +0200 Subject: [PATCH 4/6] pythonpackages.attrs: init -> 16.0.0 --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff6ee1e401dd..429dbe1606ef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1208,6 +1208,27 @@ in modules // { }; }); + attrs = buildPythonPackage (rec { + pname = "attrs"; + version = "16.0.0"; + name = "attrs-16.0.0"; + src = pkgs.fetchurl { + url = "mirror://pypi/a/attrs/${name}.tar.gz"; + sha256 = "1g4asv3hbx5aqz7hjzq3q6ss2cpv1rdv66sp5d21cdyjajj2fs6y"; + }; + + # Mac OS X needs clang for testing + buildInputs = with self; [ pytest hypothesis zope_interface + pympler coverage ] + ++ optionals (stdenv.isDarwin) [ pkgs.clang ]; + + meta = { + description = "Python attributes without boilerplate"; + homepage = https://github.com/hynek/attrs; + license = licenses.mit; + }; + }); + audioread = buildPythonPackage rec { name = "audioread-${version}"; version = "2.1.1"; From f6d8566cec1051e01a1fc570d3cae1fcef60c149 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Thu, 16 Jun 2016 16:52:37 +0200 Subject: [PATCH 5/6] pythonPackages.pympler: init at 0.4.3 --- pkgs/top-level/python-packages.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 429dbe1606ef..5900ea7ee520 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13176,6 +13176,31 @@ in modules // { }; }; + pympler = buildPythonPackage rec { + pname = "Pympler"; + version = "0.4.3"; + name = "${pname}-${version}"; + + src = pkgs.fetchurl { + url = "mirror://pypi/P/${pname}/${name}.tar.gz"; + sha256 = "0mhyxqlkha98y8mi5zqcjg23r30mgdjdzs05lghbmqfdyvzjh1a3"; + }; + + # Remove test asizeof.flatsize(), broken and can be missed as + # test is only useful on python 2.5, see https://github.com/pympler/pympler/issues/22 + patchPhase = '' + substituteInPlace ./test/asizeof/test_asizeof.py --replace "n, e = test_flatsize" "#n, e = test_flatsize" + substituteInPlace ./test/asizeof/test_asizeof.py --replace "self.assert_(n," "#self.assert_(n," + substituteInPlace ./test/asizeof/test_asizeof.py --replace "self.assert_(not e" "#self.assert_(not e" + ''; + + meta = { + description = "Tool to measure, monitor and analyze memory behavior"; + homepage = http://pythonhosted.org/Pympler/; + license = licenses.asl20; + }; + }; + pymysql = buildPythonPackage rec { name = "pymysql-${version}"; version = "0.6.6"; From b49ba8a3e3691495ebd7048576721ebec79f8dc3 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Sat, 6 Aug 2016 19:55:41 +0200 Subject: [PATCH 6/6] pythonPackages.sqlobject: init at 3.0.0 --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5900ea7ee520..9c6605131114 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20754,6 +20754,23 @@ in modules // { }; }; + sqlobject = buildPythonPackage rec { + version = "3.0.0"; + name = "sqlobject-${version}"; + src = pkgs.fetchurl { + url = "mirror://pypi/S/SQLObject/SQLObject-${version}.tar.gz"; + sha256 = "15g3g7f4yiyplqf54px1dsnmrw3jb7xwx97z8qzgp9ijmm5vpr8r"; + }; + + propagatedBuildInputs = with self; [ pydispatcher FormEncode ]; + + meta = { + description = "Object Relational Manager for providing an object interface to your database"; + homepage = "http://www.sqlobject.org/"; + license = licenses.lgpl21; + }; + }; + pgpdump = self.buildPythonPackage rec { name = "pgpdump-1.5";