Merge staging-next into staging

pkgs/development/python-modules/awkward/default.nix

@@ -2,6 +2,8 @@
 , buildPythonPackage
 , fetchPypi
 , numpy
+, pandas
+, pyarrow
 , pytestrunner
 , pytest
 , h5py
@@ -9,15 +11,15 @@
 
 buildPythonPackage rec {
   pname = "awkward";
-  version = "0.8.7";
+  version = "0.8.14";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0a53c484za2l4yy1i05qhkylvygg8fnh4j1v3n35x2dsi929awdp";
+    sha256 = "1mf8ddxn7bdlhic5xcd8nvskp3cmyv8vk2hz52hb7faixsgvgj18";
   };
 
   nativeBuildInputs = [ pytestrunner ];
-  checkInputs = [ pytest h5py ];
+  checkInputs = [ pandas pyarrow pytest h5py ];
   propagatedBuildInputs = [ numpy ];
 
   checkPhase = ''

pkgs/development/python-modules/azure-mgmt-storage/default.nix

@@ -15,12 +15,6 @@ buildPythonPackage rec {
     sha256 = "22a779cae5e09712b7d62ef9bc3d8907a5666893a8a113b6d9348e933170236f";
   };
 
-  preConfigure = ''
-    # Patch to make this package work on requests >= 2.11.x
-    # CAN BE REMOVED ON NEXT PACKAGE UPDATE
-    sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/storage/storagemanagement.py
-  '';
-
   postInstall = ''
     echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
     echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py

pkgs/development/python-modules/broadlink/default.nix

@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python API for controlling Broadlink IR controllers";
-    homepage =  http://github.com/mjg59/python-broadlink;
+    homepage =  https://github.com/mjg59/python-broadlink;
     license = licenses.mit;
   };
 }

pkgs/development/python-modules/datrie/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch
 , cython, pytest, pytestrunner, hypothesis }:
 
 buildPythonPackage rec {
@@ -10,6 +10,14 @@ buildPythonPackage rec {
     sha256 = "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs";
   };
 
+  patches = [
+    # fix tests against recent hypothesis
+    (fetchpatch {
+      url = "https://github.com/pytries/datrie/commit/9b24b4c02783cdb703ac3f6c6d7d881db93166e0.diff";
+      sha256 = "1ql7jcf57q3x3fcbddl26y9kmnbnj2dv6ga8mwq94l4a3213j2iy";
+    })
+  ];
+
   nativeBuildInputs = [ cython ];
   buildInputs = [ pytest pytestrunner hypothesis ];
 

pkgs/development/python-modules/ldap3/default.nix

@@ -1,20 +1,12 @@
 { stdenv, fetchPypi, fetchFromGitHub, buildPythonPackage, pyasn1 }:
 
 buildPythonPackage rec {
-  version = "2.5.2";
   pname = "ldap3";
+  version = "2.6";
 
-## This should work, but 2.5.2 has a weird tarball with empty source files
-## where upstream repository has non-empty ones
-# src = fetchPypi {
-#   inherit pname version;
-#   sha256 = "063dacy01mphc3n7z2qc2avykjavqm1gllkbvy7xzw5ihlqwhrrz";
-# };
-  src = fetchFromGitHub {
-    owner = "cannatag";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "0p5l4bhy6j2nvvlxz5zvznbaqb72x791v9la2jr2wpwr60mzz9hw";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1f0v82584b7gkzrnnnl4fc88w4i73x7cxqbzy0r0bknm33yfwcq5";
   };
 
   propagatedBuildInputs = [ pyasn1 ];

pkgs/development/python-modules/nixpkgs/default.nix

@@ -9,23 +9,14 @@
 
 buildPythonPackage rec {
   pname = "nixpkgs";
-  version = "0.2.2";
+  version = "0.2.3";
   disabled = ! pythonAtLeast "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0gsrd99kkv99jsrh3hckz7ns1zwndi9vvh4465v4gnpz723dd6fj";
+    sha256 = "12ycbv31g4qv14aq6hfb85hhx026lgvzqfsrkpzb64na0c1yjcvn";
   };
 
-  patches = [
-    # Patch should be dropped once https://github.com/t184256/nixpkgs-python-importer/pull/7
-    # is merged and in a release
-    (fetchpatch {
-      url = "https://github.com/adisbladis/nixpkgs-python-importer/commit/749e05f1.patch";
-      sha256 = "1a72phazpqf6vf3hl3m84z9i5n6h1xpa53bqxnpsff6agxxhd21b";
-    })
-  ];
-
   buildInputs = [ pbr ];
   propagatedBuildInputs = [ pythonix ];
 

pkgs/development/python-modules/papis/default.nix

@@ -0,0 +1,49 @@
+{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, xdg_utils
+, requests, filetype, pyparsing, configparser, arxiv2bib
+, pyyaml, chardet, beautifulsoup4, colorama, bibtexparser
+, pylibgen, click, python-slugify, habanero, isbnlib
+, prompt_toolkit, pygments
+#, optional, dependencies
+, jinja2, whoosh, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "papis";
+  version = "0.8.2";
+
+  # Missing tests on Pypi
+  src = fetchFromGitHub {
+    owner = "papis";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0sa4hpgjvqkjcmp9bjr27b5m5jg4pfspdc8nf1ny80sr0kzn72hb";
+  };
+
+  propagatedBuildInputs = [
+    requests filetype pyparsing configparser arxiv2bib
+    pyyaml chardet beautifulsoup4 colorama bibtexparser
+    pylibgen click python-slugify habanero isbnlib
+    prompt_toolkit pygments
+    # optional dependencies
+    jinja2 whoosh
+  ];
+
+  checkInputs = ([
+    pytest
+  ]) ++ [
+    xdg_utils
+  ];
+
+  # most of the downloader tests and 4 other tests require a network connection
+  checkPhase = ''
+    HOME=$(mktemp -d) pytest papis tests --ignore tests/downloaders \
+      -k "not test_get_data and not test_doi_to_data and not test_general and not get_document_url"
+  '';
+
+  meta = {
+    description = "Powerful command-line document and bibliography manager";
+    homepage = http://papis.readthedocs.io/en/latest/;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ nico202 teto ];
+  };
+}