From d62a3558843daf869ecd1a608cfba7a7439e1b30 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 14 Jun 2018 10:25:14 +0900
Subject: pythonPackages.wcwith: 0.1.6 -> 0.1.7

---
 pkgs/top-level/python-packages.nix | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

(limited to 'pkgs/top-level/python-packages.nix')

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5c694f4d801b..7fe5f9f9ffca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14845,30 +14845,7 @@ EOF
     imagemagick = pkgs.imagemagickBig;
   };
 
-  wcwidth = buildPythonPackage rec {
-    name = "wcwidth-${version}";
-    version = "0.1.6";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/w/wcwidth/${name}.tar.gz";
-      sha256 = "02wjrpf001gjdjsaxxbzcwfg19crlk2dbddayrfc2v06f53yrcyw";
-    };
-
-    # Checks fail due to missing tox.ini file:
-    doCheck = false;
-
-    meta = {
-      description = "Measures number of Terminal column cells of wide-character codes";
-      longDescription = ''
-        This API is mainly for Terminal Emulator implementors -- any Python
-        program that attempts to determine the printable width of a string on
-        a Terminal. It is implemented in python (no C library calls) and has
-        no 3rd-party dependencies.
-      '';
-      homepage = https://github.com/jquast/wcwidth;
-      license = licenses.mit;
-    };
-  };
+  wcwidth = callPackage ../development/python-modules/wcwidth { };
 
   web = buildPythonPackage rec {
     version = "0.37";
-- 
cgit 1.4.1


From 65b15ba6a96760125cc3984893f587af1ffacaac Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Fri, 15 Jun 2018 03:42:45 +0900
Subject: pythonPackages.cmd2: keep 0.8 version

...which is the last one with python2 support until ~ august 2018
---
 pkgs/development/python-modules/cmd2/old.nix | 49 ++++++++++++++++++++++++++++
 pkgs/top-level/python-packages.nix           |  4 ++-
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/cmd2/old.nix

(limited to 'pkgs/top-level/python-packages.nix')

diff --git a/pkgs/development/python-modules/cmd2/old.nix b/pkgs/development/python-modules/cmd2/old.nix
new file mode 100644
index 000000000000..5ffa51def0d2
--- /dev/null
+++ b/pkgs/development/python-modules/cmd2/old.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchPypi, buildPythonPackage, pythonOlder
+, pyperclip, six, pyparsing, vim
+, contextlib2 ? null, subprocess32 ? null
+, pytest, mock, which, fetchFromGitHub, glibcLocales
+}:
+buildPythonPackage rec {
+  pname = "cmd2";
+  version = "0.8.0";
+
+  src = fetchFromGitHub {
+    owner = "python-cmd2";
+    repo = "cmd2";
+    rev = version;
+    sha256 = "0nw2b7n7zg51bc3glxw0l9fn91mwjnjshklhmxhyvjbsg7khf64z";
+  };
+
+  LC_ALL="en_US.UTF-8";
+
+  postPatch = stdenv.lib.optional stdenv.isDarwin ''
+    # Fake the impure dependencies pbpaste and pbcopy
+    mkdir bin
+    echo '#/bin/sh' > bin/pbpaste
+    echo '#/bin/sh' > bin/pbcopy
+    chmod +x bin/{pbcopy,pbpaste}
+    export PATH=$(realpath bin):$PATH
+  '';
+
+  checkInputs= [ pytest mock which vim glibcLocales ];
+  checkPhase = ''
+    # test_path_completion_user_expansion might be fixed in the next release
+    py.test -k 'not test_path_completion_user_expansion'
+  '';
+  doCheck = !stdenv.isDarwin;
+
+  propagatedBuildInputs = [
+    pyperclip
+    six
+    pyparsing
+  ]
+  ++ stdenv.lib.optional (pythonOlder "3.5") contextlib2
+  ++ stdenv.lib.optional (pythonOlder "3.0") subprocess32
+  ;
+
+  meta = with stdenv.lib; {
+    description = "Enhancements for standard library's cmd module";
+    homepage = https://github.com/python-cmd2/cmd2;
+    maintainers = with maintainers; [ teto ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7fe5f9f9ffca..e16bb977fae2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9142,7 +9142,9 @@ in {
    cachetools_1 = callPackage ../development/python-modules/cachetools/1.nix {};
    cachetools = callPackage ../development/python-modules/cachetools {};
 
-  cmd2 = callPackage ../development/python-modules/cmd2 {};
+  cmd2_8 = callPackage ../development/python-modules/cmd2/old.nix {};
+  cmd2_9 = callPackage ../development/python-modules/cmd2 {};
+  cmd2 = if isPy27 then self.cmd2_8 else self.cmd2_9;
 
  warlock = buildPythonPackage rec {
    name = "warlock-${version}";
-- 
cgit 1.4.1