From c0c50dfcb70d48e5b79c4ae9f1aa9d339af860b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 13 Feb 2017 21:57:56 +0100 Subject: [PATCH] Re-revert "pythonPackages.unittest2: without argparse"" This reverts commit 4882e431c7523f7298bebfde5d494aceeb1529b7. Moved from master. --- pkgs/top-level/python-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0b4c9f74497..c1456818663 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26334,14 +26334,17 @@ in { # # 1.0.0 and up create a circle dependency with traceback2/pbr doCheck = false; - patchPhase = '' + postPatch = '' + # argparse is needed for python < 2.7, which we do not support anymore. + substituteInPlace setup.py --replace "argparse" + # # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547 sed -i '510i\ return None, False' unittest2/loader.py # https://github.com/pypa/packaging/pull/36 sed -i 's/version=VERSION/version=str(VERSION)/' setup.py ''; - propagatedBuildInputs = with self; [ six argparse traceback2 ]; + propagatedBuildInputs = with self; [ six traceback2 ]; meta = { description = "A backport of the new features added to the unittest testing framework";