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

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

@@ -21,8 +21,6 @@ buildPythonPackage rec {
     chardet
   ] ++ stdenv.lib.optional (!isPy3k) subprocess32;
 
-  doCheck = false;
-
   postInstall = ''
     wrapProgram $out/bin/afew \
       --prefix LD_LIBRARY_PATH : ${notmuch}/lib
@@ -31,6 +29,6 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     homepage = https://github.com/afewmail/afew;
     description = "An initial tagging script for notmuch mail";
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ garbas andir flokli ];
   };
 }

pkgs/development/python-modules/pytest-flake8/default.nix

@@ -3,7 +3,7 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "pytest-flake8";
-  version = "0.8.1";
+  version = "0.9.1";
 
   # although pytest is a runtime dependency, do not add it as
   # propagatedBuildInputs in order to allow packages depend on another version
@@ -13,19 +13,9 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1za5i09gz127yraigmcl443w6149714l279rmlfxg1bl2kdsc45a";
+    sha256 = "0032l4x2i5qn7ikaaw0kjs9f4ccpas21j564spyxwmx50wnhf5p7";
   };
 
-  patches = [
-    # Fix pytest strict mode (pull request #24)
-    # https://github.com/tholo/pytest-flake8/pull/24
-    (fetchpatch {
-      name = "fix-compatibility-with-pytest-strict-mode.patch";
-      url = "https://github.com/tholo/pytest-flake8/commit/434e1b07b4b77bfe1ddb9b2b54470c6c3815bb1a.patch";
-      sha256 = "0idwgkwwysx2cibnykd81yxrgqzkpf42j99jmpnanqzi99qnc3wx";
-    })
-  ];
-
   checkPhase = ''
     pytest --ignore=nix_run_setup.py .
   '';

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

@@ -10,7 +10,7 @@ buildPythonPackage rec {
     owner  = "pytorch";
     repo   = "pytorch";
     rev    = "v${version}";
-    sha256 = "112mp3r70d8f15dhxm6k7912b5i6c2q8hv9462s808y84grr2jdm";
+    sha256 = "1s3f46ga1f4lfrcj3lpvvhgkdr1pi8i2hjd9xj9qiz3a9vh2sj4n";
   };
 
   checkPhase = ''
@@ -22,7 +22,7 @@ buildPythonPackage rec {
      git
      numpy.blas
   ];
-  
+
   propagatedBuildInputs = [
     cffi
     numpy
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   preConfigure = ''
     export NO_CUDA=1
   '';
-  
+
   meta = {
     description = "Tensors and Dynamic neural networks in Python with strong GPU acceleration.";
     homepage = http://pytorch.org/;

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

@@ -0,0 +1,21 @@
+{buildPythonPackage, lib, nose, fetchPypi}:
+
+buildPythonPackage rec {
+  pname = "titlecase";
+  name = "${pname}-${version}";
+  version = "0.12.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0486i99wf8ssa7sgn81fn6fv6i4rhhq6n751bc740b3hzfbpmpl4";
+  };
+
+  checkInputs = [ nose ];
+
+  meta = {
+    homepage = https://github.com/ppannuto/python-titlecase;
+    description = "Python Port of John Gruber's titlecase.pl";
+    license = lib.licenses.mit;
+  };
+}
+