Merge branch 'master' into staging

2016-09-17 00:31:34 +02:00
parent ca0e798e50 edcaebf1d9
commit 52e1a198cf
760 changed files with 14878 additions and 27036 deletions
--- a/pkgs/applications/audio/ams-lv2/default.nix
+++ b/pkgs/applications/audio/ams-lv2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cairo, fftw, gtk, gtkmm, lv2, lvtk, pkgconfig, python }:
+{ stdenv, fetchurl, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python }:

 stdenv.mkDerivation  rec {
  name = "ams-lv2-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation  rec {
    sha256 = "1kqbl7rc3zrs27c5ga0frw3mlpx15sbxzhf04sfbrd9l60535fd5";
  };

-  buildInputs = [ cairo fftw gtk gtkmm lv2 lvtk pkgconfig python ];
+  buildInputs = [ cairo fftw gtkmm2 lv2 lvtk pkgconfig python ];

  configurePhase = "python waf configure --prefix=$out";

--- a/pkgs/applications/audio/ardour/ardour3.nix
+++ b/pkgs/applications/audio/ardour/ardour3.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw
-, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtk, gtkmm, libjack2
+, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2
 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
 , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
 , libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {

  buildInputs = 
    [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc
-      glibmm graphviz gtk gtkmm libjack2 libgnomecanvas libgnomecanvasmm liblo
+      glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo
      libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
      libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2
      makeWrapper pango perl pkgconfig python rubberband serd sord-svn sratom suil taglib vampSDK
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw
-, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtk, gtkmm, libjack2
+, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2
 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
 , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
 , libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {

  buildInputs =
    [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc
-      glibmm graphviz gtk gtkmm libjack2 libgnomecanvas libgnomecanvasmm liblo
+      glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo
      libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
      libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2
      makeWrapper pango perl pkgconfig python rubberband serd sord-svn sratom suil taglib vampSDK
--- a/pkgs/applications/audio/asunder/default.nix
+++ b/pkgs/applications/audio/asunder/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, makeWrapper, gtk2, libcddb, intltool, pkgconfig, cdparanoia
+, mp3Support ? false, lame
+, oggSupport ? true, vorbis-tools
+, flacSupport ? true, flac
+, opusSupport ? false, opusTools
+, wavpackSupport ? false, wavpack
+#, musepackSupport ? false, TODO: mpcenc
+, monkeysAudioSupport ? false, monkeysAudio
+#, aacSupport ? false, TODO: neroAacEnc
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  version = "2.8";
+  name = "asunder-${version}";
+  src = fetchurl {
+    url = "http://littlesvr.ca/asunder/releases/${name}.tar.bz2";
+    sha256 = "1nq9kd4rd4k2kibf57gdbm0zw2gxa234vvvdhxkm8g5bhx5h3iyq";
+  };
+
+  buildInputs = [ gtk2 libcddb intltool pkgconfig makeWrapper ];
+
+  runtimeDeps =
+    optional mp3Support lame ++
+    optional oggSupport vorbis-tools ++
+    optional flacSupport flac ++
+    optional opusSupport opusTools ++
+    optional wavpackSupport wavpack ++
+    optional monkeysAudioSupport monkeysAudio ++
+    [ cdparanoia ];
+
+  postInstall = ''
+    wrapProgram "$out/bin/asunder" \
+      --prefix PATH : "${makeBinPath runtimeDeps}"
+  '';
+
+  meta = {
+    description = "A graphical Audio CD ripper and encoder for Linux";
+    homepage = http://littlesvr.ca/asunder/index.php;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ mudri ];
+    platforms = platforms.linux;
+
+    longDescription = ''
+      Asunder is a graphical Audio CD ripper and encoder for Linux. You can use
+      it to save tracks from an Audio CD as any of WAV, MP3, OGG, FLAC, Opus,
+      WavPack, Musepack, AAC, and Monkey's Audio files.
+    '';
+  };
+}
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, wxGTK30, pkgconfig, gettext, gtk, glib, zlib, perl, intltool,
+{ stdenv, fetchurl, wxGTK30, pkgconfig, gettext, gtk2, glib, zlib, perl, intltool,
  libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame, fetchpatch,
  expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */
  }:
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {

  buildInputs = [
    pkgconfig gettext wxGTK30 expat alsaLib
-    libsndfile soxr libid3tag gtk
+    libsndfile soxr libid3tag gtk2
    ffmpeg libmad lame libvorbis flac soundtouch
  ]; #ToDo: detach sbsms

--- a/pkgs/applications/audio/aumix/default.nix
+++ b/pkgs/applications/audio/aumix/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl, gettext, ncurses
 , gtkGUI ? false
 , pkgconfig ? null
-, gtk ? null}:
+, gtk2 ? null}:

-assert gtkGUI -> pkgconfig != null && gtk != null;
+assert gtkGUI -> pkgconfig != null && gtk2 != null;

 stdenv.mkDerivation rec {
  name = "aumix-2.9.1";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  };

  buildInputs = [ gettext ncurses ]
-    ++ (if gtkGUI then [pkgconfig gtk] else []);
+    ++ (if gtkGUI then [pkgconfig gtk2] else []);

  meta = {
    description = "Audio mixer for X and the console";
--- a/pkgs/applications/audio/beast/default.nix
+++ b/pkgs/applications/audio/beast/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, zlib, guile, libart_lgpl, pkgconfig, intltool
-, gtk, glib, libogg, libvorbis, libgnomecanvas, gettext, perl }:
+, gtk2, glib, libogg, libvorbis, libgnomecanvas, gettext, perl }:

 stdenv.mkDerivation rec {
  name = "beast-0.7.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  };

  buildInputs =
-    [ zlib guile libart_lgpl pkgconfig intltool gtk glib
+    [ zlib guile libart_lgpl pkgconfig intltool gtk2 glib
      libogg libvorbis libgnomecanvas gettext
    ];

--- a/pkgs/applications/audio/bitwig-studio/default.nix
+++ b/pkgs/applications/audio/bitwig-studio/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk_pixbuf
-, glib, gtk, harfbuzz, jdk, lib, libX11, libXau, libXcursor, libXdmcp
+, glib, gtk2, harfbuzz, jdk, lib, libX11, libXau, libXcursor, libXdmcp
 , libXext, libXfixes, libXrender, libbsd, libjack2, libpng, libxcb
 , libxkbcommon, libxkbfile, makeWrapper, pixman, xcbutil, xcbutilwm
 , xdg_utils, zenity, zlib }:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
  dontStrip = true;

  libPath = lib.makeLibraryPath [
-    alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk harfbuzz
+    alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk2 harfbuzz
    libX11 libXau libXcursor libXdmcp libXext libXfixes libXrender
    libbsd libjack2 libpng libxcb libxkbfile pixman xcbutil xcbutilwm
    zlib
--- a/pkgs/applications/audio/calf/default.nix
+++ b/pkgs/applications/audio/calf/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib
-, gtk, libjack2, ladspaH , libglade, lv2, pkgconfig }:
+, gtk2, libjack2, ladspaH , libglade, lv2, pkgconfig }:

 stdenv.mkDerivation rec {
  name = "calf-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
  };

  buildInputs = [ 
-    cairo expat fftwSinglePrec fluidsynth glib gtk libjack2 ladspaH
+    cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH
    libglade lv2 pkgconfig
  ];

--- a/pkgs/applications/audio/cdparanoia/default.nix
+++ b/pkgs/applications/audio/cdparanoia/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
    })
  ];

-  buildInputs = stdenv.lib.optional stdenv.isDarwin [
+  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [
    Carbon
    IOKit
  ];
--- a/pkgs/applications/audio/eq10q/default.nix
+++ b/pkgs/applications/audio/eq10q/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xorg }:
+{ stdenv, fetchurl, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig, xorg }:
 stdenv.mkDerivation rec {
  name = "eq10q-${version}";
  version = "2.0";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
    sha256 = "08vlfly0qqrfqiwpn5g5php680icpk97pwnwjadmj5syhgvi0i3h";
  };

-  buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];
+  buildInputs = [ cmake fftw gtkmm2 libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];

  installFlags = ''
    DESTDIR=$(out)
--- a/pkgs/applications/audio/faust/faust2alsa.nix
+++ b/pkgs/applications/audio/faust/faust2alsa.nix
@@ -6,7 +6,7 @@
 , freetype
 , gdk_pixbuf
 , glib
-, gtk
+, gtk2
 , pango
 }:

@@ -22,7 +22,7 @@ faust.wrapWithBuildEnv {
    freetype
    gdk_pixbuf
    glib
-    gtk
+    gtk2
    pango
  ];

--- a/pkgs/applications/audio/faust/faust2jack.nix
+++ b/pkgs/applications/audio/faust/faust2jack.nix
@@ -1,5 +1,5 @@
 { faust
-, gtk
+, gtk2
 , jack2Full
 , opencv
 }:
@@ -15,7 +15,7 @@ faust.wrapWithBuildEnv {
  ];

  propagatedBuildInputs = [
-    gtk
+    gtk2
    jack2Full
    opencv
  ];
--- a/pkgs/applications/audio/gigedit/default.nix
+++ b/pkgs/applications/audio/gigedit/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchsvn, autoconf, automake, docbook_xml_dtd_45
-, docbook_xsl, gtkmm, intltool, libgig, libsndfile, libtool, libxslt
+, docbook_xsl, gtkmm2, intltool, libgig, libsndfile, libtool, libxslt
 , pkgconfig }:

 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  preConfigure = "make -f Makefile.cvs";

  buildInputs = [ 
-    autoconf automake docbook_xml_dtd_45 docbook_xsl gtkmm intltool
+    autoconf automake docbook_xml_dtd_45 docbook_xsl gtkmm2 intltool
    libgig libsndfile libtool libxslt pkgconfig 
  ];

--- a/pkgs/applications/audio/gjay/default.nix
+++ b/pkgs/applications/audio/gjay/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus_glib, audacious, gtk, gsl
+{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus_glib, audacious, gtk2, gsl
 , libaudclient }:

 stdenv.mkDerivation {
@@ -11,7 +11,7 @@ stdenv.mkDerivation {

  nativeBuildInputs = [ pkgconfig ];

-  buildInputs = [ mpd_clientlib dbus_glib audacious gtk gsl libaudclient ];
+  buildInputs = [ mpd_clientlib dbus_glib audacious gtk2 gsl libaudclient ];

  hardeningDisable = [ "format" ];

--- a/pkgs/applications/audio/gmpc/default.nix
+++ b/pkgs/applications/audio/gmpc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libtool, intltool, pkgconfig, glib
-, gtk, curl, mpd_clientlib, libsoup, gob2, vala_0_23, libunique
+, gtk2, curl, mpd_clientlib, libsoup, gob2, vala_0_23, libunique
 , libSM, libICE, sqlite, hicolor_icon_theme, wrapGAppsHook
 }:

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
  };

  buildInputs = [
-    libtool intltool pkgconfig glib gtk curl mpd_clientlib libsoup
+    libtool intltool pkgconfig glib gtk2 curl mpd_clientlib libsoup
    libunique libmpd gob2 vala_0_23 libSM libICE sqlite hicolor_icon_theme
    wrapGAppsHook
  ];
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, gettext, intltool, pkgconfig, python
 , avahi, bluez, boost, eigen, fftw, glib, glib_networking
-, glibmm, gsettings_desktop_schemas, gtk, gtkmm, libjack2
+, glibmm, gsettings_desktop_schemas, gtkmm2, libjack2
 , ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom
 , webkitgtk2, wrapGAppsHook, zita-convolver, zita-resampler
 , optimizationSupport ? false # Enable support for native CPU extensions
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {

  buildInputs = [
    avahi bluez boost eigen fftw glib glibmm glib_networking.out
-    gsettings_desktop_schemas gtk gtkmm libjack2 ladspaH librdf
+    gsettings_desktop_schemas gtkmm2 libjack2 ladspaH librdf
    libsndfile lilv lv2 serd sord sratom webkitgtk2 zita-convolver
    zita-resampler
  ];
--- a/pkgs/applications/audio/ingen/default.nix
+++ b/pkgs/applications/audio/ingen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, libjack2, lilv-svn
+{ stdenv, fetchsvn, boost, ganv, glibmm, gtkmm2, libjack2, lilv-svn
 , lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord-svn, sratom
 , suil
 }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation  rec {
  };

  buildInputs = [
-    boost ganv glibmm gtk gtkmm libjack2 lilv-svn lv2 makeWrapper pkgconfig
+    boost ganv glibmm gtkmm2 libjack2 lilv-svn lv2 makeWrapper pkgconfig
    python raul serd sord-svn sratom suil
  ];

--- a/pkgs/applications/audio/jack-rack/default.nix
+++ b/pkgs/applications/audio/jack-rack/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, libjack2, ladspaH, gtk, alsaLib, libxml2, librdf }:
+{ stdenv, fetchurl, pkgconfig, libjack2, ladspaH, gtk2, alsaLib, libxml2, librdf }:
 stdenv.mkDerivation rec {
  name = "jack-rack-1.4.7";
  src = fetchurl {
    url = "mirror://sourceforge/jack-rack/${name}.tar.bz2";
    sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045";
  };
-  buildInputs = [ pkgconfig libjack2 ladspaH gtk alsaLib libxml2 librdf ];
+  buildInputs = [ pkgconfig libjack2 ladspaH gtk2 alsaLib libxml2 librdf ];

  meta = {
    description = ''An effects "rack" for the JACK low latency audio API'';
--- a/pkgs/applications/audio/jalv/default.nix
+++ b/pkgs/applications/audio/jalv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk, libjack2, lilv, lv2, pkgconfig, python
+{ stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkgconfig, python
 , serd, sord , sratom, suil }:

 stdenv.mkDerivation  rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation  rec {
  };

  buildInputs = [
-    gtk libjack2 lilv lv2 pkgconfig python serd sord sratom suil
+    gtk2 libjack2 lilv lv2 pkgconfig python serd sord sratom suil
  ];

  configurePhase = "python waf configure --prefix=$out";
--- a/pkgs/applications/audio/lash/default.nix
+++ b/pkgs/applications/audio/lash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, gtk, libjack2, libuuid, libxml2
+{ stdenv, fetchurl, alsaLib, gtk2, libjack2, libuuid, libxml2
 , makeWrapper, pkgconfig, readline }:

 assert libuuid != null;
@@ -15,7 +15,7 @@ stdenv.mkDerivation  rec {
  # http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346
  patches = [ ./socket.patch ./gcc-47.patch ];

-  buildInputs = [ alsaLib gtk libjack2 libxml2 makeWrapper
+  buildInputs = [ alsaLib gtk2 libjack2 libxml2 makeWrapper
    pkgconfig readline ];
  propagatedBuildInputs = [ libuuid ];

--- a/pkgs/applications/audio/lingot/default.nix
+++ b/pkgs/applications/audio/lingot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, alsaLib, libglade }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk2, alsaLib, libglade }:

 stdenv.mkDerivation {
  name = "lingot-0.9.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {

  hardeningDisable = [ "format" ];

-  buildInputs = [ pkgconfig intltool gtk alsaLib libglade ];
+  buildInputs = [ pkgconfig intltool gtk2 alsaLib libglade ];

  configureFlags = "--disable-jack";

--- a/pkgs/applications/audio/mhwaveedit/default.nix
+++ b/pkgs/applications/audio/mhwaveedit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, SDL , alsaLib, gtk, libjack2, ladspaH
+{ stdenv, fetchurl, makeWrapper, SDL , alsaLib, gtk2, libjack2, ladspaH
 , ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio, lame
 , vorbis-tools }:

@@ -11,7 +11,7 @@ stdenv.mkDerivation  rec {
    sha256 = "010rk4mr631s440q9cfgdxx2avgzysr9aq52diwdlbq9cddifli3";
  };

-  buildInputs = [ SDL alsaLib gtk libjack2 ladspaH libsamplerate libsndfile
+  buildInputs = [ SDL alsaLib gtk2 libjack2 ladspaH libsamplerate libsndfile
     pkgconfig libpulseaudio makeWrapper ];

  configureFlags = "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa";
--- a/pkgs/applications/audio/morituri/default.nix
+++ b/pkgs/applications/audio/morituri/default.nix
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
  };

  pythonPath = with pythonPackages; [
-    pygobject gst_python musicbrainzngs
+    pygobject2 gst_python musicbrainzngs
    pycdio pyxdg setuptools
    CDDB
  ];
--- a/pkgs/applications/audio/mp3info/default.nix
+++ b/pkgs/applications/audio/mp3info/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ncurses, pkgconfig, gtk }:
+{ fetchurl, stdenv, ncurses, pkgconfig, gtk2 }:

 stdenv.mkDerivation rec {
  name = "mp3info-0.8.5a";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04";
  };

-  buildInputs = [ ncurses pkgconfig gtk ];
+  buildInputs = [ ncurses pkgconfig gtk2 ];

  hardeningDisable = [ "format" ];

--- a/pkgs/applications/audio/opusfile/default.nix
+++ b/pkgs/applications/audio/opusfile/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ openssl libogg libopus ];
+  buildInputs = [ openssl libogg ];
+  propagatedBuildInputs = [ libopus ];
+  patches = [ ./include-multistream.patch ];

  meta = {
    description = "High-level API for decoding and seeking in .opus files";
--- a/pkgs/applications/audio/opusfile/include-multistream.patch
+++ b/pkgs/applications/audio/opusfile/include-multistream.patch
@@ -0,0 +1,12 @@
+diff -Naur a/include/opusfile.h b/include/opusfile.h
+--- a/include/opusfile.h	2014-04-29 19:07:09.000000000 +0200
+++ b/include/opusfile.h	2016-09-05 17:50:15.147553798 +0200
+@@ -107,7 +107,7 @@
+ # include <stdarg.h>
+ # include <stdio.h>
+ # include <ogg/ogg.h>
+-# include <opus_multistream.h>
+# include <opus/opus_multistream.h>
+ 
+ /**@cond PRIVATE*/
+ 
--- a/pkgs/applications/audio/paprefs/default.nix
+++ b/pkgs/applications/audio/paprefs/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, libpulseaudio, gtkmm, libglademm
+{ fetchurl, stdenv, pkgconfig, libpulseaudio, gtkmm2, libglademm
 , dbus_glib, GConf, gconfmm, intltool }:

 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
    sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716";
  };

-  buildInputs = [ libpulseaudio gtkmm libglademm dbus_glib gconfmm ];
+  buildInputs = [ libpulseaudio gtkmm2 libglademm dbus_glib gconfmm ];

  nativeBuildInputs = [ pkgconfig intltool ];

--- a/pkgs/applications/audio/patchage/default.nix
+++ b/pkgs/applications/audio/patchage/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm, gtk2
-, gtkmm, libjack2, pkgconfig, python2
+{ stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm
+, gtkmm2, libjack2, pkgconfig, python2
 }:

 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
  };

  buildInputs = [
-    alsaLib boost dbus_glib ganv glibmm gtk2 gtkmm libjack2
+    alsaLib boost dbus_glib ganv glibmm gtkmm2 libjack2
    pkgconfig python2
  ];

--- a/pkgs/applications/audio/petrifoo/default.nix
+++ b/pkgs/applications/audio/petrifoo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, cmake, gtk, libjack2, libgnomecanvas
+{ stdenv, fetchurl, alsaLib, cmake, gtk2, libjack2, libgnomecanvas
 , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2
 , pkgconfig, openssl }:

@@ -12,7 +12,7 @@ stdenv.mkDerivation  rec {
  };

  buildInputs =
-   [ alsaLib cmake  gtk libjack2 libgnomecanvas libpthreadstubs
+   [ alsaLib cmake gtk2 libjack2 libgnomecanvas libpthreadstubs
     libsamplerate libsndfile libtool libxml2 pkgconfig openssl
   ];

--- a/pkgs/applications/audio/praat/default.nix
+++ b/pkgs/applications/audio/praat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, gtk, pkgconfig }:
+{ stdenv, fetchurl, alsaLib, gtk2, pkgconfig }:

 stdenv.mkDerivation rec {
  name = "praat-${version}";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
    cp praat $out/bin
  '';

-  buildInputs = [ alsaLib gtk pkgconfig ];
+  buildInputs = [ alsaLib gtk2 pkgconfig ];

  meta = {
    description = "Doing phonetics by computer";
--- a/pkgs/applications/audio/qtractor/default.nix
+++ b/pkgs/applications/audio/qtractor/default.nix
@@ -1,4 +1,4 @@
-{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, libjack2
+{ alsaLib, autoconf, automake, dssi, fetchurl, gtk2, libjack2
 , ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile
 , libtool, libvorbis, lilv, lv2, pkgconfig, qt4, rubberband, serd
 , sord, sratom, stdenv, suil }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  };

  buildInputs =
-    [ alsaLib autoconf automake dssi gtk libjack2 ladspaH
+    [ alsaLib autoconf automake dssi gtk2 libjack2 ladspaH
      ladspaPlugins liblo libmad libsamplerate libsndfile libtool
      libvorbis lilv lv2 pkgconfig qt4 rubberband serd sord sratom
      suil
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -9,7 +9,7 @@ assert withGstPlugins -> gst_plugins_base != null

 let
  version = "2.6.3";
-  inherit (pythonPackages) buildPythonApplication python mutagen pygtk pygobject dbus-python;
+  inherit (pythonPackages) buildPythonApplication python mutagen pygtk pygobject2 dbus-python;
 in buildPythonApplication {
  # call the package quodlibet and just quodlibet
  name = "quodlibet${stdenv.lib.optionalString withGstPlugins "-with-gst-plugins"}-${version}";
@@ -48,7 +48,7 @@ in buildPythonApplication {
  ];

  propagatedBuildInputs = [
-    mutagen pygtk pygobject dbus-python gst_python intltool
+    mutagen pygtk pygobject2 dbus-python gst_python intltool
  ];

  postInstall = stdenv.lib.optionalString withGstPlugins ''
--- a/pkgs/applications/audio/seq24/default.nix
+++ b/pkgs/applications/audio/seq24/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, gtkmm, libjack2, pkgconfig }:
+{ stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkgconfig }:

 stdenv.mkDerivation  rec {
  name = "seq24-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation  rec {

  patches = [ ./mutex_no_nameclash.patch ];

-  buildInputs = [ alsaLib gtkmm libjack2 ];
+  buildInputs = [ alsaLib gtkmm2 libjack2 ];
  nativeBuildInputs = [ pkgconfig ];

  meta = with stdenv.lib; {
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl, freetype
-, glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf
-, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome }:
+, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng, GConf
+, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome2 }:

 assert stdenv.system == "x86_64-linux";

@@ -22,7 +22,7 @@ let
    GConf
    gdk_pixbuf
    glib
-    gtk
+    gtk2
    libgcrypt
    libpng
    nss
@@ -83,7 +83,7 @@ stdenv.mkDerivation {
      librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir"
      wrapProgram $out/share/spotify/spotify \
        --prefix LD_LIBRARY_PATH : "$librarypath" \
-        --prefix PATH : "${gnome.zenity}/bin"
+        --prefix PATH : "${gnome2.zenity}/bin"

      # Desktop file
      mkdir -p "$out/share/applications/"
--- a/pkgs/applications/audio/squishyball/default.nix
+++ b/pkgs/applications/audio/squishyball/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, autoreconfHook, fetchsvn, flac, libao, libvorbis, ncurses
+, opusfile, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+  name = "squishyball-${rev}";
+  rev = "19580";
+
+  src = fetchsvn {
+    url = "https://svn.xiph.org/trunk/squishyball";
+    rev = rev;
+    sha256 = "013vq52q9z6kpg9iyc2jnb3m2gihcjblvwpg4yj4wy1q2c05pzqp";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  buildInputs = [ flac libao libvorbis ncurses opusfile ];
+
+  patches = [ ./gnu-screen.patch ];
+
+  postInstall = ''
+    # Why doesn’t this happen automagically?
+    mkdir -p $out/share/man/man1
+    cp squishyball.1 $out/share/man/man1
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A tool to perform sample comparison testing on the command line";
+    longDescription = ''
+       squishyball is a simple command-line utility for performing
+       double-blind A/B, A/B/X or X/X/Y testing on the command line.
+       The user specifies two input files to be compared and uses the
+       keyboard during playback to flip between the randomized samples
+       to perform on-the-fly compar‐ isons.  After a predetermined
+       number of trials, squishyball prints the trial results to
+       stdout and exits.  Results (stdout) may be redirected to a file
+       without affecting interactive use of the terminal.
+
+       squishyball can also be used to perform casual, non-randomized
+       comparisons of groups of up to ten samples; this is the default
+       mode of operation.
+    '';
+    homepage = https://svn.xiph.org/trunk/squishyball;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ michalrus ];
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/applications/audio/squishyball/gnu-screen.patch
+++ b/pkgs/applications/audio/squishyball/gnu-screen.patch
@@ -0,0 +1,20 @@
+diff -Naur a/main.c b/main.c
+--- a/main.c	2016-09-06 13:37:32.259895631 +0200
+++ b/main.c	2016-09-07 01:41:51.014309863 +0200
+@@ -693,6 +693,11 @@
+     }
+ 
+     /* set up terminal */
+    if (!strncmp(getenv("TERM"), "screen", 6)) {
+      char term[256];
+      snprintf(term, sizeof(term), "xterm%s", getenv("TERM") + 6);
+      setenv("TERM", term, 1);
+    }
+     atexit(min_panel_remove);
+     panel_init(pcm, test_files, test_mode, start, end>0 ? end : len, len,
+                beep_mode, restart_mode, tests, running_score);
+@@ -1170,4 +1175,3 @@
+     fprintf(stderr,"Done.\n");
+   return 0;
+ }
+-
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, fetchgit, ftgl, freefont_ttf, libjack2, mesa_glu, pkgconfig
-, libltc, libsndfile, libsamplerate, xz
-, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }:
+{ stdenv, fetchurl, pkgconfig, fetchgit
+, libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2
+, mesa_glu, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }:

 stdenv.mkDerivation rec {
  version = "20160619";
@@ -11,15 +11,22 @@ stdenv.mkDerivation rec {
    sha256 = "1ald0c5xbfkdq6g5xwyy8wmbi636m3k3gqrq16kbh46g0kld1as9";
  };

-  buildInputs = [ xz mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig  zita-convolver];
+  buildInputs = [
+    mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate
+    lv2 mesa gtk2 cairo pango fftwFloat pkgconfig  zita-convolver
+  ];

-  makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" "LIBZITACONVOLVER=${zita-convolver}/include/zita-convolver.h" ];
+  makeFlags = [
+    "PREFIX=$(out)"
+    "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf"
+    "LIBZITACONVOLVER=${zita-convolver}/include/zita-convolver.h"
+  ];

-  meta = with stdenv.lib;
-    { description = "Collection of LV2 plugins by Robin Gareus";
-      homepage = https://github.com/x42/x42-plugins;
-      maintainers = with maintainers; [ magnetophon ];
-      license = licenses.gpl2;
-      platforms = platforms.linux;
-    };
+  meta = with stdenv.lib; {
+    description = "Collection of LV2 plugins by Robin Gareus";
+    homepage = https://github.com/x42/x42-plugins;
+    maintainers = with maintainers; [ magnetophon ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
 }
--- a/pkgs/applications/audio/xsynth-dssi/default.nix
+++ b/pkgs/applications/audio/xsynth-dssi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk, libjack2,
+{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk2, libjack2,
 ladspaH, ladspaPlugins, liblo, pkgconfig }:

 stdenv.mkDerivation  rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation  rec {
    sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk";
  };

-  buildInputs = [ alsaLib autoconf automake dssi gtk libjack2 ladspaH
+  buildInputs = [ alsaLib autoconf automake dssi gtk2 libjack2 ladspaH
    ladspaPlugins liblo pkgconfig ];

  installPhase = ''
--- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
@@ -18,6 +18,14 @@ stdenv.mkDerivation rec {
    sha256 = "031iv7zrpv27zsvahvfyrm75zdrh7591db56q89k8cjiiy600r1j";
  };

+  patches = [
+    (fetchurl {
+      name = "lightdm-gtk-greeter-2.0.1-lightdm-1.19.patch";
+      url = "https://588764.bugs.gentoo.org/attachment.cgi?id=442616";
+      sha256 = "0r383kjkvq9yanjc1lk878xc5g8993pjgxylqhhjb5rkpi1mbfsv";
+    })
+  ];
+
  buildInputs = [ pkgconfig lightdm intltool makeWrapper ]
    ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]);

--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -5,15 +5,15 @@
 }:

 let
-  ver_branch = "1.18";
-  version = "1.18.1";
+  ver_branch = "1.19";
+  version = "1.19.4";
 in
 stdenv.mkDerivation rec {
  name = "lightdm-${version}";

  src = fetchurl {
    url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
-    sha256 = "1yl9zhn9l83bj5mbifkxfw15nqgsjzzhqcrgb81fr290wijqaj45";
+    sha256 = "1l105y07wkl9dj0cjhbs8qh6flpkyfj97wkw0rdd3n624lknvbqf";
  };

  patches = [ ./fix-paths.patch ];
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -3,25 +3,32 @@
 , coreutils
 , fetchurl
 , findutils
+, file
 , git
+, glxinfo
 , gnugrep
 , gnutar
 , gzip
 , jdk
+, libpulseaudio
+, libX11
 , libXrandr
 , makeWrapper
+, pciutils
 , pkgsi686Linux
+, setxkbmap
 , stdenv
 , unzip
 , which
 , writeTextFile
+, xkeyboard_config
 , zlib
 }:

 let

-  version = "2.1.2.0";
-  build = "143.2915827";
+  version = "2.1.3.0";
+  build = "143.3101438";

  androidStudio = stdenv.mkDerivation {
    name = "android-studio";
@@ -40,6 +47,12 @@ let
        jdk
        which

+        # For Android emulator
+        file
+        glxinfo
+        pciutils
+        setxkbmap
+
        # Used during setup wizard
        gnutar
        gzip
@@ -47,21 +60,26 @@ let
        # Runtime stuff
        git

-      ]}" --set LD_LIBRARY_PATH "${stdenv.lib.makeLibraryPath [
+      ]}" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
        # Gradle wants libstdc++.so.6
        stdenv.cc.cc.lib
        # mksdcard wants 32 bit libstdc++.so.6
        pkgsi686Linux.stdenv.cc.cc.lib
+
        # aapt wants libz.so.1
        zlib
        pkgsi686Linux.zlib
        # Support multiple monitors
        libXrandr
-      ]}"
+
+        # For Android emulator
+        libpulseaudio
+        libX11
+      ]}" --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb"
    '';
    src = fetchurl {
      url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
-      sha256 = "0q61m8yln77valg7y6lyxlml53z387zh6fyfgc22sm3br5ahbams";
+      sha256 = "1xlz3ibqrm4ckw4lgbkzbxvpgg0y8hips9b54p4d15f34i0r8bvj";
    };
  };

--- a/pkgs/applications/editors/atom/env.nix
+++ b/pkgs/applications/editors/atom/env.nix
@@ -1,11 +1,11 @@
-{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk, atk, pango, freetype, fontconfig
+{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
 , libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
 , gconf, nss, xorg, libcap, systemd, libnotify
 }:

 let
  packages = [
-    stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3
+    stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3
    fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
    xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
    xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
--- a/pkgs/applications/editors/brackets/default.nix
+++ b/pkgs/applications/editors/brackets/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, buildEnv, gtk, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf
+{ stdenv, fetchurl, buildEnv, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf
 , cups, libgcrypt_1_5, systemd, makeWrapper, dbus }:
 let
  bracketsEnv = buildEnv {
    name = "env-brackets";
    paths = [
-      gtk glib gdk_pixbuf stdenv.cc.cc alsaLib nss nspr gconf cups libgcrypt_1_5
+      gtk2 glib gdk_pixbuf stdenv.cc.cc alsaLib nss nspr gconf cups libgcrypt_1_5
      dbus systemd.lib
    ];
  };
--- a/pkgs/applications/editors/codeblocks/default.nix
+++ b/pkgs/applications/editors/codeblocks/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, zip, wxGTK, gtk
+{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, zip, wxGTK, gtk2
 , contribPlugins ? false, hunspell, gamin, boost
 }:

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
    sha256 = "044njhps4cm1ijfdyr5f9wjyd0vblhrz9b4603ma52wcdq25093p";
  };

-  buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk ]
+  buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk2 ]
    ++ optionals contribPlugins [ hunspell gamin boost ];
  enableParallelBuilding = true;
  patches = [ ./writable-projects.patch ];
--- a/pkgs/applications/editors/eclipse/build-eclipse.nix
+++ b/pkgs/applications/editors/eclipse/build-eclipse.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jdk, glib, gtk, libXtst, webkitgtk2, makeWrapper, ... }:
+{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jdk, glib, gtk2, libXtst, webkitgtk2, makeWrapper, ... }:

 { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }:

@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {

    makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
      --prefix PATH : ${jdk}/bin \
-      --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \
+      --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \
      --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"

    # Create desktop item.
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -1,16 +1,16 @@
 { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
 , freetype, fontconfig, libX11, libXext, libXrender, zlib
-, glib, gtk, libXtst, jdk
+, glib, libXtst, jdk
 , webkitgtk2 ? null  # for internal web browser
 , buildEnv, writeText, runCommand
 , callPackage
-} @ args:
+}:

 assert stdenv ? glibc;

 rec {

-  buildEclipse = import ./build-eclipse.nix args;
+  buildEclipse = callPackage ./build-eclipse.nix { };

  eclipse-sdk-35 = buildEclipse {
    name = "eclipse-sdk-3.5.2";
--- a/pkgs/applications/editors/emacs-24/macport-24.5.nix
+++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
    "--enable-mac-app=$$out/Applications"
  ];

-  CFLAGS = "-O3";
+  CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090";
  LDFLAGS = "-O3 -L${ncurses.out}/lib";

  postInstall = ''
--- a/pkgs/applications/editors/emacs-modes/cua/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cua/default.nix
@@ -3,6 +3,6 @@
  builder = ./builder.sh;
  src = fetchurl {
    url = http://tarballs.nixos.org/cua-mode-2.10.el;
-    md5 = "5bf5e43f5f38c8383868c7c6c5baca09";
+    sha256 = "01877xjbq0v9wrpcbnhvppdn9wxliwkkjg3dr6k795mjgslwhr1b";
  };
 }
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -33345,8 +33345,8 @@
          sha256 = "11z3b1xwg6r769w3scd29lqg62fx8mp81g8dbx4klmj3clvyn69i";
        };
        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/50751b5f9843fde00505edd281e404ec1d875713/recipes/inherit-local";
-          sha256 = "0j785xb72nk04x6jb9x5pdwp3dkalqmy208mvj4ss4fm559qfp3i";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local";
+          sha256 = "1v3q3s6qq64k1f4ck6rfgsy1arnf9cxg2kw6d1ahfrwr4ixsqm87";
          name = "inherit-local";
        };
        packageRequires = [ emacs ];
@@ -34414,22 +34414,22 @@
          license = lib.licenses.free;
        };
      }) {};
-    jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, map, melpaBuild, seq, websocket }:
+    jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
    melpaBuild {
        pname = "jade";
-        version = "20160808.129";
+        version = "20160913.816";
        src = fetchFromGitHub {
          owner = "NicolasPetton";
          repo = "jade";
-          rev = "e5204d18a9a9563af2ba5d5f985d6161a906d7d9";
-          sha256 = "0l0q4c98jil0scr4spc3z3rgy4xy4w85zrsas1z8w142arvpiw70";
+          rev = "5d9c5cc88a4601700adba558aab2818591fcf02c";
+          sha256 = "1jfwns1jk0ixpxcf2rk49mr008bnnzq8g591vyd31lb5n10kwyc2";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade";
          sha256 = "04w7pgn0dkppi6l15rkz8b1bcpw1dsgvvijy81a6i4nkigxxlv4y";
          name = "jade";
        };
-        packageRequires = [ company emacs js2-mode map seq websocket ];
+        packageRequires = [ company emacs js2-mode seq websocket ];
        meta = {
          homepage = "https://melpa.org/#/jade";
          license = lib.licenses.free;
@@ -42882,8 +42882,8 @@
          sha256 = "1y5x49mqippngp7ya6y7p8z81anrc644n84wpd7y62yqv8qhz0fp";
        };
        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4de2a8cbf1180ec7ca1648f497538b8dbf7a3945/recipes/nix-buffer";
-          sha256 = "1svx1wg05fajxzjz95dfg072i6nfydr0ir4q1zhdxg1igkffqsml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
+          sha256 = "1fjkf88345v9l2v2mk8a057mw0p0rckf6rjf00y5464dyhh58vcd";
          name = "nix-buffer";
        };
        packageRequires = [ emacs f ];
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -98,9 +98,6 @@ self:
      # upstream issue: missing file header
      initsplit = markBroken super.initsplit;

-      # upstream issue: missing dependency
-      jade = null;
-
      # upstream issue: missing file header
      jsfmt = markBroken super.jsfmt;

--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -16203,6 +16203,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "inherit-local";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "shlevy";
+          repo = "inherit-local";
+          rev = "e687c702adb27ce5f69fb28a47fe21a86cf84063";
+          sha256 = "11z3b1xwg6r769w3scd29lqg62fx8mp81g8dbx4klmj3clvyn69i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local";
+          sha256 = "1v3q3s6qq64k1f4ck6rfgsy1arnf9cxg2kw6d1ahfrwr4ixsqm87";
+          name = "inherit-local";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/inherit-local";
+          license = lib.licenses.free;
+        };
+      }) {};
    init-loader = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "init-loader";
@@ -16662,22 +16683,22 @@
          license = lib.licenses.free;
        };
      }) {};
-    jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, map, melpaBuild, seq, websocket }:
+    jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
    melpaBuild {
        pname = "jade";
-        version = "0.17";
+        version = "0.19";
        src = fetchFromGitHub {
          owner = "NicolasPetton";
          repo = "jade";
-          rev = "11769bf8419202819a25047f57dd9aa0c98f5ebb";
-          sha256 = "09zfvcirz7hcp255yhsf7d04vrc078kk69qhwy1j31ar0rb4fy1b";
+          rev = "94f53bbd8aa8719b3d83ce038f68e74695b86ed4";
+          sha256 = "0c40pg9f9w90fb1gwpl4z5wxhi0ng8j2fr6kf60yhbwg65x92w2k";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade";
          sha256 = "04w7pgn0dkppi6l15rkz8b1bcpw1dsgvvijy81a6i4nkigxxlv4y";
          name = "jade";
        };
-        packageRequires = [ company emacs js2-mode map seq websocket ];
+        packageRequires = [ company emacs js2-mode seq websocket ];
        meta = {
          homepage = "https://melpa.org/#/jade";
          license = lib.licenses.free;
@@ -20413,6 +20434,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nix-buffer";
+        version = "1.2.2";
+        src = fetchFromGitHub {
+          owner = "shlevy";
+          repo = "nix-buffer";
+          rev = "eb28bf99c3562cfda07f312ca49e0b594f0ff81b";
+          sha256 = "148iyy8ma1n5a3biyal5rafxpp0zzn81nyy06jlzrkzjy44iyzwi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
+          sha256 = "1fjkf88345v9l2v2mk8a057mw0p0rckf6rjf00y5464dyhh58vcd";
+          name = "nix-buffer";
+        };
+        packageRequires = [ emacs f ];
+        meta = {
+          homepage = "https://melpa.org/#/nix-buffer";
+          license = lib.licenses.free;
+        };
+      }) {};
    nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "nix-mode";
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
@@ -91,9 +91,6 @@ self:
      # upstream issue: missing file header
      initsplit = markBroken super.initsplit;

-      # upstream issue: missing dependency
-      jade = null;
-
      # upstream issue: missing file header
      jsfmt = markBroken super.jsfmt;

--- a/pkgs/applications/editors/emacs-modes/tramp/default.nix
+++ b/pkgs/applications/editors/emacs-modes/tramp/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, emacs, texinfo }:
+
+stdenv.mkDerivation rec {
+  name = "tramp-2.3.0";
+  src = fetchurl {
+    url = "mirror://gnu/tramp/${name}.tar.gz";
+    sha256 = "1srwm24lwyf00w1661wbx03xg6j943dk05jhwnwdjf99m82cqbgi";
+  };
+  buildInputs = [ emacs texinfo ];
+  meta = {
+    description = "Transparently access remote files from Emacs. Newer versions than built-in.";
+    homepage = https://www.gnu.org/software/tramp;
+    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
--- a/pkgs/applications/editors/geany/with-vte.nix
+++ b/pkgs/applications/editors/geany/with-vte.nix
@@ -1,8 +1,8 @@
-{ runCommand, makeWrapper, geany, gnome }:
+{ runCommand, makeWrapper, geany, gnome2 }:
 let name = builtins.replaceStrings ["geany-"] ["geany-with-vte-"] geany.name;
 in
 runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; } "
   mkdir -p $out
   ln -s ${geany}/share $out
-   makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome.vte}/lib
+   makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome2.vte}/lib
 "
--- a/pkgs/applications/editors/gobby/default.nix
+++ b/pkgs/applications/editors/gobby/default.nix
@@ -1,7 +1,7 @@
 { avahiSupport ? false # build support for Avahi in libinfinity
 , gnomeSupport ? false # build support for Gnome(gnome-vfs)
 , stdenv, fetchurl, pkgconfig
-, gtkmm, gsasl, gtksourceview, libxmlxx, libinfinity, intltool
+, gtkmm2, gsasl, gtksourceview, libxmlxx, libinfinity, intltool
 , gnome_vfs ? null}:

 let
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
    sha256 = "165x0r668ma5blziisvbr8qig3jw9hf7i6w8r7wwvz3wsac3bswc";
  };

-  buildInputs = [ pkgconfig gtkmm gsasl gtksourceview libxmlxx libinf intltool ]
+  buildInputs = [ pkgconfig gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ]
    ++ stdenv.lib.optional gnomeSupport gnome_vfs;
  
  configureFlags = ''
--- a/pkgs/applications/editors/leafpad/default.nix
+++ b/pkgs/applications/editors/leafpad/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk }:
+{ stdenv, fetchurl, intltool, pkgconfig, gtk2 }:

 stdenv.mkDerivation rec {
  version = "0.8.18.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm";
  };

-  buildInputs = [ intltool pkgconfig gtk ];
+  buildInputs = [ intltool pkgconfig gtk2 ];

  hardeningDisable = [ "format" ];

--- a/pkgs/applications/editors/lighttable/default.nix
+++ b/pkgs/applications/editors/lighttable/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, buildEnv, zlib, glib, alsaLib, makeDesktopItem
-, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
+, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
 , cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify
 }:

 let
  libPath = stdenv.lib.makeLibraryPath [
-      stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss
+      stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 nss
      fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf
      xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
      xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchgit, fetchNuGet
 , autoconf, automake, pkgconfig, shared_mime_info, intltool
-, glib, mono, gtk-sharp, gnome, gnome-sharp, unzip
+, glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip
 , dotnetPackages
 }:

@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {

  buildInputs = [
    autoconf automake pkgconfig shared_mime_info intltool
-    mono gtk-sharp gnome-sharp unzip
+    mono gtk-sharp-2_0 gnome-sharp unzip
    pkgconfig
    dotnetPackages.NUnit
    dotnetPackages.NUnitRunners
@@ -57,9 +57,9 @@ stdenv.mkDerivation rec {
    for prog in monodevelop mdtool; do
    patch -p 0 $out/bin/$prog <<EOF
    2a3,5
-    > export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp}:\$MONO_GAC_PREFIX
+    > export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp-2_0}:\$MONO_GAC_PREFIX
    > export PATH=${mono}/bin:\$PATH
-    > export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ glib gnome.libgnomeui gnome.gnome_vfs gnome-sharp gtk-sharp gtk-sharp.gtk ]}:\$LD_LIBRARY_PATH
+    > export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ glib gnome2.libgnomeui gnome2.gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk ]}:\$LD_LIBRARY_PATH
    > 
    EOF
    done
--- a/pkgs/applications/editors/scite/default.nix
+++ b/pkgs/applications/editors/scite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk }:
+{ stdenv, fetchurl, pkgconfig, gtk2 }:

 let
  version = "3.3.7";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
    sha256 = "0x7i6yxq50frsjkrp3lc5zy0d1ssq2n91igjn0dmqajpg7kls2dd";
  };

-  buildInputs = [ pkgconfig gtk ];
+  buildInputs = [ pkgconfig gtk2 ];
  sourceRoot = "scintilla/gtk";

  buildPhase = ''
--- a/pkgs/applications/editors/sublime/default.nix
+++ b/pkgs/applications/editors/sublime/default.nix
@@ -1,6 +1,6 @@
-{ fetchurl, stdenv, glib, xorg, cairo, gtk, makeDesktopItem }:
+{ fetchurl, stdenv, glib, xorg, cairo, gtk2, makeDesktopItem }:
 let
-  libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo];
+  libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo];
 in
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";

--- a/pkgs/applications/editors/sublime3/default.nix
+++ b/pkgs/applications/editors/sublime3/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, glib, xorg, cairo, gtk, pango, makeWrapper, openssl, bzip2,
+{ fetchurl, stdenv, glib, xorg, cairo, gtk2, pango, makeWrapper, openssl, bzip2,
  pkexecPath ? "/var/setuid-wrappers/pkexec", libredirect,
  gksuSupport ? false, gksu}:

@@ -7,7 +7,7 @@ assert gksuSupport -> gksu != null;

 let
  build = "3114";
-  libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo pango];
+  libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo pango];
  redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]
    ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo";
 in let
--- a/pkgs/applications/editors/supertux-editor/default.nix
+++ b/pkgs/applications/editors/supertux-editor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, mono, gtk-sharp, pkgconfig, makeWrapper, gnome, gtk }:
+{ stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkgconfig, makeWrapper, gnome2, gtk2 }:
 stdenv.mkDerivation rec {
  version = "git-2014-08-20";
  name = "supertux-editor-${version}";
@@ -10,19 +10,19 @@ stdenv.mkDerivation rec {
    sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx";
  };

-  buildInputs = [mono gtk-sharp pkgconfig makeWrapper gnome.libglade gtk ];
+  buildInputs = [mono gtk-sharp-2_0 pkgconfig makeWrapper gnome2.libglade gtk2 ];

  installPhase = ''
    mkdir -p $out/bin $out/lib/supertux-editor
    cp *.{dll,dll.config,exe} $out/lib/supertux-editor
    makeWrapper "${mono}/bin/mono" $out/bin/supertux-editor \
      --add-flags "$out/lib/supertux-editor/supertux-editor.exe" \
-      --prefix MONO_GAC_PREFIX : ${gtk-sharp} \
+      --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \
      --suffix LD_LIBRARY_PATH : $(echo $NIX_LDFLAGS | sed 's/ -L/:/g;s/ -rpath /:/g;s/-rpath //')

    makeWrapper "${mono}/bin/mono" $out/bin/supertux-editor-debug \
      --add-flags "--debug $out/lib/supertux-editor/supertux-editor.exe" \
-      --prefix MONO_GAC_PREFIX : ${gtk-sharp} \
+      --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \
      --suffix LD_LIBRARY_PATH : $(echo $NIX_LDFLAGS | sed 's/ -L/:/g;s/ -rpath /:/g;s/-rpath //')
  '';

--- a/pkgs/applications/editors/textadept/default.nix
+++ b/pkgs/applications/editors/textadept/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchhg, fetchurl, fetchzip, gtk, glib, pkgconfig, unzip, ncurses, zip }:
+{ stdenv, fetchhg, fetchurl, fetchzip, gtk2, glib, pkgconfig, unzip, ncurses, zip }:
 let
  # Textadept requires a whole bunch of external dependencies.
  # The build system expects to be able to download them with wget.
@@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
  name = "textadept-${version}";

  buildInputs = [
-    gtk glib pkgconfig unzip ncurses zip
+    gtk2 glib pkgconfig unzip ncurses zip
  ];

  src = fetchhg {
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -1,7 +1,7 @@
 # TODO tidy up eg The patchelf code is patching gvim even if you don't build it..
 # but I have gvim with python support now :) - Marc
 args@{pkgs, source ? "default", fetchurl, fetchFromGitHub, stdenv, ncurses, pkgconfig, gettext
-, composableDerivation, lib, config, glib, gtk, python, perl, tcl, ruby
+, composableDerivation, lib, config, glib, gtk2, python, perl, tcl, ruby
 , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
 , libICE

@@ -79,7 +79,7 @@ composableDerivation {
      = [ "--enable-gui=${args.gui}" "--with-features=${args.features}" ];

    nativeBuildInputs
-      = [ ncurses pkgconfig gtk libX11 libXext libSM libXpm libXt libXaw libXau
+      = [ ncurses pkgconfig gtk2 libX11 libXext libSM libXpm libXt libXaw libXau
          libXmu glib libICE ];

    # most interpreters aren't tested yet.. (see python for example how to do it)
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -10,13 +10,13 @@

 stdenv.mkDerivation rec {
  name = "vim-${version}";
-  version = "7.4.1585";
+  version = "8.0.0005";

  src = fetchFromGitHub {
    owner = "vim";
    repo = "vim";
    rev = "v${version}";
-    sha256 = "1kjdwpka269i4cyl0rmnmzg23dl26g65k26h32w8ayzfm3kbj123";
+    sha256 = "0ys3l3dr43vjad1f096ch1sl3x2ajsqkd03rdn6n812m7j4wipx0";
  };

  enableParallelBuilding = true;
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -1,17 +1,22 @@
 { stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem }:

 let
-  version = "1.4.0";
-  rev = "6276dcb0ae497766056b4c09ea75be1d76a8b679";
+  version = "1.5.1";
+  rev = "07d663dc1bd848161edf4cd4ce30cce410d3d877";

-  sha256 = if stdenv.system == "i686-linux"    then "1k228kv1v2765qnz6zw41h79fddwx5pcy9v9jyhsrwyla83fx4ar"
-      else if stdenv.system == "x86_64-linux"  then "1v0am0xpgnlwb3k35v7wxlv22035444ii3v5gv6hf1xbnybsa7lm"
-      else if stdenv.system == "x86_64-darwin" then "0395wnq8wi9x382l51wf8wiaclx7bjf5p0j39gq8y6j2ww8y2z7n"
+  sha256 = if stdenv.system == "i686-linux"    then "1a2854snjdmfhzx6qwib4iw3qjhlmlf09dlsbbvh24zbrjphnd85"
+      else if stdenv.system == "x86_64-linux"  then "0gg2ad7sp02ffv7la61hh9h4vfw8qkfladbhwlh5y4axbbrx17r7"
+      else if stdenv.system == "x86_64-darwin" then "18q4ldnmm619vv8yx6rznpznpcc19zjczmcidr34552i5qfg5xsz"
      else throw "Unsupported system: ${stdenv.system}";

-  urlMod = if stdenv.system == "i686-linux" then "linux-ia32"
-      else if stdenv.system == "x86_64-linux" then "linux-x64"
-      else if stdenv.system == "x86_64-darwin" then "darwin"
+  urlBase = "https://az764295.vo.msecnd.net/stable/${rev}/";
+
+  urlStr = if stdenv.system == "i686-linux" then
+        urlBase + "code-stable-code_${version}-1473369468_i386.tar.gz"
+      else if stdenv.system == "x86_64-linux" then
+        urlBase + "code-stable-code_${version}-1473370243_amd64.tar.gz"
+      else if stdenv.system == "x86_64-darwin" then
+        urlBase + "VSCode-darwin-stable.zip"
      else throw "Unsupported system: ${stdenv.system}";
 in
  stdenv.mkDerivation rec {
@@ -19,7 +24,7 @@ in
    inherit version;

    src = fetchurl {
-      url = "https://az764295.vo.msecnd.net/stable/${rev}/VSCode-${urlMod}-stable.zip";
+      url = urlStr;
      inherit sha256;
    };

@@ -33,7 +38,9 @@ in
      categories = "GNOME;GTK;Utility;TextEditor;Development;";
    };

-    buildInputs = [ unzip ];
+    buildInputs = if stdenv.system == "x86_64-darwin"
+      then [ unzip ]
+      else [ ];

    installPhase = ''
      mkdir -p $out/lib/vscode $out/bin
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
 , qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper
-, qjson, qca2, txt2tags
+, qjson, qca2, txt2tags, openssl
 , withGrass ? false, grass
 }:

 stdenv.mkDerivation rec {
  name = "qgis-2.16.2";

-  buildInputs = [ gdal qt4 flex bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
+  buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
    fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++
    (stdenv.lib.optional withGrass grass) ++
-    (with pythonPackages; [ numpy psycopg2 requests2 ]) ++ [ pythonPackages.qscintilla ];
+    (with pythonPackages; [ numpy psycopg2 requests2 pythonPackages.qscintilla sip ]);

  nativeBuildInputs = [ cmake makeWrapper ];

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
  # To handle the lack of 'local' RPATH; required, as they call one of
  # their built binaries requiring their libs, in the build process.
  preBuild = ''
-    export LD_LIBRARY_PATH=`pwd`/output/lib:$LD_LIBRARY_PATH
+    export LD_LIBRARY_PATH=`pwd`/output/lib:${stdenv.lib.makeLibraryPath [ openssl ]}:$LD_LIBRARY_PATH
  '';

  src = fetchurl {
@@ -32,7 +32,8 @@ stdenv.mkDerivation rec {

  postInstall = ''
    wrapProgram $out/bin/qgis \
-      --prefix PYTHONPATH : $PYTHONPATH
+      --prefix PYTHONPATH : $PYTHONPATH \
+      --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl ]}
  '';

  meta = {
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -1,5 +1,5 @@
 { stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, 
-  gtkmm, glibmm, libxml2, libsecret, curl, unrar, libzip, 
+  gtkmm2, glibmm, libxml2, libsecret, curl, unrar, libzip,
  librsvg, gst_all_1, autoreconfHook, makeWrapper }:
 stdenv.mkDerivation {
  name = "ahoviewer-1.4.6";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
  };
  enableParallelBuilding = true; 
  nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ];
-  buildInputs = [ glibmm libconfig gtkmm glibmm libxml2 
+  buildInputs = [ glibmm libconfig gtkmm2 glibmm libxml2
                  libsecret curl unrar libzip librsvg 
                  gst_all_1.gstreamer
                  gst_all_1.gst-plugins-good 
--- a/pkgs/applications/graphics/batik/default.nix
+++ b/pkgs/applications/graphics/batik/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
  builder = ./builder.sh;
  src = fetchurl {
    url = http://tarballs.nixos.org/batik-1.6.zip;
-    md5 = "edff288fc64f968ff96ca49763d50f3c";
+    sha256 = "0cf15dspmzcnfda8w5lbsdx28m4v2rpq1dv5zx0r0n99ihqd1sh6";
  };

  buildInputs = [unzip];
--- a/pkgs/applications/graphics/cinepaint/default.nix
+++ b/pkgs/applications/graphics/cinepaint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, gtk, freetype, fontconfig, lcms,
+{ stdenv, fetchurl, cmake, pkgconfig, gtk2, freetype, fontconfig, lcms,
  flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11,
  perlXMLParser, python, pygtk, gettext, intltool, babl, gegl,
  glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr,
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
    sha256 = "0b5g4bkq62yiz1cnb2vfij0a8fw5w5z202v5dm4dh89k7cj0yq4w";
  };

-  buildInputs = [ libpng gtk freetype fontconfig lcms flex libtiff libjpeg
+  buildInputs = [ libpng gtk2 freetype fontconfig lcms flex libtiff libjpeg
    libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl
    gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa
    libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext
+{stdenv, fetchurl, gtk2, pkgconfig, perl, perlXMLParser, libxml2, gettext
 , python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl
 , withGNOME ? false, libgnomeui }:

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  };

  buildInputs =
-    [ gtk perlXMLParser libxml2 gettext python libxml2Python docbook5
+    [ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5
      libxslt docbook_xsl libart_lgpl
    ] ++ stdenv.lib.optional withGNOME libgnomeui;

--- a/pkgs/applications/graphics/gcolor2/default.nix
+++ b/pkgs/applications/graphics/gcolor2/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gtk, perl, perlXMLParser, pkgconfig } :
+{stdenv, fetchurl, gtk2, perl, perlXMLParser, pkgconfig } :

 let version = "0.4"; in
 stdenv.mkDerivation {
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
        [ ./gcolor2-amd64.patch ] else
        [ ];

-buildInputs = [ gtk perl perlXMLParser pkgconfig ];
+buildInputs = [ gtk2 perl perlXMLParser pkgconfig ];

  meta = {
    description = "Simple GTK+2 color selector";
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk, libpng, exiv2
+{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk2, libpng, exiv2
 , lcms, intltool, gettext, fbida
 }:

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
  configureFlags = [ "--enable-gps" ];

  buildInputs = [
-    pkgconfig autoconf automake gtk libpng exiv2 lcms intltool gettext
+    pkgconfig autoconf automake gtk2 libpng exiv2 lcms intltool gettext
  ];

  postInstall = ''
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf
+{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf
 , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff
 , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper
 , python, pygtk, libart_lgpl, libexif, gettext, xorg, wrapPython }:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
  };

  buildInputs =
-    [ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo
+    [ pkgconfig intltool babl gegl gtk2 glib gdk_pixbuf pango cairo
      freetype fontconfig lcms libpng libjpeg poppler libtiff webkit
      libmng librsvg libwmf zlib libzip ghostscript aalib jasper
      python pygtk libart_lgpl libexif gettext xorg.libXpm
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
  '';

-  passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ?
+  passthru = { gtk = gtk2; }; # probably its a good idea to use the same gtk in plugins ?

  #configureFlags = [ "--disable-print" ];

--- a/pkgs/applications/graphics/giv/default.nix
+++ b/pkgs/applications/graphics/giv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk, glib,
+{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib,
  pcre, cfitsio, perl, gob2, vala_0_23, libtiff, json_glib }:

 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {

  installPhase = "scons install";

-  buildInputs = [ gdk_pixbuf pkgconfig gtk glib scons pcre cfitsio perl gob2 vala_0_23 libtiff
+  buildInputs = [ gdk_pixbuf pkgconfig gtk2 glib scons pcre cfitsio perl gob2 vala_0_23 libtiff
    json_glib ];

  meta = {
--- a/pkgs/applications/graphics/gqview/default.nix
+++ b/pkgs/applications/graphics/gqview/default.nix
@@ -1,9 +1,9 @@
-{stdenv, fetchurl, pkgconfig, gtk, libpng}:
+{stdenv, fetchurl, pkgconfig, gtk2, libpng}:

-assert pkgconfig != null && gtk != null && libpng != null;
+assert pkgconfig != null && gtk2 != null && libpng != null;
 # Note that we cannot just copy gtk's png attribute, since gtk might
 # not be linked against png.
-# !!! assert libpng == gtk.libpng;
+# !!! assert libpng == gtk2.libpng;

 stdenv.mkDerivation {
  name = "gqview-2.1.5";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
    sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj";
  };

-  buildInputs = [pkgconfig gtk libpng];
+  buildInputs = [pkgconfig gtk2 libpng];

  hardeningDisable = [ "format" ];

--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, gtk, libXft
-, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm
+{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, libXft
+, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
 , gsl, python, numpy, pyxml, lxml, poppler, imagemagick, libwpg, librevenge
 , libvisio, libcdr, libexif, unzip, automake114x, autoconf
@@ -49,8 +49,8 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    pkgconfig perl perlXMLParser gtk libXft libpng zlib popt boehmgc
-    libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext
+    pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc
+    libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
    makeWrapper intltool gsl poppler imagemagick libwpg librevenge
    libvisio libcdr libexif automake114x autoconf
  ] ++ stdenv.lib.optional boxMakerPlugin unzip;
--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/pkgs/applications/graphics/k3d/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, unzip, ftgl, glew, asciidoc
 , cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
 , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff
-, gettext, intltool, perl, gtkmm, glibmm, gtkglext, pangox_compat, libXmu }:
+, gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }:

 stdenv.mkDerivation rec {
  version = "0.8.0.5";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng
     boost boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff
     gettext intltool perl unzip ftgl glew asciidoc
-     gtkmm glibmm gtkglext pangox_compat libXmu
+     gtkmm2 glibmm gtkglext pangox_compat libXmu
    ];

  #doCheck = false;
--- a/pkgs/applications/graphics/mypaint/default.nix
+++ b/pkgs/applications/graphics/mypaint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext, glib, gtk, hicolor_icon_theme, json_c
+{ stdenv, fetchurl, gettext, glib, gtk2, hicolor_icon_theme, json_c
 , lcms2, libpng , makeWrapper, pkgconfig, pygtk, python, pythonPackages
 , scons, swig
 }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  };

  buildInputs = [
-    gettext glib gtk json_c lcms2 libpng makeWrapper pkgconfig pygtk
+    gettext glib gtk2 json_c lcms2 libpng makeWrapper pkgconfig pygtk
    python scons swig
  ];

--- a/pkgs/applications/graphics/pqiv/default.nix
+++ b/pkgs/applications/graphics/pqiv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, getopt, which, pkgconfig, gtk } :
+{ stdenv, fetchurl, getopt, which, pkgconfig, gtk2 } :

 stdenv.mkDerivation (rec {
  name = "pqiv-0.12";
@@ -8,7 +8,7 @@ stdenv.mkDerivation (rec {
    sha256 = "646c69f2f4e7289913f6b8e8ae984befba9debf0d2b4cc8af9955504a1fccf1e";
  };

-  buildInputs = [ getopt which pkgconfig gtk ];
+  buildInputs = [ getopt which pkgconfig gtk2 ];

  preConfigure=''
    substituteInPlace configure --replace /bin/bash "$shell"
--- a/pkgs/applications/graphics/qiv/default.nix
+++ b/pkgs/applications/graphics/qiv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk, imlib2, file, lcms2, libexif } :
+{ stdenv, fetchurl, pkgconfig, gtk2, imlib2, file, lcms2, libexif } :

 stdenv.mkDerivation (rec {
  version = "2.3.1";
@@ -9,7 +9,7 @@ stdenv.mkDerivation (rec {
    sha256 = "1rlf5h67vhj7n1y7jqkm9k115nfnzpwngj3kzqsi2lg676srclv7";
  };

-  buildInputs = [ pkgconfig gtk imlib2 file lcms2 libexif ];
+  buildInputs = [ pkgconfig gtk2 imlib2 file lcms2 libexif ];

  preBuild=''
    substituteInPlace Makefile --replace /usr/local "$out"
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau
-, libXdmcp, lcms2, libiptcdata, libcanberra, fftw, expat, pcre, libsigcxx 
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm2, libXau
+, libXdmcp, lcms2, libiptcdata, libcanberra_gtk2, fftw, expat, pcre, libsigcxx
 , mercurial  # Not really needed for anything, but it fails if it does not find 'hg'
 }:

@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
    sha256 = "1v4px239vlmk9l8wbzlvlyni4ns12icxmgfz21m86jkd10pj5dgr";
  };
  
-  buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp
-    lcms2 libiptcdata mercurial libcanberra fftw expat pcre libsigcxx ];
+  buildInputs = [ pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp
+    lcms2 libiptcdata mercurial libcanberra_gtk2 fftw expat pcre libsigcxx ];

  patchPhase = ''
    patch -p1 < ${./sigc++_fix.patch}
--- a/pkgs/applications/graphics/sane/frontends.nix
+++ b/pkgs/applications/graphics/sane/frontends.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, sane-backends, libX11, gtk, pkgconfig, libusb ? null}:
+{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null}:

 stdenv.mkDerivation rec {
  name = "sane-frontends-1.0.14";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
    sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c
  '';

-  buildInputs = [sane-backends libX11 gtk pkgconfig] ++
+  buildInputs = [sane-backends libX11 gtk2 pkgconfig] ++
 	(if libusb != null then [libusb] else []);

  meta = {
--- a/pkgs/applications/graphics/sane/xsane.nix
+++ b/pkgs/applications/graphics/sane/xsane.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk, pkgconfig, libpng
+{ stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng
 , libusb ? null
 , gimpSupport ? false, gimp_2_8 ? null
 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
    chmod a+rX -R .
  '';

-  buildInputs = [libpng sane-backends sane-frontends libX11 gtk pkgconfig ]
+  buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 pkgconfig ]
    ++ (if libusb != null then [libusb] else [])
    ++ stdenv.lib.optional gimpSupport gimp_2_8;

--- a/pkgs/applications/graphics/ufraw/default.nix
+++ b/pkgs/applications/graphics/ufraw/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, gtk, gettext, bzip2, zlib
+{ fetchurl, stdenv, pkgconfig, gtk2, gettext, bzip2, zlib
 , libjpeg, libtiff, cfitsio, exiv2, lcms2, gtkimageview, lensfun }:

 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
  };

  buildInputs =
-    [ pkgconfig gtk gtkimageview gettext bzip2 zlib
+    [ pkgconfig gtk2 gtkimageview gettext bzip2 zlib
      libjpeg libtiff cfitsio exiv2 lcms2 lensfun
    ];

--- a/pkgs/applications/graphics/xara/default.nix
+++ b/pkgs/applications/graphics/xara/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, automake, gettext, freetype, libxml2, pango, pkgconfig
-, wxGTK, gtk, perl, zip}:
+, wxGTK, gtk2, perl, zip}:

 stdenv.mkDerivation {
  name = "xaralx-0.7r1785";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
  };

  nativeBuildInputs = [ automake pkgconfig gettext perl zip ];
-  buildInputs = [ wxGTK gtk libxml2 freetype pango ];
+  buildInputs = [ wxGTK gtk2 libxml2 freetype pango ];

  configureFlags = "--disable-svnversion";

--- a/pkgs/applications/graphics/xournal/default.nix
+++ b/pkgs/applications/graphics/xournal/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, ghostscript, atk, gtk, glib, fontconfig, freetype
+, ghostscript, atk, gtk2, glib, fontconfig, freetype
 , libgnomecanvas, libgnomeprint, libgnomeprintui
 , pango, libX11, xproto, zlib, poppler
 , autoconf, automake, libtool, pkgconfig}:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
  };

  buildInputs = [
-    ghostscript atk gtk glib fontconfig freetype
+    ghostscript atk gtk2 glib fontconfig freetype
    libgnomecanvas libgnomeprint libgnomeprintui
    pango libX11 xproto zlib poppler
  ];
--- a/pkgs/applications/graphics/xzgv/default.nix
+++ b/pkgs/applications/graphics/xzgv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk, pkgconfig, texinfo }:
+{ stdenv, fetchurl, gtk2, pkgconfig, texinfo }:

 stdenv.mkDerivation rec {
  name = "xzgv-${version}";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
    url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz";
    sha256 = "1rh432wnvzs434knzbda0fslhfx0gngryrrnqkfm6gwd2g5mxcph";
  };
-  buildInputs = [ gtk pkgconfig texinfo ];
+  buildInputs = [ gtk2 pkgconfig texinfo ];
  patches = [ ./fix-linker-paths.patch ];
  postPatch = ''
    substituteInPlace config.mk \
--- a/pkgs/applications/misc/adobe-reader/default.nix
+++ b/pkgs/applications/misc/adobe-reader/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk, glib
+{ stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib
 , gdk_pixbuf }:

 assert stdenv.system == "i686-linux";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
  # versions.

  libPath = stdenv.lib.makeLibraryPath
-    [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk glib gdk_pixbuf ];
+    [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk_pixbuf ];

  passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux";

--- a/pkgs/applications/misc/artha/default.nix
+++ b/pkgs/applications/misc/artha/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dbus_glib, gtk, pkgconfig, wordnet }:
+{ stdenv, fetchurl, dbus_glib, gtk2, pkgconfig, wordnet }:

 stdenv.mkDerivation rec {
  name = "artha-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
    sha256 = "0qr4ihl7ma3cq82xi1fpzvf74mm9vsg0j035xvmcp3r6rmw2fycx";
  };

-  buildInputs = [ dbus_glib gtk pkgconfig wordnet ];
+  buildInputs = [ dbus_glib gtk2 pkgconfig wordnet ];

  meta = with stdenv.lib; {
    description = "An offline thesaurus based on WordNet";
--- a/pkgs/applications/misc/avrdudess/default.nix
+++ b/pkgs/applications/misc/avrdudess/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, mono, avrgcclibc, avrdude, gtk, xdg_utils }:
+{ stdenv, fetchurl, unzip, mono, avrgcclibc, avrdude, gtk2, xdg_utils }:

 stdenv.mkDerivation rec {
  name = "avrdudess-2.2.20140102";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {

    cat >> "$out/bin/avrdudess" << __EOF__
    #!${stdenv.shell}
-    export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk mono]}"
+    export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}"
    # We need PATH from user env for xdg-open to find its tools, which
    # typically depend on the currently running desktop environment.
    export PATH="${stdenv.lib.makeBinPath [ avrgcclibc avrdude xdg_utils ]}:\$PATH"
--- a/pkgs/applications/misc/batti/default.nix
+++ b/pkgs/applications/misc/batti/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , pkgconfig, gettext, pythonPackages
-, gtk, gdk_pixbuf, upower
+, gtk2, gdk_pixbuf, upower
 , makeWrapper }:

 let
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
  };

  buildInputs = with stdenv.lib;
-  [ pkgconfig gettext python gtk pygtk dbus-python gdk_pixbuf upower makeWrapper ];
+  [ pkgconfig gettext python gtk2 pygtk dbus-python gdk_pixbuf upower makeWrapper ];

  configurePhase = "true";

--- a/pkgs/applications/misc/cheat/default.nix
+++ b/pkgs/applications/misc/cheat/default.nix
@@ -0,0 +1,20 @@
+{ python3Packages, fetchurl, lib }:
+
+python3Packages.buildPythonApplication rec {
+  version = "2.1.26";
+  name = "cheat-${version}";
+
+  propagatedBuildInputs = with python3Packages; [ docopt pygments ];
+
+  src = fetchurl {
+    url = "mirror://pypi/c/cheat/${name}.tar.gz";
+    sha256 = "0yilm9ba6ll9wzh20gj3lg9mnc50q95m6sqmjp2vcghwgipdixpm";
+  };
+
+  meta = {
+    description = "cheat allows you to create and view interactive cheatsheets on the command-line";
+    maintainers = with lib.maintainers; [ mic92 ];
+    license = with lib.licenses; [gpl3 mit];
+    homepage = "https://github.com/chrisallenlane/cheat";
+  };
+}
--- a/pkgs/applications/misc/clipit/default.nix
+++ b/pkgs/applications/misc/clipit/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, intltool, pkgconfig, gtk, xdotool }:
+{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool }:

 stdenv.mkDerivation rec {
  name = "clipit-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
    sha256 = "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva";
  };

-  buildInputs = [ intltool pkgconfig gtk xdotool  ];
+  buildInputs = [ intltool pkgconfig gtk2 xdotool  ];

  meta = with stdenv.lib; {
    description = "Lightweight GTK+ Clipboard Manager";
--- a/pkgs/applications/misc/d4x/default.nix
+++ b/pkgs/applications/misc/d4x/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk, glib, pkgconfig, openssl, boost }:
+{ stdenv, fetchurl, gtk2, glib, pkgconfig, openssl, boost }:

 stdenv.mkDerivation {
  name = "d4x-2.5.7.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
    sha256 = "1i1jj02bxynisqapv31481sz9jpfp3f023ky47spz1v1wlwbs13m";
  };

-  buildInputs = [ gtk glib pkgconfig openssl boost ];
+  buildInputs = [ gtk2 glib pkgconfig openssl boost ];

  meta = {
    description = "Graphical download manager";
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, perl, libX11, libjpeg, libpng, libtiff, pkgconfig,
-librsvg, glib, gtk, libXext, libXxf86vm, poppler, xineLib }:
+librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib }:

 stdenv.mkDerivation rec {
  name = "eaglemode-0.86.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  };

  buildInputs = [ perl libX11 libjpeg libpng libtiff pkgconfig
-    librsvg glib gtk libXxf86vm libXext poppler xineLib ];
+    librsvg glib gtk2 libXxf86vm libXext poppler xineLib ];

  # The program tries to dlopen both Xxf86vm and Xext, so we use the
  # trick on NIX_LDFLAGS and dontPatchELF to make it find them.
--- a/pkgs/applications/misc/epdfview/default.nix
+++ b/pkgs/applications/misc/epdfview/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk, poppler }:
+{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, poppler }:

 stdenv.mkDerivation rec {
  name = "epdfview-0.1.8";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    sha256 = "1w7qybh8ssl4dffi5qfajq8mndw7ipsd92vkim03nywxgjp4i1ll";
  };

-  buildInputs = [ pkgconfig gtk poppler ];
+  buildInputs = [ pkgconfig gtk2 poppler ];

  hardeningDisable = [ "format" ];

--- a/pkgs/applications/misc/evilvte/default.nix
+++ b/pkgs/applications/misc/evilvte/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, makeWrapper, pkgconfig,
-  gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg,
+  gnome2, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg,
  configH
 }:

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
  };

  buildInputs = [
-    gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xorg.libX11
+    gnome2.vte glib pango gnome2.gtk cairo gdk_pixbuf atk freetype xorg.libX11
    xorg.xproto xorg.kbproto xorg.libXext xorg.xextproto makeWrapper pkgconfig
  ];

--- a/pkgs/applications/misc/fme/default.nix
+++ b/pkgs/applications/misc/fme/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, autoconf, automake, gettext
-, fluxbox, bc, gtkmm, glibmm, libglademm, libsigcxx }:
+, fluxbox, bc, gtkmm2, glibmm, libglademm, libsigcxx }:

 stdenv.mkDerivation rec{

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec{
    sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d";
  };

-  buildInputs = [ pkgconfig autoconf automake gettext fluxbox bc gtkmm glibmm libglademm libsigcxx ];
+  buildInputs = [ pkgconfig autoconf automake gettext fluxbox bc gtkmm2 glibmm libglademm libsigcxx ];

  preConfigure = ''
    ./autogen.sh
--- a/Show More
+++ b/Show More