Merge branch 'master' into staging

pkgs/development/python-modules/ipython/5.nix

@@ -27,12 +27,12 @@
 
 buildPythonPackage rec {
   pname = "ipython";
-  version = "5.3.0";
+  version = "5.5.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bf5e615e7d96dac5a61fbf98d9e2926d98aa55582681bea7e9382992a3f43c1d";
+    sha256 = "66469e894d1f09d14a1f23b971a410af131daa9ad2a19922082e02e0ddfd150f";
   };
 
   prePatch = stdenv.lib.optionalString stdenv.isDarwin ''

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

@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, twisted
+, pycrypto
+, pyopenssl
+, pyparsing
+, zope_interface
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  pname = "ldaptor";
+  version = "16.0.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "6b9ebe5814e9e7091703c4e3bfeae73b46508b4678e2ff403cddaedf8213815d";
+  };
+
+  propagatedBuildInputs = [
+    twisted pycrypto pyopenssl pyparsing zope_interface
+  ];
+
+  disabled = isPy3k;
+
+  # TypeError: None is neither bytes nor unicode
+  doCheck = false;
+
+  meta = {
+    description = "A Pure-Python Twisted library for LDAP";
+    homepage = https://github.com/twisted/ldaptor;
+    license = lib.licenses.mit;
+  };
+}

pkgs/development/python-modules/marionette-harness/marionette_driver.nix

@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "marionette_driver";
-  version = "2.3.0";
+  version = "2.5.0";
   name = "${pname}-${version}";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ab9xxsp0zvckf32k84n52hpibw2c62sa2pmx821d3q0d67yv2vv";
+    sha256 = "0axhdin9ys3i9lnwqqqw87wap9000bk6cdgrzpd2gqricc7l3v65";
   };
 
   propagatedBuildInputs = [ mozversion mozrunner ]; 

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

@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi, pytest, unittest2 }:
+
+buildPythonPackage rec {
+  version = "3.3";
+  pname = "pyfakefs";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "19hj5wyi8wy8n8hdj5dwlryl3frrn783y4dsfdxn5mg0lpg9iqg3";
+  };
+
+  propagatedBuildInputs = [ pytest unittest2 ];
+
+  meta = with stdenv.lib; {
+    description = "Fake file system that mocks the Python file system modules";
+    license     = licenses.asl20;
+    homepage    = "http://pyfakefs.org/";
+    maintainers = with maintainers; [ gebner ];
+  };
+}