From 1844dfc491d187429a6a2bbc81c04362a96a1a46 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Mon, 7 Aug 2017 22:32:54 +0100 Subject: [PATCH 1/2] konfig: 0.9 -> 1.1 --- 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 1764b4b743b..bc1cc902173 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12014,7 +12014,7 @@ in { konfig = buildPythonPackage rec { name = "konfig-${version}"; - version = "0.9"; + version = "1.1"; # konfig unconditionaly depend on configparser, even if it is part of # the standard library in python 3.2 or above. @@ -12023,10 +12023,10 @@ in { src = pkgs.fetchgit { url = https://github.com/mozilla-services/konfig.git; rev = "refs/tags/${version}"; - sha256 = "1kc5iy61ckbmf65d9ssyqiyb25lnxjvr7c2vcsdl9wx4n6fhwzx3"; + sha256 = "1h780fbrv275dcik4cs3rincza805z6q726b48r4a0qmh5d8160c"; }; - propagatedBuildInputs = with self; [ configparser argparse ]; + propagatedBuildInputs = with self; [ configparser argparse six ]; meta = { description = "Yet Another Config Parser"; From 5acb1b2d0fa5bf291cef88165c7e68b96a07f71a Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Mon, 7 Aug 2017 22:33:53 +0100 Subject: [PATCH 2/2] konfig: remove obsolete argparse dependency; fixes build failure --- pkgs/top-level/python-packages.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc1cc902173..3c7d841821e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12026,7 +12026,23 @@ in { sha256 = "1h780fbrv275dcik4cs3rincza805z6q726b48r4a0qmh5d8160c"; }; - propagatedBuildInputs = with self; [ configparser argparse six ]; + propagatedBuildInputs = with self; [ configparser six ]; + + patches = [ (pkgs.writeText "konfig.patch" '' + diff --git a/setup.py b/setup.py + index 96fd858..bb4db06 100644 + --- a/setup.py + +++ b/setup.py + @@ -20,7 +20,7 @@ setup(name='konfig', + author_email="tarek@mozilla.com", + include_package_data=True, + install_requires = [ + - 'configparser', 'argparse', 'six' + + 'configparser', 'six' + ], + zip_safe=False, + classifiers=classifiers, + '') ]; meta = { description = "Yet Another Config Parser";