Merge master into staging-next

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

@@ -0,0 +1,28 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, watchdog
+}:
+
+buildPythonPackage rec {
+  pname = "easywatch";
+  version = "0.0.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1b40cjigv7s9qj8hxxy6yhwv0320z7qywrigwgkasgh80q0xgphc";
+  };
+
+  propagatedBuildInputs = [ watchdog ];
+
+  # There are no tests
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Dead-simple way to watch a directory";
+    homepage = https://github.com/Ceasar/easywatch;
+    license = licenses.mit;
+    maintainers = with maintainers; [ fgaz ];
+  };
+}
+

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

@@ -1,41 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchurl
-, gflags
-, iso8601
-, ipaddr
-, httplib2
-, google_apputils
-, google_api_python_client
-, isPy3k
-}:
-
-buildPythonPackage rec {
-  name = "gcutil-1.16.1";
-  disabled = isPy3k;
-
-  src = fetchurl {
-    url = https://dl.google.com/dl/cloudsdk/release/artifacts/gcutil-1.16.1.tar.gz;
-    sha256 = "00jaf7x1ji9y46fbkww2sg6r6almrqfsprydz3q2swr4jrnrsx9x";
-  };
-
-  propagatedBuildInputs = [ gflags iso8601 ipaddr httplib2 google_apputils google_api_python_client ];
-
-  prePatch = ''
-    sed -i -e "s|google-apputils==0.4.0|google-apputils==0.4.1|g" setup.py
-    substituteInPlace setup.py \
-      --replace "httplib2==0.8" "httplib2" \
-      --replace "iso8601==0.1.4" "iso8601" \
-      --replace "ipaddr==2.1.10" "ipaddr" \
-      --replace "google-api-python-client==1.2" "google-api-python-client" \
-      --replace "python-gflags==2.0" "python-gflags"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Command-line tool for interacting with Google Compute Engine";
-    homepage = "https://cloud.google.com/compute/docs/gcutil/";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ phreedom ];
-  };
-
-}

pkgs/development/python-modules/google-api-python-client/default.nix

@@ -1,13 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi, isPy3k
 , httplib2, google_auth, google-auth-httplib2, six, uritemplate, oauth2client }:
 
 buildPythonPackage rec {
   pname = "google-api-python-client";
-  version = "1.7.4";
+  version = "1.7.7";
+  #disabled = !isPy3k; # TODO: Python 2.7 was deprecated but weboob still depends on it.
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5d5cb02c6f3112c68eed51b74891a49c0e35263380672d662f8bfe85b8114d7c";
+    sha256 = "1nlsp8cll6v9w4649j98xw545bfnqa2xs7m9faa9mxc0kp8ff1li";
   };
 
   # No tests included in archive

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

@@ -1,12 +1,20 @@
-{ stdenv, fetchPypi, buildPythonPackage, gssapi, pyasn1 }:
+{ stdenv, fetchPypi, fetchFromGitHub, buildPythonPackage, gssapi, pyasn1 }:
 
 buildPythonPackage rec {
   version = "2.5.2";
   pname = "ldap3";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "063dacy01mphc3n7z2qc2avykjavqm1gllkbvy7xzw5ihlqwhrrz";
+## 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";
   };
 
   buildInputs = [ gssapi ];

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

@@ -33,7 +33,7 @@ buildPythonPackage rec {
       default, encoding is done in an encoding neutral fashion (plain
       ASCII with \uXXXX escapes for unicode characters).
     '';
-    homepage = http://code.google.com/p/simplejson/;
-    license = lib.licenses.mit;
+    homepage = https://github.com/simplejson/simplejson;
+    license = with lib.licenses; [ mit afl21 ];
   };
 }

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

@@ -0,0 +1,30 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, docopt
+, easywatch
+, jinja2
+}:
+
+buildPythonPackage rec {
+  pname = "staticjinja";
+  version = "0.3.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1mxv7yy35657mfxx9xhbzihh10m5lb29fmscfh9q455zd4ikr032";
+  };
+
+  propagatedBuildInputs = [ jinja2 docopt easywatch ];
+
+  # There are no tests on pypi
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A library and cli tool that makes it easy to build static sites using Jinja2";
+    homepage = https://staticjinja.readthedocs.io/en/latest/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ fgaz ];
+  };
+}
+

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

@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchurl, stdenv, isPy27
+{ buildPythonPackage, fetchurl, fetchPypi, stdenv, isPy27
 , nose, pillow, prettytable, pyyaml, dateutil, gdata
 , requests, mechanize, feedparser, lxml, gnupg, pyqt5
 , libyaml, simplejson, cssselect, futures, pdfminer
@@ -6,7 +6,18 @@
 , unidecode
 }:
 
-buildPythonPackage rec {
+let
+  # Support for Python 2.7 was dropped in 1.7.7
+  google_api_python_client_python27 = google_api_python_client.overrideDerivation
+    (oldAttrs: rec {
+      pname = "google-api-python-client";
+      version = "1.7.6";
+      src = fetchPypi {
+        inherit pname version;
+        sha256 = "14w5sdrp0bk9n0r2lmpqmrbf2zclpfq6q7giyahnskkfzdkb165z";
+      };
+    });
+in buildPythonPackage rec {
   pname = "weboob";
   version = "1.3";
   disabled = ! isPy27;
@@ -35,8 +46,8 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pillow prettytable pyyaml dateutil
     gdata requests mechanize feedparser lxml gnupg pyqt5 libyaml
-    simplejson cssselect futures pdfminer termcolor google_api_python_client
-    html2text unidecode ];
+    simplejson cssselect futures pdfminer termcolor
+    google_api_python_client_python27 html2text unidecode ];
 
   checkPhase = ''
     nosetests