Merge branch 'master' into staging

A couple thousand rebuilds again.

3 files changed, 50 insertions, 9 deletions

diff --git a/pkgs/development/python-modules/afew/default.nix b/pkgs/development/python-modules/afew/default.nix
index 39c921eb7bcd..05280738e5ba 100644
--- a/pkgs/development/python-modules/afew/default.nix
+++ b/pkgs/development/python-modules/afew/default.nix
@@ -1,19 +1,20 @@
 { stdenv, buildPythonPackage, fetchFromGitHub
-, isPy3k , dbacl, notmuch, chardet, subprocess32 }:
+, isPy3k , setuptools_scm, notmuch, chardet, subprocess32 }:
 
 buildPythonPackage rec {
   pname = "afew";
-  version = "git-2017-02-08";
+  version = "1.2.0";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "afewmail";
     repo = "afew";
-    rev = "889a3b966835c4d16aa1f24bb89f12945b9b2a67";
-    sha256 = "01gwrx1m3ka13ps3vj04a3y8llli2j2vkd3gcggcvxdphhpysckm";
+    rev = "3405475276a2433e1238be330e538ebf2a976e5e";
+    sha256 = "1h974avnfc6636az130yjqwm28z3aaqm49bjhpy3razx6zvyhzlf";
   };
 
-  buildInputs = [ dbacl ];
+  buildInputs = [ setuptools_scm ];
+  SETUPTOOLS_SCM_PRETEND_VERSION = "${version}";
 
   propagatedBuildInputs = [
     notmuch
@@ -22,10 +23,6 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  preConfigure = ''
-    substituteInPlace afew/DBACL.py --replace "'dbacl'" "'${dbacl}/bin/dbacl'"
-  '';
-
   postInstall = ''
     wrapProgram $out/bin/afew \
       --prefix LD_LIBRARY_PATH : ${notmuch}/lib
diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix
new file mode 100644
index 000000000000..f00c1fe21661
--- /dev/null
+++ b/pkgs/development/python-modules/flake8-future-import/default.nix
@@ -0,0 +1,20 @@
+{ lib, fetchFromGitHub, buildPythonPackage, python, flake8, six }:
+
+buildPythonPackage rec {
+  pname = "flake8-future-import";
+  name = "${pname}-${version}";
+  version = "0.4.3";
+  # PyPI tarball doesn't include the test suite
+  src = fetchFromGitHub {
+    owner = "xZise";
+    repo = "flake8-future-import";
+    rev = version;
+    sha256 = "0622bdcfa588m7g8igag6hf4rhjdwh74yfnrjwlxw4vlqhg344k4";
+  };
+  propagatedBuildInputs = [ flake8 six ];
+  meta = {
+    homepage = https://github.com/xZise/flake8-future-import;
+    description = "A flake8 extension to check for the imported __future__ modules to make it easier to have a consistent code base";
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/development/python-modules/pafy/default.nix b/pkgs/development/python-modules/pafy/default.nix
new file mode 100644
index 000000000000..77ed1d6c4c0a
--- /dev/null
+++ b/pkgs/development/python-modules/pafy/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, youtube-dl, fetchPypi }:
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "pafy";
+  version = "0.5.3.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1a7dxi95m1043rxx1r5x3ngb66nwlq6aqcasyqqjzmmmjps4zrim";
+  };
+
+  # No tests included in archive
+  doCheck = false;
+
+  propagatedBuildInputs = [ youtube-dl ];
+
+  meta = with lib; {
+    description = "A library to download YouTube content and retrieve metadata";
+    homepage = http://np1.github.io/pafy/;
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ odi ];
+  };
+}
+