Merge remote-tracking branch 'upstream/master' into staging

8 files changed, 134 insertions, 5 deletions

diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix
new file mode 100644
index 00000000000..a6b36232531
--- /dev/null
+++ b/pkgs/development/python-modules/click-completion/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k,
+  click, jinja2, shellingham, six
+}:
+
+buildPythonPackage rec {
+  pname = "click-completion";
+  version = "0.4.1";
+  disabled = (!isPy3k);
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1fjm22dyma26jrx4ki2z4dwbhcah4r848fz381x64sz5xxq3xdrk";
+  };
+
+  propagatedBuildInputs = [ click jinja2 shellingham six ];
+
+  meta = with stdenv.lib; {
+    description = "Add or enhance bash, fish, zsh and powershell completion in Click";
+    homepage = https://github.com/click-contrib/click-completion;
+    license = licenses.mit;
+    maintainers = with maintainers; [ mbode ];
+  };
+}
diff --git a/pkgs/development/python-modules/click-didyoumean/default.nix b/pkgs/development/python-modules/click-didyoumean/default.nix
new file mode 100644
index 00000000000..4cd2ea15029
--- /dev/null
+++ b/pkgs/development/python-modules/click-didyoumean/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi,
+  click
+}:
+
+buildPythonPackage rec {
+  pname = "click-didyoumean";
+  version = "0.0.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1svaza5lpvdbmyrx5xi0riqzq4hb9wnlpqrg6r8zy14pbi42j8hi";
+  };
+
+  propagatedBuildInputs = [ click ];
+
+  meta = with stdenv.lib; {
+    description = "Enable git-like did-you-mean feature in click";
+    homepage = https://github.com/click-contrib/click-didyoumean;
+    license = licenses.mit;
+    maintainers = with maintainers; [ mbode ];
+  };
+}
diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix
new file mode 100644
index 00000000000..94d47073764
--- /dev/null
+++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix
@@ -0,0 +1,39 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, elasticsearch
+, ipaddress
+, python-dateutil
+, pytz
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "elasticsearch-dsl";
+  version = "6.2.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0f0w23kzyym0fkzisdkcl4xpnm8fsi97v1kskyvfrhj3mxy179fh";
+  };
+
+  propagatedBuildInputs = [ elasticsearch python-dateutil six ]
+                          ++ stdenv.lib.optional (!isPy3k) ipaddress;
+
+  # ImportError: No module named test_elasticsearch_dsl
+  # Tests require a local instance of elasticsearch
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "High level Python client for Elasticsearch";
+    longDescription = ''
+      Elasticsearch DSL is a high-level library whose aim is to help with
+      writing and running queries against Elasticsearch. It is built on top of
+      the official low-level client (elasticsearch-py).
+    '';
+    homepage = https://github.com/elasticsearch/elasticsearch-dsl-py;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ desiderius ];
+  };
+}
diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix
index a09fa75ce34..02d10b832ff 100644
--- a/pkgs/development/python-modules/ldappool/default.nix
+++ b/pkgs/development/python-modules/ldappool/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   name = "ldappool-${version}";
-  version = "2.3.0";
+  version = "2.2.0";
 
   src = fetchPypi {
     pname = "ldappool";
     inherit version;
-    sha256 = "899d38e891372981166350c813ff5ce2ad8ac383311edccda8102362c1d60952";
+    sha256 = "1akmzf51cjfvmd0nvvm562z1w9vq45zsx6fa72kraqgsgxhnrhqz";
   };
 
   nativeBuildInputs = [ pbr ];
diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix
index d8633488102..4c6ca0bad33 100644
--- a/pkgs/development/python-modules/py3exiv2/default.nix
+++ b/pkgs/development/python-modules/py3exiv2/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx }:
+{ buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx, substituteAll, python }:
 
 buildPythonPackage rec {
   pname = "py3exiv2";
@@ -16,7 +16,12 @@ buildPythonPackage rec {
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
 
   # fix broken libboost_python3 detection
-  patches = [ ./setup.patch ];
+  patches = [
+    (substituteAll {
+      src = ./setup.patch;
+      version = "3${stdenv.lib.versions.minor python.version}";
+    })
+  ];
 
   meta = {
     homepage = "https://launchpad.net/py3exiv2";
diff --git a/pkgs/development/python-modules/py3exiv2/setup.patch b/pkgs/development/python-modules/py3exiv2/setup.patch
index bb4b1152347..8b0619c5bc5 100644
--- a/pkgs/development/python-modules/py3exiv2/setup.patch
+++ b/pkgs/development/python-modules/py3exiv2/setup.patch
@@ -5,7 +5,7 @@
                      return l.replace('libboost', 'boost')
  
 -libboost = get_libboost_name()
-+libboost = 'boost_python3'
++libboost = 'boost_python@version@'
  
  setup(
      name='py3exiv2',
diff --git a/pkgs/development/python-modules/sharedmem/default.nix b/pkgs/development/python-modules/sharedmem/default.nix
new file mode 100644
index 00000000000..60c91b64109
--- /dev/null
+++ b/pkgs/development/python-modules/sharedmem/default.nix
@@ -0,0 +1,21 @@
+{ buildPythonPackage, fetchPypi, lib, numpy }:
+
+buildPythonPackage rec {
+
+  pname = "sharedmem";
+  version = "0.3.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1wr438m1jmcj6ccskzm6pchv6ldx7031h040adadjmkivz5rry41";
+  };
+
+  propagatedBuildInputs = [ numpy ];
+
+  meta = {
+    homepage = http://rainwoodman.github.io/sharedmem/;
+    description = "Easier parallel programming on shared memory computers";
+    maintainers = with lib.maintainers; [ edwtjo ];
+    license = lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix
new file mode 100644
index 00000000000..57cafe2624c
--- /dev/null
+++ b/pkgs/development/python-modules/shellingham/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "shellingham";
+  version = "1.2.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0x1hja3jzvh7xmd0sxnfw9hi3k419s95vb7jjzh76yydzvss1r2q";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Tool to Detect Surrounding Shell";
+    homepage = https://github.com/sarugaku/shellingham;
+    license = licenses.isc;
+    maintainers = with maintainers; [ mbode ];
+  };
+}