From 40887a6dc63568746068344550193a342219d73f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 19 Jul 2018 17:36:05 +0100
Subject: [PATCH] pipenv: 2018.5.18 -> 2018.7.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Domen Kožar <domen@dev.si>
---
 .../python-modules/arpeggio/default.nix       | 24 ++++++++++++++++
 .../python-modules/hypothesis/default.nix     | 11 ++++----
 .../python-modules/invoke/default.nix         | 22 +++++++++++++++
 .../python-modules/parver/default.nix         | 28 +++++++++++++++++++
 pkgs/development/tools/pipenv/default.nix     |  6 ++--
 pkgs/top-level/python-packages.nix            |  4 +++
 6 files changed, 87 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/python-modules/arpeggio/default.nix
 create mode 100644 pkgs/development/python-modules/invoke/default.nix
 create mode 100644 pkgs/development/python-modules/parver/default.nix

diff --git a/pkgs/development/python-modules/arpeggio/default.nix b/pkgs/development/python-modules/arpeggio/default.nix
new file mode 100644
index 00000000000..b793ff29ddf
--- /dev/null
+++ b/pkgs/development/python-modules/arpeggio/default.nix
@@ -0,0 +1,24 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, glibcLocales
+}:
+
+buildPythonPackage rec {
+  pname = "Arpeggio";
+  version = "1.8.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0rvgwc2nxqf22fjnggswqw2i3sn1f2hhq043vhjr3af7ldfai3l2";
+  };
+
+  # Shall not be needed for next release
+  LC_ALL = "en_US.UTF-8";
+  buildInputs = [ glibcLocales ];
+
+  meta = {
+    description = "Packrat parser interpreter";
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix
index 6701c5a5b7e..5694ea92405 100644
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -9,23 +9,24 @@ buildPythonPackage rec {
   # pytz fake_factory django numpy pytest
   # If you need these, you can just add them to your environment.
 
-  version = "3.45.2";
+  version = "3.66.2";
   pname = "hypothesis";
 
-  # Upstream prefers github tarballs
+  # Use github tarballs that includes tests
   src = fetchFromGitHub {
     owner = "HypothesisWorks";
     repo = "hypothesis-python";
-    rev = version;
-    sha256 = "063sn5m1966gvm3wrlxczdq4vw0r94h3nd9xpr94qxahpg2r4bpb";
+    rev = "hypothesis-python-${version}";
+    sha256 = "17ywbwa76z7f0pgash0003fvm25fsj7hxdrdiprdbv99y3i8bm88";
   };
 
+  postUnpack = "sourceRoot=$sourceRoot/hypothesis-python";
+
   propagatedBuildInputs = [ attrs coverage ] ++ lib.optional (!isPy3k) [ enum34 ];
 
   checkInputs = [ pytest pytest_xdist flaky mock ];
   inherit doCheck;
 
-  # https://github.com/DRMacIver/hypothesis/issues/300
   checkPhase = ''
     rm tox.ini # This file changes how py.test runs and breaks it
     py.test tests/cover
diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix
new file mode 100644
index 00000000000..20d2973ca4f
--- /dev/null
+++ b/pkgs/development/python-modules/invoke/default.nix
@@ -0,0 +1,22 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "invoke";
+  version = "1.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0aiy1xvk1f91246zxd1zqrm679vdvd10h843a2na41cqr3cflpi6";
+  };
+
+  # errors with vendored libs
+  doCheck = false;
+
+  meta = {
+    description = "Pythonic task execution";
+    license = lib.licenses.bsd2;
+  };
+}
diff --git a/pkgs/development/python-modules/parver/default.nix b/pkgs/development/python-modules/parver/default.nix
new file mode 100644
index 00000000000..7918c5bf6fa
--- /dev/null
+++ b/pkgs/development/python-modules/parver/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, six
+, attrs
+, pytest
+, hypothesis
+, pretend
+, arpeggio
+}:
+
+buildPythonPackage rec {
+  pname = "parver";
+  version = "0.1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "05dsjmk3ckd175ln8smxr1f6l6qsrjyd8s5vfqc5x7fii3vgyjmc";
+  };
+
+  propagatedBuildInputs = [ six attrs arpeggio ];
+  checkInputs = [ pytest hypothesis pretend ];
+
+  meta = {
+    description = "parver allows parsing and manipulation of PEP 440 version numbers.";
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix
index e58cc44884c..297d2c3c666 100644
--- a/pkgs/development/tools/pipenv/default.nix
+++ b/pkgs/development/tools/pipenv/default.nix
@@ -2,16 +2,16 @@
 with python3Packages; buildPythonApplication rec {
     name = "${pname}-${version}";
     pname = "pipenv";
-    version = "2018.5.18";
+    version = "2018.7.1";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1knyknmykjj7gixdpfyns77sv4mizl68addk09ajmw9z5aqaif84";
+      sha256 = "0fpnfxdkymz9an3m6isq5g24ykd6hnkjc8llfnvbmnakz1sd0sxv";
     };
 
     LC_ALL = "en_US.UTF-8";
 
-    propagatedBuildInputs = [ pew pip requests flake8 ];
+    propagatedBuildInputs = [ pew pip requests flake8 parver invoke ];
 
     doCheck = false;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 835909f5dfa..281f90a73ef 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -264,6 +264,10 @@ in {
 
   discordpy = callPackage ../development/python-modules/discordpy { };
 
+  parver = callPackage ../development/python-modules/parver { };
+  arpeggio = callPackage ../development/python-modules/arpeggio { };
+  invoke = callPackage ../development/python-modules/invoke { };
+
   distorm3 = callPackage ../development/python-modules/distorm3 { };
 
   dogtail = callPackage ../development/python-modules/dogtail { };