From ba92ef0b321d3f0ea3bc20482dc7fee2ad56c580 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Nov 2016 09:28:47 +0100
Subject: [PATCH 01/18] gpodder: use python2

---
 pkgs/applications/audio/gpodder/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index eb9ddf164d4..569326ec375 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, pythonPackages, mygpoclient, intltool
+{ stdenv, fetchurl, python2Packages, mygpoclient, intltool
 , ipodSupport ? true, libgpod
 , gnome3
 }:
 
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
   name = "gpodder-${version}";
 
   version = "3.9.1";
@@ -24,12 +24,12 @@ pythonPackages.buildPythonApplication rec {
   '';
 
   buildInputs = [
-    intltool pythonPackages.coverage pythonPackages.minimock
+    intltool python2Packages.coverage python2Packages.minimock
     gnome3.gnome_themes_standard gnome3.defaultIconTheme
     gnome3.gsettings_desktop_schemas
   ];
 
-  propagatedBuildInputs = with pythonPackages; [
+  propagatedBuildInputs = with python2Packages; [
     feedparser dbus-python mygpoclient pygtk eyeD3
   ] ++ stdenv.lib.optional ipodSupport libgpod;
 

From 66d3b9a02d78cddc7ac0623fda44ac5895cd5951 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Nov 2016 09:30:45 +0100
Subject: [PATCH 02/18] wicd: use python2

---
 pkgs/tools/networking/wicd/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index 2613fe7ab09..fe315666a2e 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, pythonPackages
+{ stdenv, fetchurl, python2Packages
 , wpa_supplicant, dhcp, dhcpcd, wirelesstools
 , nettools, openresolv, iproute, iputils
 , locale ? "C" }:
 
 let
-  inherit (pythonPackages) python pygobject2 dbus-python pyGtkGlade pycairo;
+  inherit (python2Packages) python pygobject2 dbus-python pyGtkGlade pycairo;
 in stdenv.mkDerivation rec {
   name = "wicd-${version}";
   version = "1.7.2.4";
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
     sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw";
   };
 
-  buildInputs = with pythonPackages; [
+  buildInputs = with python2Packages; [
     python Babel urwid notify
   ];
 
@@ -42,11 +42,11 @@ in stdenv.mkDerivation rec {
     sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in
     sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in
     sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-gtk.in
-    sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${pythonPackages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in
+    sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${python2Packages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in
     sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in
     sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in
     sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-curses.in
-    sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${pythonPackages.urwid})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in
+    sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${python2Packages.urwid})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in
     rm po/ast.po
   '';
 

From e1cd8f0f96b2dddcb18ef52c2be3509de3dd2c03 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Nov 2016 09:33:32 +0100
Subject: [PATCH 03/18] zim: use python2

---
 pkgs/applications/office/zim/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index 313239581a1..227b982689e 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pythonPackages }:
+{ stdenv, lib, fetchurl, python2Packages }:
 
 #
 # TODO: Declare configuration options for the following optional dependencies:
@@ -7,17 +7,16 @@
 #  -  pyxdg: Need to make it work first (see setupPyInstallFlags).
 #
 
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
   name = "zim-${version}";
   version = "0.65";
-  namePrefix = "";
 
   src = fetchurl {
     url = "http://zim-wiki.org/downloads/${name}.tar.gz";
     sha256 = "15pdq4fxag85qjsrdmmssiq85qsk5vnbp8mrqnpvx8lm8crz6hjl";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ pyGtkGlade pyxdg pygobject2 ];
+  propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ];
 
   preBuild = ''
     export HOME=$TMP

From 2445119d5a0ac3b7dd2dd52e6b9d485bbb4ee536 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Nov 2016 09:35:51 +0100
Subject: [PATCH 04/18] bootchart: use python2

---
 pkgs/tools/system/bootchart/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix
index b5f1af6dfed..34da8d40081 100644
--- a/pkgs/tools/system/bootchart/default.nix
+++ b/pkgs/tools/system/bootchart/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, lib, pkgconfig, glib, gtk2, python27, pythonPackages }:
+{stdenv, fetchurl, lib, pkgconfig, glib, gtk2, python27, python2Packages }:
 
 stdenv.mkDerivation rec {
   version = "0.14.7";
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "1abn4amsyys6vwn7csxsxny94n24ycca3xhqxqcmdc4j0dzn3kmb";
   };
 
-  buildInputs = [ pkgconfig glib gtk2 python27 pythonPackages.wrapPython pythonPackages.pygtk ];
-  pythonPath = with pythonPackages; [ pygtk pycairo ];
+  buildInputs = [ pkgconfig glib gtk2 python2Packages.python python2Packages.wrapPython python2Packages.pygtk ];
+  pythonPath = with python2Packages; [ pygtk pycairo ];
 
   installPhase = ''
-    make install DESTDIR=$out BINDIR=/bin PY_LIBDIR=/lib/python2.7
+    make install DESTDIR=$out BINDIR=/bin PY_LIBDIR=/lib/${python2Packages.python.libPrefix}
     wrapProgram $out/bin/pybootchartgui \
       --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
   '';

From e94d9cdfaaaace2432de9a8b77b0d10db53fc73d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Nov 2016 09:39:34 +0100
Subject: [PATCH 05/18] virtmanager: use python2

---
 pkgs/applications/virtualization/virt-manager/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 0964e1b4814..c779cf43967 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl
-, wrapGAppsHook, virtinst, gnome_python, gtkvnc, vte
+{ stdenv, fetchurl, python2Packages, intltool, curl
+, wrapGAppsHook, virtinst, gtkvnc, vte
 , gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib
 , avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo, gnome3, system-libvirt
 }:
 
 with stdenv.lib;
-with pythonPackages;
+with python2Packages;
 
 buildPythonApplication rec {
   name = "virt-manager-${version}";
@@ -22,7 +22,7 @@ buildPythonApplication rec {
       PasteDeploy m2crypto ipy twisted
       distutils_extra simplejson glanceclient cheetah lockfile httplib2
       urlgrabber virtinst pyGtkGlade dbus-python gnome_python pygobject3
-      libvirt libxml2Python ipaddr vte libosinfo gobjectIntrospection gtk3 mox
+      libvirt libxml2 ipaddr vte libosinfo gobjectIntrospection gtk3 mox
       gtkvnc libvirt-glib glib gsettings_desktop_schemas gnome3.defaultIconTheme
       wrapGAppsHook
     ] ++ optional spiceSupport spice_gtk;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3a321c9065..03d469387eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15340,7 +15340,6 @@ in
   };
 
   virtmanager = callPackage ../applications/virtualization/virt-manager {
-    inherit (gnome2) gnome_python;
     vte = gnome3.vte;
     dconf = gnome3.dconf;
     spice_gtk = spice_gtk;

From 7a109e63108de4ab59010041f0a8a7f19a14a318 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Nov 2016 10:01:48 +0100
Subject: [PATCH 06/18] pythonPackages.docker: support python3

---
 pkgs/top-level/python-packages.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1b93cc43d75..0c6d540bfea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6214,9 +6214,9 @@ in {
       sha256 = "05f49f6hnl7npmi7kigg0ibqk8s3fhzx1ivvz1kqvlv4ay3paajc";
     };
 
-    buildInputs = [
-      pkgs.glibcLocales
-    ];
+    buildInputs = [ pkgs.glibcLocales ];
+
+    LC_ALL="en_US.UTF-8";
 
     propagatedBuildInputs = with self; [
       six
@@ -6227,11 +6227,9 @@ in {
       docker_pycreds
     ];
 
-    # Version conflict
+    # Flake8 version conflict
     doCheck = false;
 
-    LC_ALL="en_US.UTF-8";
-
     meta = {
       description = "An API client for docker written in Python";
       homepage = https://github.com/docker/docker-py;

From 472c25cfa2882ec3279555ef709e638b3f5edce5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Nov 2016 10:02:57 +0100
Subject: [PATCH 07/18] zbar: use python2

---
 pkgs/tools/graphics/zbar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index 66f61d9a459..87bb4923b8a 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, imagemagickBig, pkgconfig, pythonPackages, perl
+{ stdenv, fetchurl, imagemagickBig, pkgconfig, python2Packages, perl
 , libX11, libv4l, qt4, lzma, gtk2, fetchpatch, autoreconfHook
 }:
 
 let
-  inherit (pythonPackages) pygtk python;
+  inherit (python2Packages) pygtk python;
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "zbar";

From 85e170c2c1f7a4bf45fa447b4bfbdb50cd3991aa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Nov 2016 10:03:53 +0100
Subject: [PATCH 08/18] linuxband: use python2

---
 pkgs/applications/audio/linuxband/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix
index 5c127a289c0..ba1d88373ff 100644
--- a/pkgs/applications/audio/linuxband/default.nix
+++ b/pkgs/applications/audio/linuxband/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig, MMA, libjack2, libsmf, pythonPackages }:
+{ stdenv, fetchurl, makeWrapper, pkgconfig, MMA, libjack2, libsmf, python2Packages }:
 
 let
-  inherit (pythonPackages) pyGtkGlade pygtksourceview python;
+  inherit (python2Packages) pyGtkGlade pygtksourceview python;
 in stdenv.mkDerivation rec {
   version = "12.02.1";
   name = "linuxband-${version}";

From 70b0af9f831c1396672bbcfbf5b119343402476f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 8 Dec 2016 12:23:25 +0100
Subject: [PATCH 09/18] omniorb: use python2

---
 pkgs/development/tools/omniorb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix
index 8488d47dea5..821401d578c 100644
--- a/pkgs/development/tools/omniorb/default.nix
+++ b/pkgs/development/tools/omniorb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python }:
+{ stdenv, fetchurl, python2 }:
 stdenv.mkDerivation rec {
 
   name = "omniorb-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1g58xcw4641wyisp9wscrkzaqrz0vf123dgy52qq2a3wk7y77hkl";
   };
 
-  buildInputs = [ python ];
+  buildInputs = [ python2 ];
 
   hardeningDisable = [ "format" ];
 

From e8d3c74b499ad026e40ca77f54214444f9461e3c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 14 Jan 2017 12:57:58 -0500
Subject: [PATCH 10/18] util-linux: 2.28.1 -> 2.29

---
 pkgs/os-specific/linux/util-linux/default.nix      |  6 +++---
 .../rtcwake-search-PATH-for-shutdown.patch         | 14 +++++---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index f8461113903..f6e26f51cc8 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -4,12 +4,12 @@ stdenv.mkDerivation rec {
   name = "util-linux-${version}";
   version = lib.concatStringsSep "." ([ majorVersion ]
     ++ lib.optional (patchVersion != "") patchVersion);
-  majorVersion = "2.28";
-  patchVersion = "1";
+  majorVersion = "2.29";
+  patchVersion = "";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
-    sha256 = "03xnaw3c7pavxvvh1vnimcr44hlhhf25whawiyv8dxsflfj4xkiy";
+    sha256 = "1rzrmdrz51p9sy7vlw5qmj8pmqazm7hgcch5yq242mkvrikyln9c";
   };
 
   patches = [
diff --git a/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch b/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
index 3615984ed0c..2dd3fcc4ebe 100644
--- a/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
+++ b/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
@@ -3,21 +3,17 @@ which isn't valid on NixOS (and a compatibility link on most other modern
 distros anyway).
 
   -- nckx <tobias.geerinckx.rice@gmail.com>
-diff --git a/include/pathnames.h b/include/pathnames.h
-index de6a13c..0c1aeb9 100644
 --- a/include/pathnames.h
 +++ b/include/pathnames.h
-@@ -50,7 +50,7 @@
- #define	_PATH_VAR_NOLOGIN	"/var/run/nologin"
- 
+@@ -53,7 +53,7 @@
+ #ifndef _PATH_LOGIN
  #define _PATH_LOGIN		"/bin/login"
+ #endif
 -#define _PATH_SHUTDOWN		"/sbin/shutdown"
-+#define _PATH_SHUTDOWN		"shutdown"
- 
++#define _PATH_SHUTDOWN   "shutdown"
+
  #define _PATH_TERMCOLORS_DIRNAME "terminal-colors.d"
  #define _PATH_TERMCOLORS_DIR	"/etc/" _PATH_TERMCOLORS_DIRNAME
-diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
-index 7c748dc..9a99a7c 100644
 --- a/sys-utils/rtcwake.c
 +++ b/sys-utils/rtcwake.c
 @@ -575,7 +575,7 @@ int main(int argc, char **argv)

From 7a4b15020a1cbe4a51a3f4c9e96590bcda57c01c Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 13 Jan 2017 11:53:56 +0100
Subject: [PATCH 11/18] ed: 1.13 -> 1.14.1

See http://lists.gnu.org/archive/html/info-gnu/2017-01/msg00004.html
for full release announcement.
---
 pkgs/applications/editors/ed/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index 9cb644cc931..ec56667a4ba 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -1,7 +1,8 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "ed-1.13";
+  name = "ed-${version}";
+  version = "1.14.1";
 
   src = fetchurl {
     # gnu only provides *.lz tarball, which is unfriendly for stdenv bootstrapping
@@ -9,13 +10,13 @@ stdenv.mkDerivation rec {
     # When updating, please make sure the sources pulled match those upstream by
     # Unpacking both tarballs and running `find . -type f -exec sha256sum \{\} \; | sha256sum`
     # in the resulting directory
-    urls = let file_md5 = "fb8ffc8d8072e13dd5799131e889bfa5"; # for fedora mirror
+    urls = let file_sha512 = "84396fe4e4f0bf0b591037277ff8679a08b2883207628aaa387644ad83ca5fbdaa74a581f33310e28222d2fea32a0b8ba37e579597cc7d6145df6eb956ea75db";
       in [
         ("http://pkgs.fedoraproject.org/repo/extras/ed"
-          + "/${name}.tar.bz2/${file_md5}/${name}.tar.bz2")
+          + "/${name}.tar.bz2/sha512/${file_sha512}/${name}.tar.bz2")
         "http://fossies.org/linux/privat/${name}.tar.bz2"
       ];
-    sha256 = "1iym2fsamxr886l3sz8lqzgf00bip5cr0aly8jp04f89kf5mvl0j";
+    sha256 = "1pk6qa4sr7qc6vgm34hjx44hsh8x2bwaxhdi78jhsacnn4zwi7bw";
   };
 
   /* FIXME: Tests currently fail on Darwin:

From 919a1435da08b0fdd051b1bf3670a8f347aa4a4e Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 17 Jan 2017 00:13:18 +0100
Subject: [PATCH 12/18] gperf: 3.0.4 -> 3.1

See https://lists.gnu.org/archive/html/info-gnu/2017-01/msg00005.html
for full release announcement.
---
 pkgs/development/tools/misc/gperf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix
index bfada264d50..b88a107bdbc 100644
--- a/pkgs/development/tools/misc/gperf/default.nix
+++ b/pkgs/development/tools/misc/gperf/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "gperf-3.0.4";
+  name = "gperf-3.1";
 
   src = fetchurl {
     url = "mirror://gnu/gperf/${name}.tar.gz";
-    sha256 = "0gnnm8iqcl52m8iha3sxrzrl9mcyhg7lfrhhqgdn4zj00ji14wbn";
+    sha256 = "1qispg6i508rq8pkajh26cznwimbnj06wq9sd85vg95v8nwld1aq";
   };
 
   meta = {

From 8e5e365265acac552cf322c755b349a90db120d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 18 Jan 2017 15:12:19 +0100
Subject: [PATCH 13/18] libtasn1: 4.9 -> 4.10

The fixes in NEWS seem like having a possible security impact.
---
 pkgs/development/libraries/libtasn1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index 5ecbcc63a95..34727c1e5f6 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "libtasn1-4.9";
+  name = "libtasn1-4.10";
 
   src = fetchurl {
     url = "mirror://gnu/libtasn1/${name}.tar.gz";
-    sha256 = "0869cp6jx7cajgv6cnddsh3vc7bimmdkdjn80y1jpb4iss7plvsg";
+    sha256 = "681a4d9a0d259f2125713f2e5766c5809f151b3a1392fd91390f780b4b8f5a02";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From 68c95309980d6e6e1dc315628de55844f8b02ca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 18 Jan 2017 15:50:58 +0100
Subject: [PATCH 14/18] libtiff: apply security patches from Debian

/cc #21967.
---
 pkgs/development/libraries/libtiff/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 49fddd06c17..c6705703149 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -11,6 +11,17 @@ stdenv.mkDerivation rec {
     sha256 = "06ghqhr4db1ssq0acyyz49gr8k41gzw6pqb6mbn5r7jqp77s4hwz";
   };
 
+  prePatch =let
+      # https://lwn.net/Vulnerabilities/711777/
+      debian = fetchurl {
+        url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.7-5.debian.tar.xz;
+        sha256 = "1ribxdn89wx3nllcyh7ql3dx6wpr1h7z3waglz1w7dklxm43q67l";
+      };
+    in ''
+      tar xf '${debian}'
+      patches="$patches $(cat debian/patches/series | sed 's|^|debian/patches/|')"
+    '';
+
   outputs = [ "bin" "dev" "out" "doc" ];
 
   nativeBuildInputs = [ pkgconfig ];

From 0dc43ab9d68e37bdabe9dafaab12d2ccd5f49720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 18 Jan 2017 16:06:07 +0100
Subject: [PATCH 15/18] virt-manager: fixup evaluation to unbreak Hydra

The package itself is probably still broken.  /cc @fridh e94d9cdfaaa
---
 pkgs/applications/virtualization/virt-manager/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index c779cf43967..bd003df57f8 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -21,7 +21,7 @@ buildPythonApplication rec {
     [ eventlet greenlet gflags netaddr carrot routes
       PasteDeploy m2crypto ipy twisted
       distutils_extra simplejson glanceclient cheetah lockfile httplib2
-      urlgrabber virtinst pyGtkGlade dbus-python gnome_python pygobject3
+      urlgrabber virtinst pyGtkGlade dbus-python /*gnome_python FIXME*/ pygobject3
       libvirt libxml2 ipaddr vte libosinfo gobjectIntrospection gtk3 mox
       gtkvnc libvirt-glib glib gsettings_desktop_schemas gnome3.defaultIconTheme
       wrapGAppsHook

From 59e0cfb589d3fb3d2697f26c269bc1ea0324d44b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 18 Jan 2017 16:45:52 +0100
Subject: [PATCH 16/18] gperf: bring back 3.0.4 to fix systemd build

Systemd has fixed this on master, but I don't want to meddle with the
patch that doesn't apply cleanly on our version.
---
 pkgs/development/tools/misc/gperf/3.0.x.nix | 33 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/tools/misc/gperf/3.0.x.nix

diff --git a/pkgs/development/tools/misc/gperf/3.0.x.nix b/pkgs/development/tools/misc/gperf/3.0.x.nix
new file mode 100644
index 00000000000..bfada264d50
--- /dev/null
+++ b/pkgs/development/tools/misc/gperf/3.0.x.nix
@@ -0,0 +1,33 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "gperf-3.0.4";
+
+  src = fetchurl {
+    url = "mirror://gnu/gperf/${name}.tar.gz";
+    sha256 = "0gnnm8iqcl52m8iha3sxrzrl9mcyhg7lfrhhqgdn4zj00ji14wbn";
+  };
+
+  meta = {
+    description = "Perfect hash function generator";
+
+    longDescription = ''
+      GNU gperf is a perfect hash function generator.  For a given
+      list of strings, it produces a hash function and hash table, in
+      form of C or C++ code, for looking up a value depending on the
+      input string.  The hash function is perfect, which means that
+      the hash table has no collisions, and the hash table lookup
+      needs a single string comparison only.
+
+      GNU gperf is highly customizable.  There are options for
+      generating C or C++ code, for emitting switch statements or
+      nested ifs instead of a hash table, and for tuning the algorithm
+      employed by gperf.
+    '';
+
+    license = stdenv.lib.licenses.gpl3Plus;
+
+    homepage = http://www.gnu.org/software/gperf/;
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1bbb22e06f..f209201eb2f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6354,6 +6354,7 @@ in
   gradle_2_5 = self.gradleGen.gradle_2_5;
 
   gperf = callPackage ../development/tools/misc/gperf { };
+  gperf_3_0 = callPackage ../development/tools/misc/gperf/3.0.x.nix { };
 
   grail = callPackage ../development/libraries/grail { };
 
@@ -11723,6 +11724,7 @@ in
 
   systemd = callPackage ../os-specific/linux/systemd {
     utillinux = utillinuxMinimal; # break the cyclic dependency
+    gperf = gperf_3_0; # fix build until v233
   }
     // {
       udev.bin = systemd;     # ${systemd.udev.bin}/bin/udevadm

From f4f885243e6139edb196d00a9313f6ce5141e0de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 19 Jan 2017 09:07:50 +0100
Subject: [PATCH 17/18] treewide: switch more packages to older gperf

They wouldn't build otherwise.
---
 pkgs/top-level/all-packages.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f209201eb2f..a79bf546243 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6354,6 +6354,7 @@ in
   gradle_2_5 = self.gradleGen.gradle_2_5;
 
   gperf = callPackage ../development/tools/misc/gperf { };
+  # 3.1 changed some parameters from int to size_t, leading to mismatches.
   gperf_3_0 = callPackage ../development/tools/misc/gperf/3.0.x.nix { };
 
   grail = callPackage ../development/libraries/grail { };
@@ -6412,7 +6413,9 @@ in
 
   jenkins-job-builder = pythonPackages.jenkins-job-builder;
 
-  kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends { };
+  kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends {
+    gperf = gperf_3_0;
+  };
 
   kcov = callPackage ../development/tools/analysis/kcov { };
 
@@ -8254,7 +8257,9 @@ in
   # On non-GNU systems we need GNU Gettext for libintl.
   libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux) gettext;
 
-  libid3tag = callPackage ../development/libraries/libid3tag { };
+  libid3tag = callPackage ../development/libraries/libid3tag {
+    gperf = gperf_3_0;
+  };
 
   libidn = callPackage ../development/libraries/libidn { };
 
@@ -10419,7 +10424,9 @@ in
 
   rspamd = callPackage ../servers/mail/rspamd { };
 
-  pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix { };
+  pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix {
+    gperf = gperf_3_0;
+  };
   pflogsumm = callPackage ../servers/mail/postfix/pflogsumm.nix { };
 
   postgrey = callPackage ../servers/mail/postgrey { };
@@ -12526,7 +12533,9 @@ in
 
   bibletime = callPackage ../applications/misc/bibletime { };
 
-  bitkeeper = callPackage ../applications/version-management/bitkeeper { };
+  bitkeeper = callPackage ../applications/version-management/bitkeeper {
+    gperf = gperf_3_0;
+  };
 
   bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };
   bitlbee-plugins = callPackage ../applications/networking/instant-messengers/bitlbee/plugins.nix { };

From 5326cb7340e0cdc8a6f49291b3a127be9743a127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 19 Jan 2017 19:25:02 +0100
Subject: [PATCH 18/18] webkit: security 2.14.2 -> 2.14.3

https://webkitgtk.org/security/WSA-2017-0001.html
/cc #21967.
---
 pkgs/development/libraries/webkitgtk/2.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/2.14.nix b/pkgs/development/libraries/webkitgtk/2.14.nix
index 6835f59f586..2af7133bf2b 100644
--- a/pkgs/development/libraries/webkitgtk/2.14.nix
+++ b/pkgs/development/libraries/webkitgtk/2.14.nix
@@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.14.2";
+  version = "2.14.3";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "0mjmcxhafh6l6j062z2nwfqbbvfyx16iqrzrbajswijh23awpnrf";
+    sha256 = "0v0hkvggxi38cdb3v672qwr0m0y3x2rmnwh8j3q28869li8d9shb";
   };
 
   # see if we can clean this up....