From b13764e023bd9bd536685af3e3ba499466739581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 8 Jul 2018 10:31:11 +0200 Subject: [PATCH 1/6] python.pkgs.vobject: 0.9.5 -> 0.9.6 --- pkgs/development/python-modules/vobject/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix index 8d52f65d498e..3c0b8a1f5932 100644 --- a/pkgs/development/python-modules/vobject/default.nix +++ b/pkgs/development/python-modules/vobject/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPyPy, python, dateutil }: buildPythonPackage rec { - version = "0.9.5"; + version = "0.9.6"; pname = "vobject"; src = fetchPypi { inherit pname version; - sha256 = "0f56cae196303d875682b9648b4bb43ffc769d2f0f800958e0a506af867b1243"; + sha256 = "cd9ede4363f83c06ba8d8f1541c736efa5c46f9a431430002b2f84f4f4e674d8"; }; disabled = isPyPy; From 2a8120251de9893299c666edb9f9cb2161a68c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 8 Jul 2018 10:44:21 +0200 Subject: [PATCH 2/6] papis: unpin python-dateutil --- pkgs/tools/misc/papis/default.nix | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/tools/misc/papis/default.nix index 20fafff587c5..0baae0b5ab92 100644 --- a/pkgs/tools/misc/papis/default.nix +++ b/pkgs/tools/misc/papis/default.nix @@ -3,20 +3,7 @@ }: let - python = python3.override { - packageOverrides = self: super: { - - # https://github.com/eventable/vobject/issues/112 - python-dateutil = super.python-dateutil.overridePythonAttrs (oldAttrs: rec { - version = "2.6.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca"; - }; - }); - - }; - }; + python = python3; in python.pkgs.buildPythonApplication rec { pname = "papis"; From 015d138005b1743044d9c023a66f9dec9e7af5a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 8 Jul 2018 10:47:59 +0200 Subject: [PATCH 3/6] papis: 0.5.3 -> 0.6 --- pkgs/tools/misc/papis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/tools/misc/papis/default.nix index 0baae0b5ab92..260d96a981f3 100644 --- a/pkgs/tools/misc/papis/default.nix +++ b/pkgs/tools/misc/papis/default.nix @@ -7,14 +7,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "papis"; - version = "0.5.3"; + version = "0.6"; # Missing tests on Pypi src = fetchFromGitHub { owner = "papis"; repo = pname; rev = "v${version}"; - sha256 = "1yc4ilb7bw099pi2vwawyf8mi0n1kp87wgwgwcwc841ibq62q8ic"; + sha256 = "0zy8q154zhpqb75c775nwq3mdl1szhzhkfi0nvyjmzfgsv2g1wa2"; }; postPatch = '' @@ -26,7 +26,7 @@ in python.pkgs.buildPythonApplication rec { argcomplete arxiv2bib beautifulsoup4 bibtexparser configparser dmenu-python habanero papis-python-rofi pylibgen prompt_toolkit pyparser python_magic pyyaml - requests unidecode urwid vobject tkinter + requests unidecode urwid vobject tkinter whoosh vim ]; From 01d6aca3aedb688080e516f6bc62317d3ff6901b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 8 Jul 2018 10:54:59 +0200 Subject: [PATCH 4/6] radicale: pin vobject==0.9.5 --- pkgs/servers/radicale/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix index 077192fbef0f..b0cfc32e9117 100644 --- a/pkgs/servers/radicale/default.nix +++ b/pkgs/servers/radicale/default.nix @@ -7,7 +7,8 @@ let python = python3.override { packageOverrides = self: super: { - # https://github.com/eventable/vobject/issues/112 + # Packages pinned in setup.py. + # Starting with next release, a vendored version of vobject will be used. python-dateutil = super.python-dateutil.overridePythonAttrs (oldAttrs: rec { version = "2.6.1"; src = oldAttrs.src.override { @@ -15,6 +16,13 @@ let sha256 = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca"; }; }); + vobject = super.vobject.overridePythonAttrs (oldAttrs: rec { + version = "0.9.5"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0f56cae196303d875682b9648b4bb43ffc769d2f0f800958e0a506af867b1243"; + }; + }); }; }; From 5adb361c523204d56d18c978f46dc371e4c9c448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 8 Jul 2018 11:39:29 +0200 Subject: [PATCH 5/6] python.pkgs.django_extensions: 1.8.1 -> 2.0.7 --- .../django-extensions/default.nix | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 18fd685f3c2d..3548e930ab3d 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -1,24 +1,36 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub -, vobject, mock, tox, pytestcov, pytest-django, pytest, shortuuid -, django, six +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, six, typing +, django, shortuuid, python-dateutil, pytest +, pytest-django, pytestcov, mock, vobject +, werkzeug, glibcLocales }: buildPythonPackage rec { pname = "django-extensions"; - version = "1.8.1"; + version = "2.0.7"; src = fetchFromGitHub { - owner = "${pname}"; - repo = "${pname}"; - rev = "${version}"; - sha256 = "08rd9zswvjb9dixzyd3p3l3hw3wwhqkgyjvid65niybzjl1xdb5h"; + owner = pname; + repo = pname; + rev = version; + sha256 = "1xf84wq7ab1zfb3nmf4qgw6mjf5xafjwr3175dyrqrrn6cpvcr4a"; }; - buildInputs = [ vobject mock tox pytestcov pytest-django pytest shortuuid ]; + postPatch = '' + substituteInPlace setup.py --replace "'tox'," "" + ''; - propagatedBuildInputs = [ django six ]; + propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") typing; - meta = with stdenv.lib; { + checkInputs = [ + django shortuuid python-dateutil pytest + pytest-django pytestcov mock vobject + werkzeug glibcLocales + ]; + + LC_ALL = "en_US.UTF-8"; + + meta = with lib; { description = "A collection of custom extensions for the Django Framework"; homepage = https://github.com/django-extensions/django-extensions; license = licenses.mit; From 03c37fefeb754051638438fb17323077ae0eaa3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 8 Jul 2018 11:51:08 +0200 Subject: [PATCH 6/6] python.pkgs.google_api_python_client: fix propagatedBuildInputs --- .../python-modules/google-api-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 72172c4a2586..7f71a4ed3ef2 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, httplib2, six, google-auth-httplib2, uritemplate }: +, httplib2, google_auth, google-auth-httplib2, six, uritemplate, oauth2client }: buildPythonPackage rec { pname = "google-api-python-client"; @@ -13,7 +13,7 @@ buildPythonPackage rec { # No tests included in archive doCheck = false; - propagatedBuildInputs = [ httplib2 google-auth-httplib2 six uritemplate ]; + propagatedBuildInputs = [ httplib2 google_auth google-auth-httplib2 six uritemplate oauth2client ]; meta = with lib; { description = "The core Python library for accessing Google APIs";