Merge branch 'up' into hardened-stdenv

3 files changed, 117 insertions, 10 deletions

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dfeb4592142d..4df410328473 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3638,6 +3638,8 @@ let
 
   ugarit = callPackage ../tools/backup/ugarit { };
 
+  ugarit-manifest-maker = callPackage ../tools/backup/ugarit-manifest-maker { };
+
   unarj = callPackage ../tools/archivers/unarj { };
 
   unshield = callPackage ../tools/archivers/unshield { };
@@ -7301,6 +7303,8 @@ let
 
   libfakekey = callPackage ../development/libraries/libfakekey { };
 
+  libfilezilla = callPackage ../development/libraries/libfilezilla { };
+
   libfm = callPackage ../development/libraries/libfm { };
   libfm-extra = callPackage ../development/libraries/libfm {
     extraOnly = true;
@@ -12861,11 +12865,11 @@ let
 
   pcmanfm = callPackage ../applications/misc/pcmanfm { };
 
+  pcmanx-gtk2 = callPackage ../applications/misc/pcmanx-gtk2 { };
+
   pig = callPackage ../applications/networking/cluster/pig { };
 
-  pijul = callPackage ../applications/version-management/pijul {
-    inherit (ocamlPackages) findlib cryptokit yojson;
-  };
+  pijul = callPackage ../applications/version-management/pijul { };
 
   playonlinux = callPackage ../applications/misc/playonlinux {
      stdenv = stdenv_32bit;
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index fa95c98dbca5..b03290cf8e9e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8149,10 +8149,10 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  MooseXRoleWithOverloading = buildPerlPackage {
-    name = "MooseX-Role-WithOverloading-0.13";
+  MooseXRoleWithOverloading = buildPerlPackage rec {
+    name = "MooseX-Role-WithOverloading-0.17";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-WithOverloading-0.13.tar.gz;
+      url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
       sha256 = "01mqpvbz7yw993918hgp72vl22i6mgicpq5b3zrrsp6vl8sqj2sw";
     };
     buildInputs = [ TestCheckDeps TestNoWarnings ModuleMetadata];
@@ -9739,11 +9739,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  podlators = buildPerlPackage {
-    name = "podlators-2.5.3";
+  podlators = buildPerlPackage rec {
+    name = "podlators-4.06";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RR/RRA/podlators-2.5.3.tar.gz;
-      sha256 = "c80d6d65a8694720deff1c6b2067d7564727db713b6d6b536afbad70299647d1";
+      url = "mirror://cpan/authors/id/R/RR/RRA/${name}.tar.gz";
+      sha256 = "0fsb1k88fsqwgmk5fkcz57jf27g6ip4ncikawslm596d1si2h48a";
     };
     meta = {
       description = "Convert POD data to various other formats";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8ec275834e8f..f925e688933e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3906,6 +3906,26 @@ in modules // {
     };
   };
 
+  pycontracts = buildPythonPackage rec {
+    version = "1.7.9";
+    name = "PyContracts-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/P/PyContracts/${name}.tar.gz";
+      sha256 = "0rdc9pz08885vqkazjc3lyrrghmf3jzxnlsgpn8akl808x1qrfqf";
+    };
+
+    buildInputs = with self; [ nose ];
+
+    propagatedBuildInputs = with self; [ pyparsing decorator six ];
+
+    meta = {
+      description = "Allows to declare constraints on function parameters and return values.";
+      homepage = https://pypi.python.org/pypi/PyContracts;
+      license = licenses.lgpl2;
+    };
+  };
+
   pycparser = buildPythonPackage rec {
     name = "pycparser-${version}";
     version = "2.14";
@@ -9092,6 +9112,22 @@ in modules // {
     };
   });
 
+  forbiddenfruit = buildPythonPackage rec {
+    version = "0.1.0";
+    name = "forbiddenfruit-${version}";
+
+    src = pkgs.fetchurl {
+      url= "https://pypi.python.org/packages/source/f/forbiddenfruit/${name}.tar.gz";
+      sha256 = "0xra2kw6m8ag29ifwmhi5zqksh4cr0yy1waqd488rm59kcr3zl79";
+    };
+
+    meta = {
+      description = "Patch python built-in objects";
+      homepage = https://pypi.python.org/pypi/forbiddenfruit;
+      license = licenses.mit;
+    };
+  };
+
   fs = buildPythonPackage rec {
     name = "fs-0.5.4";
 
@@ -9638,6 +9674,32 @@ in modules // {
     };
   };
 
+  gssapi = buildPythonPackage rec {
+    version = "1.1.4";
+    name = "gssapi-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/g/gssapi/${name}.tar.gz";
+      sha256 = "0mdl7m6h57n0zkfmm6fqz0hldfxrb2d7d48k2lhc8hqbr3962c7x";
+    };
+
+    GSSAPI_SUPPORT_DETECT = "false";
+    LD_LIBRARY_PATH="${pkgs.krb5Full}/lib";
+
+    buildInputs = [ pkgs.gss pkgs.krb5Full pkgs.which
+                    self.nose self.shouldbe ];
+
+    propagatedBuildInputs = with self; [ decorator enum34 six ];
+
+    doCheck = false; # No such file or directory: '/usr/sbin/kadmin.local'
+
+    meta = {
+      homepage = https://pypi.python.org/pypi/gssapi;
+      description = "Python GSSAPI Wrapper";
+      license = licenses.mit;
+    };
+  };
+
   gyp = buildPythonPackage rec {
     name = "gyp-${version}";
     version = "2015-06-11";
@@ -16996,6 +17058,26 @@ in modules // {
     propagatedBuildInputs = with self; [pkgs.openldap pkgs.cyrus_sasl pkgs.openssl];
   };
 
+  ldap3 = buildPythonPackage rec {
+    version = "1.0.4";
+    name = "ldap3-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/l/ldap3/${name}.tar.gz";
+      sha256 = "0j4qqj9vq022hy7wfqn8s0j4vm2g6paabbzas1vbyspawvcfai98";
+    };
+
+    buildInputs = with self; [ gssapi ];
+
+    propagatedBuildInputs = with self; [ pyasn1 ];
+
+    meta = {
+      homepage = https://pypi.python.org/pypi/ldap3;
+      description = "A strictly RFC 4510 conforming LDAP V3 pure Python client library";
+      license = licenses.lgpl3;
+    };
+  };
+
   ptest = buildPythonPackage rec {
     name = pname + "-" + version;
     pname = "ptest";
@@ -19003,6 +19085,27 @@ in modules // {
     };
   };
 
+  shouldbe = buildPythonPackage rec {
+    version = "0.1.0";
+    name = "shouldbe-${version}";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/s/shouldbe/${name}.tar.gz";
+      sha256 = "07pchxpv1xvjbck0xy44k3a1jrvklg0wbyccn14w0i7d135d4174";
+    };
+
+    buildInputs = with self; [ nose ];
+
+    propagatedBuildInputs = with self; [ forbiddenfruit ];
+
+    doCheck = false;  # Segmentation fault on py 3.5
+
+    meta = {
+      description = "Python Assertion Helpers inspired by Shouldly";
+      homepage =  https://pypi.python.org/pypi/shouldbe/;
+      license = licenses.mit;
+    };
+  };
 
   simplejson = buildPythonPackage (rec {
     name = "simplejson-3.8.1";