Merge branch 'master' into staging

... to include a security mass rebuild.

pkgs/development/libraries/libevent/default.nix

@@ -9,6 +9,20 @@ stdenv.mkDerivation {
     sha256 = "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki";
   };
 
+  prePatch = let
+      # https://lwn.net/Vulnerabilities/714581/
+      debian = fetchurl {
+        url = "http://http.debian.net/debian/pool/main/libe/libevent/"
+            + "libevent_2.0.21-stable-3.debian.tar.xz";
+        sha256 = "0b2syswiq3cvfbdvi4lbca15c31lilxnahax4a4b4qxi5fcab7h5";
+      };
+    in ''
+      tar xf '${debian}'
+      patches="$patches $(cat debian/patches/series | grep -v '^$\|^#' \
+                          | grep -v '^20d6d445.patch' \
+                          | grep -v '^dh-autoreconf' | sed 's|^|debian/patches/|')"
+    '';
+
   outputs = [ "out" "dev" ];
   outputBin = "dev";
 

pkgs/tools/misc/diffoscope/default.nix

@@ -1,30 +1,24 @@
-{ lib, stdenv, fetchgit, fetchpatch, pythonPackages, docutils
+{ lib, stdenv, fetchgit, fetchpatch, python3, docutils
 , acl, binutils, bzip2, cbfstool, cdrkit, colord, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc
 , gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, sng, sqlite, squashfsTools, unzip, vim, xz
 , colordiff
 , enableBloat ? false
 }:
 
-pythonPackages.buildPythonApplication rec {
-  name = "diffoscope-${version}";
-  version = "63";
-
-  namePrefix = "";
+python3.pkgs.buildPythonApplication rec {
+  pname = "diffoscope";
+  name = "${pname}-${version}";
+  version = "77";
 
   src = fetchgit {
     url = "git://anonscm.debian.org/reproducible/diffoscope.git";
     rev = "refs/tags/${version}";
-    sha256 = "018c0xcgf6pgq493dib29pfyqpj7vb93a6qfmdh790fpxa2j1zyd";
+    sha256 = "0l5q24sqb88qkz62cz85bq65myfqig3z3m1lj2s92hdlqip9946b";
   };
 
   patches =
     [ # Ignore different link counts.
       ./ignore_links.patch
-
-      # Our Glibc doesn't have the C.UTF-8 locale yet
-      # (https://sourceware.org/glibc/wiki/Proposals/C.UTF-8), so use
-      # en_US.UTF-8 instead.
-      ./locale.patch
     ];
 
   postPatch = ''
@@ -35,7 +29,7 @@ pythonPackages.buildPythonApplication rec {
   # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf
   # Also these libraries: python3-guestfs
   # FIXME: move xxd into a separate package so we don't have to pull in all of vim.
-  propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh rpm ]) ++
+  propagatedBuildInputs = (with python3.pkgs; [ debian libarchive-c python_magic tlsh rpm ]) ++
     map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext
       gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff
     ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]);

pkgs/top-level/all-packages.nix

@@ -1448,7 +1448,6 @@ with pkgs;
 
   diffoscope = callPackage ../tools/misc/diffoscope {
     jdk = jdk7;
-    pythonPackages = python3Packages;
   };
 
   diffstat = callPackage ../tools/text/diffstat { };