From 33c6a9d1e79470a98fe5cebf9bf288165d653d16 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 8 Mar 2016 00:50:53 +0100
Subject: wine: add optional dependencies

---
 pkgs/misc/emulators/wine/base.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 0398ed57a702..4d4e897ba9d2 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -22,10 +22,16 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   buildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [
     freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses
     alsaLib libxml2 libxslt lcms2 gettext dbus mpg123 openal
+
+    libva libpcap saneBackends libv4l libgphoto2 gtk3 gsm openldap
+    opencl-headers opencl-icd gnome.glib cairo libtiff unixODBC
+    
+    ## for libnetapi
+    samba3_light
   ])
   ++ lib.optional pulseaudioSupport pkgs.libpulseaudio
   ++ (with pkgs.xorg; [
-    libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite libXext
+    libX11  libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite libXext
   ]));
 
   # Wine locates a lot of libraries dynamically through dlopen().  Add
-- 
cgit 1.4.1


From 4416644eb32fe0572846a0f9b55b402cb5ba0ddb Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Mon, 25 Apr 2016 03:48:19 +0200
Subject: wine-unstable: 1.9.7 -> 1.9.9

---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 9ad09ed5dfe1..4b28b103da1a 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -30,9 +30,9 @@ in rec {
   };
 
   unstable = fetchurl rec {
-    version = "1.9.7";
+    version = "1.9.9";
     url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
-    sha256 = "1v47i0pxqcixnh06x23kzp2dbz1cf3d2sric0bw6xqh54ph5yw29";
+    sha256 = "0hbvvb7b5sbfrpcp3rqzs57a0d9h37kn5k9hx62y63rdhkcnzrx1";
     inherit (stable) mono;
     gecko32 = fetchurl rec {
       version = "2.44";
@@ -48,7 +48,7 @@ in rec {
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "1h5hwd07qyx0qw5whf6lcp7v57kqd6mrrcvwwg1bydir68b0zp16";
+    sha256 = "1hmdl7gaiqjc22pw77ra237bnlpg1gxndlvlqf6nd9av6rlkvafj";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";
-- 
cgit 1.4.1


From 0f3ff1401dfd0c15fe69cadf8e8d523a58330b48 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 10 May 2016 20:41:25 +0200
Subject: wine-staging: move libtxc_dxtn to buildInputs

this adds it to RPATH, via LDFLAGS (see base.nix)
---
 pkgs/misc/emulators/wine/staging.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix
index 9419aff1a39c..51af13b8a157 100644
--- a/pkgs/misc/emulators/wine/staging.nix
+++ b/pkgs/misc/emulators/wine/staging.nix
@@ -8,8 +8,7 @@ let patch = (callPackage ./sources.nix {}).staging;
 in assert (builtins.parseDrvName wineUnstable.name).version == patch.version;
 
 stdenv.lib.overrideDerivation wineUnstable (self: {
-  nativeBuildInputs = build-inputs [ libtxc_dxtn_Name ] self.nativeBuildInputs; 
-  buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs;
+  buildInputs = build-inputs [ "perl" "utillinux" "autoconf" libtxc_dxtn_Name ] self.buildInputs;
 
   name = "${self.name}-staging";
 
-- 
cgit 1.4.1


From edb5a8c63228971be54bae3b2ab066e738db75db Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 26 May 2016 14:29:25 +0200
Subject: wine: 1.9.9 -> 1.9.10

---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 4b28b103da1a..0021fbb46dd6 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -30,9 +30,9 @@ in rec {
   };
 
   unstable = fetchurl rec {
-    version = "1.9.9";
+    version = "1.9.10";
     url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
-    sha256 = "0hbvvb7b5sbfrpcp3rqzs57a0d9h37kn5k9hx62y63rdhkcnzrx1";
+    sha256 = "1gqvhqq8a7h4s2ll5y54x65w51bdv8izw4k17qy9fb2lyvgh0jcd";
     inherit (stable) mono;
     gecko32 = fetchurl rec {
       version = "2.44";
@@ -48,7 +48,7 @@ in rec {
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "1hmdl7gaiqjc22pw77ra237bnlpg1gxndlvlqf6nd9av6rlkvafj";
+    sha256 = "0lk171mk8iar7vhgv7af90975dqa4vrj5p3729bvp6r6fs3pqxkh";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";
-- 
cgit 1.4.1


From 98d720d72c51099044597c30ad096a5a8390d27e Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 26 May 2016 14:31:00 +0200
Subject: wine: 1.8.1 -> 1.8.2

---
 pkgs/misc/emulators/wine/sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 0021fbb46dd6..bb726941a4b1 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -6,9 +6,9 @@ let fetchurl = args@{url, sha256, ...}:
 in rec {
 
   stable = fetchurl rec {
-    version = "1.8.1";
+    version = "1.8.2";
     url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
-    sha256 = "15ya496qq24ipqii7ij8x8h5x8n21vgqa4h6binb74w5mzdd76hl";
+    sha256 = "0vsswlnaa9ndg1pais63c39xks519r9fhz0yq3q8fphly2nlyqji";
 
     ## see http://wiki.winehq.org/Gecko
     gecko32 = fetchurl rec {
-- 
cgit 1.4.1


From 1c215828d5c811a523fbc599e7c38d96b586d9e8 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sun, 29 May 2016 10:43:47 +0200
Subject: wine: make features configurable

---
 pkgs/misc/emulators/wine/base.nix     | 51 ++++++++++++++++++++++++-----------
 pkgs/misc/emulators/wine/default.nix  | 40 +++++++++++++++++++++++++--
 pkgs/misc/emulators/wine/packages.nix | 10 +++----
 pkgs/top-level/all-packages.nix       | 48 +++++++++++++++++++++++++++++++--
 4 files changed, 125 insertions(+), 24 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 4d4e897ba9d2..f5b64f1517f6 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, pkgArches,
   name, version, src, monos, geckos, platforms,
   pkgconfig, fontforge, makeWrapper, flex, bison,
-  pulseaudioSupport,
+  supportFlags,
   buildScript ? null, configureFlags ? ""
 }:
 
@@ -19,20 +19,41 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
     pkgconfig fontforge makeWrapper flex bison
   ];
 
-  buildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [
-    freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses
-    alsaLib libxml2 libxslt lcms2 gettext dbus mpg123 openal
-
-    libva libpcap saneBackends libv4l libgphoto2 gtk3 gsm openldap
-    opencl-headers opencl-icd gnome.glib cairo libtiff unixODBC
-    
-    ## for libnetapi
-    samba3_light
-  ])
-  ++ lib.optional pulseaudioSupport pkgs.libpulseaudio
+  buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs:
+  [ pkgs.freetype ]
+  ++ lib.optional pngSupport             pkgs.libpng
+  ++ lib.optional jpegSupport            pkgs.libjpeg
+  ++ lib.optional cupsSupport            pkgs.cups
+  ++ lib.optional colorManagementSupport pkgs.lcms2
+  ++ lib.optional gettextSupport         pkgs.gettext
+  ++ lib.optional dbusSupport            pkgs.dbus
+  ++ lib.optional mpg123Support          pkgs.mpg123
+  ++ lib.optional openalSupport          pkgs.openal
+  ++ lib.optional cairoSupport           pkgs.cairo
+  ++ lib.optional tiffSupport            pkgs.libtiff
+  ++ lib.optional odbcSupport            pkgs.unixODBC
+  ++ lib.optional netapiSupport          pkgs.samba3_light
+  ++ lib.optional cursesSupport          pkgs.ncurses
+  ++ lib.optional vaSupport              pkgs.libva
+  ++ lib.optional pcapSupport            pkgs.libpcap
+  ++ lib.optional v4lSupport             pkgs.libv4l
+  ++ lib.optional saneSupport            pkgs.saneBackends
+  ++ lib.optional gsmSupport             pkgs.gsm
+  ++ lib.optional gphoto2Support         pkgs.libgphoto2
+  ++ lib.optional ldapSupport            pkgs.openldap
+  ++ lib.optional fontconfigSupport      pkgs.fontconfig
+  ++ lib.optional alsaSupport            pkgs.alsaLib
+  ++ lib.optional pulseaudioSupport      pkgs.libpulseaudio
+  ++ lib.optional xineramaSupport        pkgs.xorg.libXinerama
+  ++ lib.optional gstreamerSupport       pkgs.gst_plugins_base
+  ++ lib.optionals gtkSupport    [ pkgs.gtk3 pkgs.gnome.glib ]
+  ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.opencl-icd ]
+  ++ lib.optionals xmlSupport    [ pkgs.libxml2 pkgs.libxslt ]
+  ++ lib.optionals tlsSupport    [ pkgs.openssl pkgs.gnutls ]
+  ++ lib.optionals openglSupport [ pkgs.mesa pkgs.mesa_noglu.osmesa pkgs.libdrm ]
   ++ (with pkgs.xorg; [
-    libX11  libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite libXext
-  ]));
+    libX11  libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext
+  ])));
 
   # Wine locates a lot of libraries dynamically through dlopen().  Add
   # them to the RPATH so that the user doesn't have to set them in
@@ -40,7 +61,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   NIX_LDFLAGS = map (path: "-rpath " + path) (
       map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] ++ buildInputs)
       # libpulsecommon.so is linked but not found otherwise
-      ++ lib.optionals pulseaudioSupport (map (x: "${lib.getLib x}/lib/pulseaudio")
+      ++ lib.optionals supportFlags.pulseaudioSupport (map (x: "${lib.getLib x}/lib/pulseaudio")
           (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ])))
     );
 
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index a402fba69f67..deeff3c73437 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -9,13 +9,49 @@
 { lib, pkgs, system, callPackage,
   wineRelease ? "stable",
   wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"),
+  libtxc_dxtn_Name ? "libtxc_dxtn_s2tc",
+  pngSupport ? false,
+  jpegSupport ? false,
+  tiffSupport ? false,
+  gettextSupport ? false,
+  fontconfigSupport ? false,
+  alsaSupport ? false,
+  gtkSupport ? false,
+  openglSupport ? false,
+  tlsSupport ? false,
+  gstreamerSupport ? false,
+  cupsSupport ? false,
+  colorManagementSupport ? false,
+  dbusSupport ? false,
+  mpg123Support ? false,
+  openalSupport ? false,
+  openclSupport ? false,
+  cairoSupport ? false,
+  odbcSupport ? false,
+  netapiSupport ? false,
+  cursesSupport ? false,
+  vaSupport ? false,
+  pcapSupport ? false,
+  v4lSupport ? false,
+  saneSupport ? false,
+  gsmSupport ? false,
+  gphoto2Support ? false,
+  ldapSupport ? false,
   pulseaudioSupport ? false,
-  libtxc_dxtn_Name ? "libtxc_dxtn_s2tc" }:
+  xineramaSupport ? false,
+  xmlSupport ? false }:
 
 let wine-build = build: release:
       lib.getAttr build (callPackage ./packages.nix {
         wineRelease = release;
-        inherit pulseaudioSupport;
+        supportFlags = {
+          inherit pngSupport jpegSupport cupsSupport colorManagementSupport gettextSupport
+                  dbusSupport mpg123Support openalSupport cairoSupport tiffSupport odbcSupport
+                  netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport
+                  gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport
+                  pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport
+                  openglSupport gstreamerSupport;
+        };
       });
 
 in if wineRelease == "staging" then
diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix
index 206deb01b8bb..6c06bcb0949b 100644
--- a/pkgs/misc/emulators/wine/packages.nix
+++ b/pkgs/misc/emulators/wine/packages.nix
@@ -1,14 +1,14 @@
 { system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, callPackage_i686,
   overrideCC, wrapCCMulti, gcc49,
-  pulseaudioSupport,
-  wineRelease ? "stable"
+  wineRelease ? "stable",
+  supportFlags
 }:
 
 let src = lib.getAttr wineRelease (callPackage ./sources.nix {});
 in with src; {
   wine32 = callPackage_i686 ./base.nix {
     name = "wine-${version}";
-    inherit src version pulseaudioSupport;
+    inherit src version supportFlags;
     pkgArches = [ pkgsi686Linux ];
     geckos = [ gecko32 ];
     monos =  [ mono ];
@@ -16,7 +16,7 @@ in with src; {
   };
   wine64 = callPackage ./base.nix {
     name = "wine64-${version}";
-    inherit src version pulseaudioSupport;
+    inherit src version supportFlags;
     # FIXME: drop this when GCC is updated to >5.3.
     # Corresponding bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69140
     stdenv = overrideCC stdenv gcc49;
@@ -28,7 +28,7 @@ in with src; {
   };
   wineWow = callPackage ./base.nix {
     name = "wine-wow-${version}";
-    inherit src version pulseaudioSupport;
+    inherit src version supportFlags;
     # FIXME: see above.
     stdenv = overrideCC stdenv_32bit (wrapCCMulti gcc49);
     pkgArches = [ pkgs pkgsi686Linux ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc714d2f2039..01a65e76ffed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16819,8 +16819,52 @@ in
     wineRelease = config.wine.release or "stable";
     wineBuild = config.wine.build or "wine32";
     pulseaudioSupport = config.pulseaudio or stdenv.isLinux;
-  };
-  wineStable = wine.override { wineRelease = "stable"; };
+    pngSupport = true;
+    jpegSupport = true;
+    tiffSupport = true;
+    gettextSupport = true;
+    fontconfigSupport = true;
+    alsaSupport = true;
+    openglSupport = true;
+    tlsSupport = true;
+    cursesSupport = true;
+  };
+  wineMinimal = lowPrio (self.wine.override {
+    pulseaudioSupport = false;
+    pngSupport = false;
+    jpegSupport = false;
+    tiffSupport = false;
+    gettextSupport = false;
+    fontconfigSupport = false;
+    alsaSupport = false;
+    openglSupport = false;
+    tlsSupport = false;
+    cursesSupport = false;
+  });
+  wineFull = lowPrio (self.wine.override {
+    gtkSupport = true;
+    gstreamerSupport = true;
+    cupsSupport = true;
+    colorManagementSupport = true;
+    dbusSupport = true;
+    mpg123Support = true;
+    openalSupport = true;
+    openclSupport = true;
+    cairoSupport = true;
+    odbcSupport = true;
+    netapiSupport = true;
+    vaSupport = true;
+    pcapSupport = true;
+    v4lSupport = true;
+    saneSupport = true;
+    gsmSupport = true;
+    gphoto2Support = true;
+    ldapSupport = true;
+    pulseaudioSupport = true;
+    xineramaSupport = true;
+    xmlSupport = true;
+  });
+  wineStable = self.wine.override { wineRelease = "stable"; };
   wineUnstable = lowPrio (self.wine.override { wineRelease = "unstable"; });
   wineStaging = lowPrio (self.wine.override { wineRelease = "staging"; });
 
-- 
cgit 1.4.1


From 8c0f03ae9dacf0dcdcdacdc13069634614c47d14 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Mon, 30 May 2016 03:54:02 +0200
Subject: wine: 1.9.10 -> 1.9.11

---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index bb726941a4b1..0c4690bffef8 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -30,9 +30,9 @@ in rec {
   };
 
   unstable = fetchurl rec {
-    version = "1.9.10";
+    version = "1.9.11";
     url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
-    sha256 = "1gqvhqq8a7h4s2ll5y54x65w51bdv8izw4k17qy9fb2lyvgh0jcd";
+    sha256 = "15mbrnx4zqsdsxz7rwkb1pp58bcyfqnm8f2fh7cbbdgwh117k3vj";
     inherit (stable) mono;
     gecko32 = fetchurl rec {
       version = "2.44";
@@ -48,7 +48,7 @@ in rec {
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "0lk171mk8iar7vhgv7af90975dqa4vrj5p3729bvp6r6fs3pqxkh";
+    sha256 = "0q990d26wsik16w1yya2z8nwxnhnaiiy85igdnan1ib2b00z861m";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";
-- 
cgit 1.4.1


From fe1f3b70bcbaf83af7be16620350a280c740ff8e Mon Sep 17 00:00:00 2001
From: yawnt <me@yawnt.com>
Date: Mon, 30 May 2016 11:42:10 +0200
Subject: postscript-lexmark: add package

---
 pkgs/misc/drivers/postscript-lexmark/default.nix | 37 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix                  |  8 +++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/misc/drivers/postscript-lexmark/default.nix

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/misc/drivers/postscript-lexmark/default.nix
new file mode 100644
index 000000000000..5b8f88218ff1
--- /dev/null
+++ b/pkgs/misc/drivers/postscript-lexmark/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, lib, fetchurl, rpmextract }:
+let
+  version = "20160218";
+in
+stdenv.mkDerivation {
+  name = "postscript-lexmark-${version}";
+
+  src = fetchurl {
+    url = "http://www.openprinting.org/download/printdriver/components/lsb3.2/main/RPMS/noarch/openprinting-ppds-postscript-lexmark-${version}-1lsb3.2.noarch.rpm";
+    sha256 = "0wbhvypdr96a5ddg6kj41dn9sbl49n7pfi2vs762ij82hm2gvwcm";
+  };
+
+  nativeBuildInputs = [ rpmextract ];
+
+  phases = [ "unpackPhase" "installPhase"];
+
+  sourceRoot = ".";
+
+  unpackPhase = ''
+    rpmextract $src
+    for ppd in opt/OpenPrinting-Lexmark/ppds/Lexmark/*; do
+      gzip -d $ppd
+    done
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/cups/model/postscript-lexmark
+    cp opt/OpenPrinting-Lexmark/ppds/Lexmark/*.ppd $out/share/cups/model/postscript-lexmark/
+    cp -r opt/OpenPrinting-Lexmark/doc $out/doc
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.openprinting.org/driver/Postscript-Lexmark/";
+    description = "Lexmark Postscript Drivers";
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 29f1b0c529ae..cba89bac5aa1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2989,6 +2989,8 @@ in
 
   popfile = callPackage ../tools/text/popfile { };
 
+  postscript-lexmark = callPackage ../misc/drivers/postscript-lexmark { };
+
   povray = callPackage ../tools/graphics/povray {
     automake = automake113x; # fails with 14
   };
@@ -4488,7 +4490,7 @@ in
   inherit (self.haskellPackages) ghc;
 
   cabal-install = haskell.lib.disableSharedExecutables haskellPackages.cabal-install;
-   
+
   stack = haskell.lib.overrideCabal haskellPackages.stack (drv: {
     enableSharedExecutables = false;
     isLibrary = false;
@@ -10824,7 +10826,7 @@ in
     batman_adv = callPackage ../os-specific/linux/batman-adv {};
 
     bcc = callPackage ../os-specific/linux/bcc { };
-    
+
     bbswitch = callPackage ../os-specific/linux/bbswitch {};
 
     ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { };
@@ -15947,7 +15949,7 @@ in
 
   openspecfun = callPackage ../development/libraries/science/math/openspecfun {};
 
-  magma = callPackage ../development/libraries/science/math/magma { };  
+  magma = callPackage ../development/libraries/science/math/magma { };
 
   mathematica = callPackage ../applications/science/math/mathematica { };
   mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { };
-- 
cgit 1.4.1


From 46d3001fa70f86ae69aa95ae7688d6c1348d5ddf Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 10 Jun 2016 14:51:19 +0200
Subject: xscreensaver: use gle

---
 pkgs/misc/screensavers/xscreensaver/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index 6942d642fb1b..fd0f2d93581d 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11
 , libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk
-, libxml2, libglade, intltool, xorg, makeWrapper
+, libxml2, libglade, intltool, xorg, makeWrapper, gle
 }:
 
 stdenv.mkDerivation rec {
@@ -15,15 +15,11 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam
       libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender
-      libXxf86misc intltool xorg.appres makeWrapper
+      libXxf86misc intltool xorg.appres makeWrapper gle
     ];
 
   preConfigure =
     ''
-      # Fix build error in version 5.18. Remove this patch when updating
-      # to a later version.
-      #sed -i -e '/AF_LINK/d' hacks/glx/sonar-icmp.c
-
       # Fix installation paths for GTK resources.
       sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
           -i driver/Makefile.in po/Makefile.in.in
@@ -33,7 +29,7 @@ stdenv.mkDerivation rec {
     [ "--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts"
       "--with-dpms-ext" "--with-randr-ext" "--with-xinerama-ext"
       "--with-xf86vmode-ext" "--with-xf86gamma-ext" "--with-randr-ext"
-      "--with-xshm-ext" "--with-xdbe-ext" "--without-readdisplay"
+      "--with-xshm-ext" "--with-xdbe-ext"
       "--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults"
     ];
 
-- 
cgit 1.4.1


From da021cdda1f019f9a75982f44bd8c9b748ae947d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 10 Jun 2016 17:51:18 +0200
Subject: xscreensaver: an option to install all the hacks, including retired
 ones and DNA logo

---
 pkgs/misc/screensavers/xscreensaver/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index fd0f2d93581d..3540119e6656 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11
 , libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk
 , libxml2, libglade, intltool, xorg, makeWrapper, gle
+, forceInstallAllHacks ? false
 }:
 
 stdenv.mkDerivation rec {
@@ -36,7 +37,14 @@ stdenv.mkDerivation rec {
   postInstall = ''
       wrapProgram $out/bin/xscreensaver-text \
         --prefix PATH : ${stdenv.lib.makeBinPath [xorg.appres]}
-  '';
+  ''
+  + stdenv.lib.optionalString forceInstallAllHacks ''
+    make -C hacks/glx dnalogo
+    cat hacks/Makefile.in | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1  | xargs make -C hacks
+    cat hacks/glx/Makefile.in | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1  | xargs make -C hacks/glx
+    cp -f $(find hacks -type f -perm -111 "!" -name "*.*" )  "$out/libexec/xscreensaver"
+  ''
+  ;
 
   meta = {
     homepage = "http://www.jwz.org/xscreensaver/";
-- 
cgit 1.4.1


From 9ddc8a1a5a2556dd411ea281df293c003c4d89fe Mon Sep 17 00:00:00 2001
From: José Romildo Malaquias <malaquias@gmail.com>
Date: Fri, 10 Jun 2016 20:49:58 -0300
Subject: arc-gtk-theme-git: 2016-06-02 -> 2016-06-06

---
 pkgs/misc/themes/arc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix
index b14746cfec50..025ef0913bea 100644
--- a/pkgs/misc/themes/arc/default.nix
+++ b/pkgs/misc/themes/arc/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
-  version = "2016-06-02";
+  version = "2016-06-06";
   name = "arc-gtk-theme-${version}";
 
   src = fetchFromGitHub {
     owner = "horst3180";
     repo = "arc-theme";
-    rev = "226098a06b646981022f0e260fd4d3ca64ff5616";
-    sha256 = "1lg2iig1rws2h0p7qy1pavphyzdcchmfdlv126696jczz21d67qm";
+    rev = "d24a7b5b4eb25e1a094bdf4e125332cfb8e2c8c1";
+    sha256 = "07rf21xhyz3if4n5ccmzmjf9rz9w7wkvci7ccivhh6lkillfbxgi";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
cgit 1.4.1


From d49e0ff79f84aac0518edfe249b29e6b8144da63 Mon Sep 17 00:00:00 2001
From: Erik Rybakken <erik.rybakken@math.ntnu.no>
Date: Sat, 11 Jun 2016 23:10:24 +0200
Subject: vimPlugins: add localvimrc

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 98a8a4ddf249..1ac2e82b4b0c 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -638,6 +638,17 @@ rec {
     dependencies = [];
 
   };
+  
+  vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-localvimrc-2016-06-06";
+    src = fetchgit {
+      url = "git://github.com/embear/vim-localvimrc";
+      rev = "f104384cd9127b5a75ed889b551fd7f46faeb74a";
+      sha256 = "0k1ava8nhshkm7llhmagpsmvgwy8xcc0mn3chdk6hz8gzz9755py";
+    };
+    dependencies = [];
+
+  };
 
   tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "tslime-vim-2015-08-14";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index cdb411051aa4..1771a618e143 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -32,6 +32,7 @@
 "github:ctrlpvim/ctrlp.vim"
 "github:digitaltoad/vim-jade"
 "github:eagletmt/neco-ghc"
+"github:embear/vim-localvimrc"
 "github:enomsg/vim-haskellConcealPlus"
 "github:esneider/YUNOcommit.vim"
 "github:fatih/vim-go"
-- 
cgit 1.4.1


From e37bb985a33e684bdff3c494b4effbfc7c86fda7 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 26 May 2016 19:24:26 -0500
Subject: retroarch: 2015-11-20 -> 1.3.4

also: remove nvidia-cg-toolkit as input for retroarch.
see #15707

darwin is also building but you have to trick it into
thinking it's a desktop app for the GUI to load

platforms is set to "platforms.all".
---
 pkgs/misc/emulators/retroarch/default.nix | 39 +++++++++++++++++++------------
 1 file changed, 24 insertions(+), 15 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index 0ab4698c196e..ac8e1e46112f 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -1,6 +1,12 @@
-{ stdenv, fetchgit, makeDesktopItem, pkgconfig, ffmpeg, mesa, nvidia_cg_toolkit
-, freetype, libxml2, libv4l, coreutils, python34, which, udev, alsaLib
-, libX11, libXext, libXxf86vm, libXdmcp, SDL, libpulseaudio ? null }:
+{ stdenv, fetchFromGitHub, makeDesktopItem, coreutils, which, pkgconfig
+, ffmpeg, mesa, freetype, libxml2, python34
+, enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null
+, alsaLib ? null, libv4l ? null
+, udev ? null, libX11 ? null, libXext ? null, libXxf86vm ? null
+, libXdmcp ? null, SDL ? null, libpulseaudio ? null
+}:
+
+with stdenv.lib;
 
 let
   desktopItem = makeDesktopItem {
@@ -9,25 +15,28 @@ let
     icon = "retroarch";
     comment = "Multi-Engine Platform";
     desktopName = "RetroArch";
-    genericName = "Libretro Frontend";    
+    genericName = "Libretro Frontend";
     categories = "Game;Emulator;";
     #keywords = "multi;engine;emulator;xmb;";
   };
-  
 in
 
 stdenv.mkDerivation rec {
   name = "retroarch-bare-${version}";
-  version = "2015-11-20";
+  version = "1.3.4";
 
-  src = fetchgit {
-    url = https://github.com/libretro/RetroArch.git;
-    rev = "09dda14549fc13231311fd522a07a75e923889aa";
-    sha256 = "0yrisl61iaa70ahswzgb505bvm5cxq8ndnv2bw7gqrlm5qrh54qy";
+  src = fetchFromGitHub {
+    owner = "libretro";
+    repo = "RetroArch";
+    sha256 = "0ccp17580w0884baxj5kcynlm03jgd7i62dprz1ajxbi2s7b3mi3";
+    rev = "v${version}";
   };
 
-  buildInputs = [ pkgconfig ffmpeg mesa nvidia_cg_toolkit freetype libxml2 libv4l coreutils
-                  python34 which udev alsaLib libX11 libXext libXxf86vm libXdmcp SDL libpulseaudio ];
+  buildInputs = [ pkgconfig ffmpeg mesa freetype libxml2 coreutils python34 which SDL ]
+                ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit
+                ++ optionals stdenv.isLinux [ udev alsaLib libX11 libXext libXxf86vm libXdmcp libv4l libpulseaudio ];
+
+  configureScript = "sh configure";
 
   patchPhase = ''
     export GLOBAL_CONFIG_DIR=$out/etc
@@ -44,11 +53,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = http://libretro.org/;
     description = "Multi-platform emulator frontend for libretro cores";
     license = licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with maintainers; [ MP2E edwtjo ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ MP2E edwtjo matthewbauer ];
   };
 }
-- 
cgit 1.4.1


From 0bd6b9ce98b82fad81571dd6204f28009d9f1207 Mon Sep 17 00:00:00 2001
From: José Romildo Malaquias <malaquias@gmail.com>
Date: Sun, 12 Jun 2016 16:59:05 -0300
Subject: paper-gtk-theme: 2016-05-25 -> 2016-05-27

Closes #16194.
---
 pkgs/misc/themes/paper-gtk-theme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/themes/paper-gtk-theme/default.nix b/pkgs/misc/themes/paper-gtk-theme/default.nix
index ff778b86f9c2..5dfb54fa493c 100644
--- a/pkgs/misc/themes/paper-gtk-theme/default.nix
+++ b/pkgs/misc/themes/paper-gtk-theme/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }:
 
 stdenv.mkDerivation rec {
-  version = "2016-05-25";
+  version = "2016-05-27";
   name = "paper-gtk-theme-${version}";
 
   src = fetchFromGitHub {
     owner = "snwh";
     repo = "paper-gtk-theme";
-    rev = "dea5f97b12e4f41dddbd01a1529760761aa3784e";
-    sha256 = "0fln555827hrn554qcil3rwl9x4x3vdfbh2vplkc8r46a3bn8yng";
+    rev = "06fb8b41743dd99410c08a9beabc323e6631d009";
+    sha256 = "1gffjsgs43rvxs8ryd5c3yfrp3a69d5wvjmiixwwp1qn1fr46dni";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-- 
cgit 1.4.1


From ce50ba74dc614ad21ceaa6c6e941eb80efd7902f Mon Sep 17 00:00:00 2001
From: José Romildo Malaquias <malaquias@gmail.com>
Date: Sun, 12 Jun 2016 16:36:41 -0300
Subject: numix-gtk-theme: 2016-05-25 -> 2016-06-12

Closes #16188.
---
 pkgs/misc/themes/numix-gtk-theme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/themes/numix-gtk-theme/default.nix b/pkgs/misc/themes/numix-gtk-theme/default.nix
index 4a37a16d5509..b8dac2540090 100644
--- a/pkgs/misc/themes/numix-gtk-theme/default.nix
+++ b/pkgs/misc/themes/numix-gtk-theme/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2016-05-25";
+  version = "2016-06-12";
   name = "numix-gtk-theme-${version}";
 
   src = fetchFromGitHub {
     repo = "numix-gtk-theme";
     owner = "numixproject";
-    rev = "e99d167adf1310e110e17f8e7c2baf217c2402aa";
-    sha256 = "1418hf034b2bp32wqagbnn5y3i21h8v2ihjqakq2gaqd5fwg0f9g";
+    rev = "1d941a15971f43fb2f5675c7059bf313b78797fc";
+    sha256 = "14b1gl761acdza4bkqr6dvsblvi2wsph79j5jircxfd3wgvm756i";
   };
 
   nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ];
-- 
cgit 1.4.1


From 06027595fcf802f2b8a8fc5bf29111d1ffac5c48 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Wed, 15 Jun 2016 00:03:59 +0300
Subject: vimPlugins: update 2016-06-15

---
 pkgs/misc/vim-plugins/default.nix | 324 +++++++++++++++++++-------------------
 1 file changed, 162 insertions(+), 162 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 1ac2e82b4b0c..f6f6f68d89a0 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -173,11 +173,11 @@ rec {
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2016-05-23";
+    name = "Syntastic-2016-06-12";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "95879f19a9f8a72282717e07d0d4e006d8561580";
-      sha256 = "19wr3bll9n7y3rh26r4aklk682jqxrh5j8c9wkpg6m9v60yqj053";
+      rev = "d6b96c079be137c83009827b543a83aa113cc011";
+      sha256 = "1hb1vs0sqzpjbh4l2q1rfhh4mxvhn08pin3glba26p37639w9qqc";
     };
     dependencies = [];
 
@@ -206,22 +206,22 @@ rec {
   };
 
   The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_Commenter-2016-05-24";
+    name = "The_NERD_Commenter-2016-06-10";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdcommenter";
-      rev = "2b3714bff67ca57cb9e416bd737a24f71181859b";
-      sha256 = "1va0d4vxk53lgy2cs1hgxcha6fsc6c2y6m7jwmzfpj2gdha2v52y";
+      rev = "e2d47bec2662d5fcd324d17e22dc37f38c97bf2d";
+      sha256 = "099i7jksdp4c4m7imv96xji4lbjscdns37fsr2qgn7zw5pjgjbw4";
     };
     dependencies = [];
 
   };
 
   The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2016-05-11";
+    name = "The_NERD_tree-2016-06-10";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
-      rev = "15445be5fb2559829ac7a1f05af5d713586e8ec9";
-      sha256 = "1x85k2h2qm1z67ywg0867w483w1rb7zmq9r2rkjj2kkk5wi6hfvq";
+      rev = "d280b15ba9388ab93f3401b26877a13fdb8ed816";
+      sha256 = "19mlvmlg1lccr2kkigbggv3jfl0bdc5r6lpa2jds1j20gxp9zhwi";
     };
     dependencies = [];
 
@@ -343,44 +343,44 @@ rec {
   };
 
   vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-autoformat-2016-05-23";
+    name = "vim-autoformat-2016-06-10";
     src = fetchgit {
       url = "git://github.com/Chiel92/vim-autoformat";
-      rev = "0dcc7b318939dab7c34c4aa31ce93678800034c6";
-      sha256 = "1ahrpjnkyqslmiii8c81mayl299imd1jmgjplh0g575bipy4f7sa";
+      rev = "9742ae2dfb46b26b9aed39491afe3d3ecb5eafd0";
+      sha256 = "0lagj6977vbjvzk01sf43hhmj1jh7d2sa478igjmkw8j3gwvxcmq";
     };
     dependencies = [];
 
   };
 
   vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-nix-2015-12-10";
+    name = "vim-nix-2016-05-31";
     src = fetchgit {
       url = "git://github.com/LnL7/vim-nix";
-      rev = "f0b7bd4bce5ed0f12fb4d26115c84fb3edcd1e12";
-      sha256 = "0x12a191xafn7918xa8r4sjiw79005lcr0yv5kjc4p1izwddfgdv";
+      rev = "9ac8876e5beb824018b9a09d4640f7efc2fbc8ae";
+      sha256 = "0whdf56c63vp4c3b2jfl1x5c0dxxrzwvxkfm5951qzpfy6xwg27x";
     };
     dependencies = [];
 
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2016-05-24";
+    name = "deoplete-nvim-2016-06-11";
     src = fetchgit {
       url = "git://github.com/Shougo/deoplete.nvim";
-      rev = "b254ca56f768b72b3ba136ccd81abd919523036a";
-      sha256 = "1dg5ids354f5c9ixfy9b6526yhr9w9968g0rghm0w8mlvgbx6bj8";
+      rev = "eac8020ef6f740df9109fa557b46a488f98103f1";
+      sha256 = "0fsg9mr23qsqhvzjmj626nd873zqwyxzvr5b1i97l0g6zwq3q8i8";
     };
     dependencies = [];
 
   };
 
   Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Spacegray-vim-2016-05-21";
+    name = "Spacegray-vim-2016-06-04";
     src = fetchgit {
       url = "git://github.com/ajh17/Spacegray.vim";
-      rev = "82551620059b055d7ed866cf7af3e8b6f1b891a4";
-      sha256 = "0xprszpva3via83zbs3x74jbc9zfrnxryilqvgpnrircgxm9cbx7";
+      rev = "adb621e3d1df5f55d60383717bbae4533fda9c62";
+      sha256 = "15n92rllri11ckdy1dykllx7xpgscvhfqa55z5sl66zicnrv89c9";
     };
     dependencies = [];
 
@@ -398,22 +398,22 @@ rec {
   };
 
   vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-css-color-2016-04-14";
+    name = "vim-css-color-2016-06-12";
     src = fetchgit {
       url = "git://github.com/ap/vim-css-color";
-      rev = "4421dbac36bedcdd4fc345fd95785cfed518847c";
-      sha256 = "0z4d9q7irid4wianh94wqc2nr8hx54pci0p87ibhkbi7ibpl1qmp";
+      rev = "ba98bd138ee15dbf6b6dc3b7080c0e65e0657c76";
+      sha256 = "0l76yqd3cvdm41dx720skbphwqsza51xaf7vi8jlknsqnrb6z1kf";
     };
     dependencies = [];
 
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2016-05-22";
+    name = "neomake-2016-06-08";
     src = fetchgit {
       url = "git://github.com/benekastah/neomake";
-      rev = "b33d77d4b0543e9444ca5e79daa5109bbab4a31c";
-      sha256 = "00r7fpsd4cc3f69jar7v39ffj0xndlvgbkmlmhlcfgk1h1bzic5h";
+      rev = "0de96a8a906d254ee3b5e6cd1e9838f1c1cc59c5";
+      sha256 = "1adq47ra0vf5kak7m65gyaxi1jkbdi7647bb73785j3sx5q41v0f";
     };
     dependencies = [];
 
@@ -431,33 +431,33 @@ rec {
   };
 
   vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-tmux-navigator-2016-05-09";
+    name = "vim-tmux-navigator-2016-06-03";
     src = fetchgit {
       url = "git://github.com/christoomey/vim-tmux-navigator";
-      rev = "e13914d89e9413cfa449f0c3daff18691356f2d1";
-      sha256 = "1hs61lgkf4bsy8891zqklh9jfzkwmm7r0lmr228k5wn97778bc83";
+      rev = "57701ac650990010ea97b1b4d64779d0b60c769b";
+      sha256 = "0kl9as63h8bfkmqhq9myma6z7xvp30hiqcnxham4cvd6vhph3b7j";
     };
     dependencies = [];
 
   };
 
   spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "spacevim-2016-05-23";
+    name = "spacevim-2016-06-08";
     src = fetchgit {
       url = "git://github.com/ctjhoa/spacevim";
-      rev = "c6d1cae4a72c957279707256f6c91a390f83aa9c";
-      sha256 = "1ipm8csk6a7wcpqi1c9nmhb3jfm7ikfrw207yp1b9vklsznnqm53";
+      rev = "c8811a397249508432199786abbbd41429b6c90b";
+      sha256 = "0a41pjc6qd378y8sg2sp65k0s32ssn9pkk6yyss92k97rlx2bsjp";
     };
     dependencies = [];
 
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-vim-2016-05-01";
+    name = "ctrlp-vim-2016-06-08";
     src = fetchgit {
       url = "git://github.com/ctrlpvim/ctrlp.vim";
-      rev = "28fce0fb860fe8df0915da1de1fb6e90d6ab2edc";
-      sha256 = "1amxly825vdp7s1znnzz7ysjks26j37lhpm8hvgfxpxks2clyhhs";
+      rev = "cd99e43613202d56b2adfc8f9bd216734a9601fd";
+      sha256 = "0inlwdl27rsjq9jaa37w21kgbvf6v8351xzqz6y2f6s5ciwbhfm3";
     };
     dependencies = [];
 
@@ -485,6 +485,17 @@ rec {
 
   };
 
+  vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-localvimrc-2016-06-06";
+    src = fetchgit {
+      url = "git://github.com/embear/vim-localvimrc";
+      rev = "f104384cd9127b5a75ed889b551fd7f46faeb74a";
+      sha256 = "0k1ava8nhshkm7llhmagpsmvgwy8xcc0mn3chdk6hz8gzz9755py";
+    };
+    dependencies = [];
+
+  };
+
   vim-haskellConcealPlus = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-haskellConcealPlus-2016-05-13";
     src = fetchgit {
@@ -508,11 +519,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2016-05-23";
+    name = "vim-go-2016-06-11";
     src = fetchgit {
       url = "git://github.com/fatih/vim-go";
-      rev = "e9f44d933e38bf3193ac5cce15f08fdc7e54814b";
-      sha256 = "18hxnb6rn6gxixcqqwpqi4q9adz23jgrz8as2rl90y77m8f5inr5";
+      rev = "6efcfb275c8f7779bfc0738da730dfab19f157fe";
+      sha256 = "14n7phv3b4s7fhz94ziafakd0wl6n4z3a12i5qq2hdavi98kd640";
     };
     dependencies = [];
 
@@ -529,6 +540,17 @@ rec {
 
   };
 
+  psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "psc-ide-vim-2016-04-26";
+    src = fetchgit {
+      url = "git://github.com/frigoeu/psc-ide-vim";
+      rev = "27c000f0f27c7a4d05f001320ddcf1ae15b22eb7";
+      sha256 = "1vgxf5kziv00mi346zw3b2dnxygxk0jyxg41y6w1j22yrp9id1k2";
+    };
+    dependencies = [];
+
+  };
+
   vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-jsonnet-2016-05-10";
     src = fetchgit {
@@ -574,11 +596,11 @@ rec {
   };
 
   lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "lightline-vim-2016-05-16";
+    name = "lightline-vim-2016-06-12";
     src = fetchgit {
       url = "git://github.com/itchyny/lightline.vim";
-      rev = "ac5e6df5cac0f3ff3078c51f715978288a5c351d";
-      sha256 = "1q3zkfg8dq7760jlm207f6d85c46q8x2hfdqmdxkbagvhb9c0f4y";
+      rev = "430ce2cb063b39a0c7950cafd617e333acb6759a";
+      sha256 = "0336c17vkfh60cvj86y35lqz1xcd80csrlb985k1hyd5s7cayp42";
     };
     dependencies = [];
 
@@ -638,24 +660,13 @@ rec {
     dependencies = [];
 
   };
-  
-  vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-localvimrc-2016-06-06";
-    src = fetchgit {
-      url = "git://github.com/embear/vim-localvimrc";
-      rev = "f104384cd9127b5a75ed889b551fd7f46faeb74a";
-      sha256 = "0k1ava8nhshkm7llhmagpsmvgwy8xcc0mn3chdk6hz8gzz9755py";
-    };
-    dependencies = [];
-
-  };
 
   tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tslime-vim-2015-08-14";
+    name = "tslime-vim-2016-06-14";
     src = fetchgit {
       url = "git://github.com/jgdavey/tslime.vim";
-      rev = "4a8091956e331d7b1d4187a2883b720dfec7e9dd";
-      sha256 = "09csafrigp1ak566zxvhj71cdr6b6i3fplgncb288r051kw16cg6";
+      rev = "c980c76bbfc9a523fcf1edf08580d0d3a486e8f2";
+      sha256 = "0gifyxwlspfnkni886adwn9kc0dckanjk0097y8pwxh7qbwfydf1";
     };
     dependencies = [];
 
@@ -706,11 +717,11 @@ rec {
   };
 
   fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fzf-vim-2016-05-24";
+    name = "fzf-vim-2016-06-14";
     src = fetchgit {
       url = "git://github.com/junegunn/fzf.vim";
-      rev = "c786d516375c5fe404febec39282fc1d63069a37";
-      sha256 = "0dk5bs4f2lfs96npgid5ayapsqf9xhf9ii0gaa0rq4dz93i76hzg";
+      rev = "0867178d9963e9f971c7799b0820aab985676c3c";
+      sha256 = "09d9v4anraxp6bk54mkx4w7j256b21m7ik77l647j3bnyn0z3wf8";
     };
     dependencies = [];
 
@@ -728,11 +739,11 @@ rec {
   };
 
   vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-peekaboo-2016-02-29";
+    name = "vim-peekaboo-2016-05-31";
     src = fetchgit {
       url = "git://github.com/junegunn/vim-peekaboo";
-      rev = "111c4bacbe5216022d56489c366bf4ce985506e9";
-      sha256 = "0pblcxb467n4nxkvmb8sl8765nmz17h74hs5dy5dnmaxiy55v0d9";
+      rev = "35ee385d451d06c93177d6bb268dcefd19b091da";
+      sha256 = "1ix03w0rcn5l8ljszhsn53gsqmpsk12qv1s6imd5nhdf66njhlks";
     };
     dependencies = [];
 
@@ -772,11 +783,11 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2016-05-23";
+    name = "vimtex-2016-06-14";
     src = fetchgit {
       url = "git://github.com/lervag/vimtex";
-      rev = "257d2f91de35716d09f08fbbcb384cdc20ac7659";
-      sha256 = "1cq7dvv4hsrm8khhlj1411rp9q5f0xp7q1m61khdr1icgjfasaxp";
+      rev = "1211d5725331a221329f8cd98756c8ef68556fd9";
+      sha256 = "0hjajg8ls2gl0jjrcb7m5qrvvzlm86jac8786fi56iql3r1yvlil";
     };
     dependencies = [];
 
@@ -809,11 +820,11 @@ rec {
   };
 
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2016-03-24";
+    name = "vim-startify-2016-06-08";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-startify";
-      rev = "e74cc71b1b7b33f6df6e8b48ff4b0f587f6bfed9";
-      sha256 = "1s7kys6kj7jrs1z3i8fgb9y1f45halwgpkgw34518ljmjx8n42sa";
+      rev = "dbaa0254249a5d9685ffc9513557bb811fad65b4";
+      sha256 = "1l65ah2k437rhp3rr81fgrwwr7vvipfrj5vlixx49zxgzy489wr4";
     };
     dependencies = [];
 
@@ -875,88 +886,99 @@ rec {
   };
 
   vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-watchdogs-2016-01-13";
+    name = "vim-watchdogs-2016-05-29";
     src = fetchgit {
       url = "git://github.com/osyo-manga/vim-watchdogs";
-      rev = "ebcf3df39007aa5d65910f44eb20c9caea9007df";
-      sha256 = "09wajb6kxvxnqaysj5hhp1g79hzz3bazmbpnj7nn5fdaf83rd8jl";
+      rev = "a1136db1d8806a03fc8ea81aa60e82d4cba57fb5";
+      sha256 = "1qk0wg11x6xwakqqbnx47ma5arsam55jqag0hxsf6is2yjqxb825";
     };
     dependencies = [];
 
   };
 
   vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-racer-2016-05-24";
+    name = "vim-racer-2016-05-31";
     src = fetchgit {
       url = "git://github.com/racer-rust/vim-racer";
-      rev = "031a4e4131450758ade9073025cf4f75e8c2d85c";
-      sha256 = "1hq67hi8069h4yp8l6nb0afnkgidrk4c3hagp6saiihlh3541m11";
+      rev = "392e5818039a13f0cc3f819afcbb31291b1635a4";
+      sha256 = "0fs3zlsc1h4a58m0xlv11g5vzfvhjrinnmxh7xmgjnnd4njx8iax";
+    };
+    dependencies = [];
+
+  };
+
+  purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "purescript-vim-2016-01-04";
+    src = fetchgit {
+      url = "git://github.com/raichoo/purescript-vim";
+      rev = "92dd6bc647b45444e9d5e0550bdc3c56928f9762";
+      sha256 = "090vpff58lzzhqp28p27am5s8s6ngjxw6j4y46zaixcxxx7wqzha";
     };
     dependencies = [];
 
   };
 
   rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rust-vim-2016-04-12";
+    name = "rust-vim-2016-06-05";
     src = fetchgit {
       url = "git://github.com/rust-lang/rust.vim";
-      rev = "115d321d383eb96d438466c56cc871fcc1bd0faa";
-      sha256 = "0j9vp3kb9kiza3h6jr8csqmdcsdp4g2qix70lvyh6ybrbkz84ghw";
+      rev = "e064f270e85e0cbb7bd643aeda3e7088378341f7";
+      sha256 = "04s3c1hwxcprvzn8wx39f9mg3rmgwvqvinqwbfm591pjpialvmpk";
     };
     dependencies = [];
 
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2016-04-30";
+    name = "neocomplete-vim-2016-06-07";
     src = fetchgit {
       url = "git://github.com/shougo/neocomplete.vim";
-      rev = "81d39635625730ca43f08762e2908b96e7b7f077";
-      sha256 = "0lqvklg2vm8vcgj0786wi103wzr71v2l9i3f215kg9did2nnmky9";
+      rev = "14698b37d10b8ae18a4850aa784fdd3130e4ba3e";
+      sha256 = "08bg6yafp68gh82afzzn9msb7adydihdvxyzigvjzr94bzv4n4ab";
     };
     dependencies = [];
 
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2016-05-15";
+    name = "neosnippet-snippets-2016-05-26";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet-snippets";
-      rev = "b068cc47707ecc7d023d75359687b21545bfc341";
-      sha256 = "1gy7dn2h1w8bpqr681nqm1kyb9ggxakw25mlhlb3vvb2p8nm553r";
+      rev = "dbce664a473e2344d2cc4e494fb5e408452646e2";
+      sha256 = "008brypf2jc9kl1gqyl1x2b1qx0bzvvfc0qqg0aniva2hwsda38k";
     };
     dependencies = [];
 
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2016-05-17";
+    name = "neosnippet-vim-2016-06-11";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet.vim";
-      rev = "9eac227835317d2fad9ae9b816590ce33a3ab7c4";
-      sha256 = "0hbj03rhrlga9fszd3ryyrfl93fmxsc3892swdaa3zhl18zfn0m2";
+      rev = "23eac4b080bb9788fbe61a0b93c7cf39e533f490";
+      sha256 = "01hbglhvgkfq78hxyh32afi4q47y6l3lm7yn4cz532cqd7ac78ij";
     };
     dependencies = [];
 
   };
 
   unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "unite-vim-2016-05-22";
+    name = "unite-vim-2016-06-11";
     src = fetchgit {
       url = "git://github.com/shougo/unite.vim";
-      rev = "5fd81feec7ff3f94173ecb10e3dee98aaef26e5d";
-      sha256 = "0lnmys9g99m7fzcxgc9xl2n7am14wyvqmffaqhdlpqjj3lv2l4dz";
+      rev = "27a97d3eacd209c4f6e15c98e9217a4f6c438ac5";
+      sha256 = "14d87skqrsdb61nqpdch584hi0hpb5a0nqf35q5727pz6ckch32f";
     };
     dependencies = [];
 
   };
 
   vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimproc-vim-2016-04-27";
+    name = "vimproc-vim-2016-06-11";
     src = fetchgit {
       url = "git://github.com/shougo/vimproc.vim";
-      rev = "0ff17bc0725cd0323df87664fa02b1436349f667";
-      sha256 = "14j8ypn54cidh4bk3nqsc0ablwvgydlsbmb256rq512gpwkm2mil";
+      rev = "c2f6b82af60a4e7acde0e8dc4e6b6f5dc1cc8e1d";
+      sha256 = "1h79c0fskvalasji290qz89y1s9c1mic7h1p82p1im036jvmkf22";
     };
     dependencies = [];
     buildInputs = [ which ];
@@ -971,11 +993,11 @@ rec {
   };
 
   vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimshell-vim-2016-04-04";
+    name = "vimshell-vim-2016-06-11";
     src = fetchgit {
       url = "git://github.com/shougo/vimshell.vim";
-      rev = "bdcd197b701734a743903c7547e9f56842701614";
-      sha256 = "1cv2mdkhq3kvs91cd7d703b6567glb3snvg27vmj1p8amzxjf97d";
+      rev = "d36fde6da558d4cad7a1d03a07fd5e1fcf299141";
+      sha256 = "0xx84552k7ziymp81slgxsym1nvzkyyyf1d31y7k8cqbvq87nbn1";
     };
     dependencies = [ "vimproc-vim" ];
   };
@@ -1025,11 +1047,11 @@ rec {
   };
 
   vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-quickrun-2016-05-18";
+    name = "vim-quickrun-2016-06-09";
     src = fetchgit {
       url = "git://github.com/thinca/vim-quickrun";
-      rev = "3bdd13cc577b58a90d7964f2fe4446b2e65ea77a";
-      sha256 = "0lpnq1pkv8zjj99gfsa21bvz2g1bspxkqjbs3m4h49g1695bf5w9";
+      rev = "bb4daff0342ce3311b7f6c2fd3e2160f2be9e374";
+      sha256 = "11baxdcqr8854ijp0gkwwjl9navv8x1dv53p2isiq5vpqiq4n3mw";
     };
     dependencies = [];
 
@@ -1080,11 +1102,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2016-05-17";
+    name = "youcompleteme-2016-06-13";
     src = fetchgit {
       url = "git://github.com/valloric/youcompleteme";
-      rev = "fa583935476776ef274adf1d516d1497d5bb573d";
-      sha256 = "0i6zr4x28j5lfqsbaq9mdpzxyppkrj2hlh4w1inx94f2sfijf1m5";
+      rev = "871387bd2a2ed9270ccc17ed63dde99c840deab5";
+      sha256 = "19ll1nh6nxl31zdajz9kdgw18mvsy4d630435z604rxik2rgbh3d";
     };
     dependencies = [];
     buildInputs = [
@@ -1120,11 +1142,11 @@ rec {
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-themes-2016-05-16";
+    name = "vim-airline-themes-2016-06-06";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline-themes";
-      rev = "97a042a57af7f04e25fddb6e694d75be1d55be02";
-      sha256 = "1sgkwjrh8g01kykzbz6dm5giycrq3vqi0f3m5ppvijhj8yind69s";
+      rev = "796478723c01a275269b96f63ee5cd5b44a342f4";
+      sha256 = "1irvzv1sq12y2q6yjb26b89j5pxs5cia35dax093q6h88ywq709g";
     };
     dependencies = [];
 
@@ -1153,11 +1175,11 @@ rec {
   };
 
   vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-syntax-2016-03-20";
+    name = "vim-pandoc-syntax-2016-06-14";
     src = fetchgit {
       url = "git://github.com/vim-pandoc/vim-pandoc-syntax";
-      rev = "a35e9ce28bae85b1ce5d4f817882a8d78efcd6be";
-      sha256 = "08l6sjzvl6bigh4d9rvqadvz8bpq25c1ima4la2i3pg8xgdc9xf3";
+      rev = "eaf2507e0bd51ec06bc111777376b21da7340d5d";
+      sha256 = "0xxsjvzv98wnfzw0j590am8za75y7gr8r480izb3db2z437micw7";
     };
     dependencies = [];
 
@@ -1241,22 +1263,22 @@ rec {
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2016-05-21";
+    name = "vim-wakatime-2016-06-13";
     src = fetchgit {
       url = "git://github.com/wakatime/vim-wakatime";
-      rev = "d46c3e96d5e489d45c2910898212f58c646518c9";
-      sha256 = "1qpsasiqin9wlavivfd9925pzsfh04hhdww92iah66a2vvaxjnhw";
+      rev = "cd074dcff51f12d1658902d4fe0d9f311ac94a2d";
+      sha256 = "0sq7n9w4nadc0psr74g7bmgv87bqlzsmyrr4iyalz108bdgxahav";
     };
     dependencies = [];
     buildInputs = [ python ];
   };
 
   command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "command-t-2016-05-21";
+    name = "command-t-2016-06-14";
     src = fetchgit {
       url = "git://github.com/wincent/command-t";
-      rev = "39b75707640493795afb4fb90b2d74cade84cee8";
-      sha256 = "1n46dq4fsqq7nsl7nivl3xk23k54sarflrr6b30v1vvg22mw64yq";
+      rev = "354c429dad34f7d163663943c948f819588b53d3";
+      sha256 = "1vkvc6ckza5b4ck52hv4rjclqi7x4f06dxkbqcqnia490m685v9q";
     };
     dependencies = [];
     buildInputs = [ perl ruby ];
@@ -1312,28 +1334,6 @@ rec {
 
   };
 
-  psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "psc-ide-vim-2016-06-04";
-    src = fetchgit {
-      url = "git://github.com/frigoeu/psc-ide-vim";
-      rev = "27c000f0f27c7a4d05f001320ddcf1ae15b22eb7";
-      sha256 = "1vgxf5kziv00mi346zw3b2dnxygxk0jyxg41y6w1j22yrp9id1k2";
-    };
-    dependencies = [ ];
-
-  };
-
-  purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "purescript-vim-2016-06-04";
-    src = fetchgit {
-      url = "git://github.com/raichoo/purescript-vim";
-      rev = "92dd6bc647b45444e9d5e0550bdc3c56928f9762";
-      sha256 = "090vpff58lzzhqp28p27am5s8s6ngjxw6j4y46zaixcxxx7wqzha";
-    };
-    dependencies = [ ];
-
-  };
-
   quickfixstatus = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "quickfixstatus-2011-09-02";
     src = fetchgit {
@@ -1379,11 +1379,11 @@ rec {
   };
 
   snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "snipmate-2016-04-04";
+    name = "snipmate-2016-06-08";
     src = fetchgit {
       url = "git://github.com/garbas/vim-snipmate";
-      rev = "66555c2a86ba2136459190c06aa2c0f25ad38bb3";
-      sha256 = "1156g0iwy4fdfvb9922jvbxyn5k6z094m0y11igamb5d4kv7v72y";
+      rev = "0c20e4136a298a73e21047d12cc5049595fb8445";
+      sha256 = "1x9skkywr5shrvb9bm3mjww6kmjmck7y8g0mn9yq8psqag9j3l21";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
@@ -1401,11 +1401,11 @@ rec {
   };
 
   surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "surround-2015-08-07";
+    name = "surround-2016-06-01";
     src = fetchgit {
       url = "git://github.com/tpope/vim-surround";
-      rev = "2d05440ad23f97a7874ebd9b5de3a0e65d25d85c";
-      sha256 = "1b74l52a2yi9r5j6w3mcyhacdxajs3ndab1viw632nprqqsh8qb4";
+      rev = "e49d6c2459e0f5569ff2d533b4df995dd7f98313";
+      sha256 = "1v0q2f1n8ngbja3wpjvqp2jh89pb5ij731qmm18k41nhgz6hhm46";
     };
     dependencies = [];
 
@@ -1675,11 +1675,11 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2016-05-22";
+    name = "vim-airline-2016-06-07";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline";
-      rev = "4d39cb6f2078326dd07f2ab680a0365299a2589e";
-      sha256 = "0jwk1ly9sbj3warq92haw3alq7q639375c9bl28j3rzg7x008blz";
+      rev = "7b9b68f15dc50ef3c6382bd9df3a5e70c9ddcee9";
+      sha256 = "0k6imrfgp62qminwd7ilsq106dy49nwn2fsm88v546mwc9a2bccd";
     };
     dependencies = [];
 
@@ -1719,11 +1719,11 @@ rec {
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2016-05-23";
+    name = "vim-gitgutter-2016-06-09";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "f8da1fd6dbd558ebcc743bd7f91d35d6ca8db56a";
-      sha256 = "0rbvkd8pc2wpfavbkb088rp6fmsww1m29zphcw8r8x1vwk2bz1p2";
+      rev = "09b9144002e938844df74f48ac72c1e3118e7d39";
+      sha256 = "10yyzib9znhqz298h3f67n9hz1fvm5yk6958bisimf9bg9w9rn1v";
     };
     dependencies = [];
 
@@ -1752,55 +1752,55 @@ rec {
   };
 
   vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-multiple-cursors-2016-04-11";
+    name = "vim-multiple-cursors-2016-06-03";
     src = fetchgit {
       url = "git://github.com/terryma/vim-multiple-cursors";
-      rev = "25b567baf712a7e9bc8f3c9ca816bd579363109b";
-      sha256 = "0y4gmk4m43ia94dkir2i3qs5z8i00r7yk22hrdws6nqrpnf7dp13";
+      rev = "51d0717f63cc231f11b4b63ee5b611f589dce1b3";
+      sha256 = "1s06wp4cjdmfvljzd9gz0wawkfcpkj8l2scjdx626ml740pnhmx8";
     };
     dependencies = [];
 
   };
 
   vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signature-2016-05-19";
+    name = "vim-signature-2016-06-09";
     src = fetchgit {
       url = "git://github.com/kshenoy/vim-signature";
-      rev = "2a2915685f78c60e6c95d936e8881d9336c3b03a";
-      sha256 = "1sd4502bixs8311dj1w20jdwf1lgrbkz696ay9r0ywhxp7ri0qs4";
+      rev = "782ed5284ddf6ef3695f8b3314facd8c6113c725";
+      sha256 = "1s6n6qdn3f89h4gi8nflz84y9l59rrfn43rgn257kxsq0df0kmx2";
     };
     dependencies = [];
 
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2016-04-08";
+    name = "vim-signify-2016-06-08";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-signify";
-      rev = "37376d9970294063b2ba9594204d50cfa181ebb6";
-      sha256 = "0ih09i0smn768fkbzbjpfzsjfsm4w653ghaykzcn4hbail67nx84";
+      rev = "cb975a8c6fbf08385eba8d0bbc1168ae53be460a";
+      sha256 = "00vi90zfkx94i0n0x4fjiz6bxfl2whxsclp8zxd4mivcqsw500jy";
     };
     dependencies = [];
 
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2016-05-24";
+    name = "vim-snippets-2016-06-09";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "477ede1985a92f3ae1a5ff806a7507823abcc203";
-      sha256 = "1ncs7bk2pqz4dy3h206s0c9f14h5kgfanipbiiis24z2zvq9mw18";
+      rev = "e840b91a4e86cda657519eba00766a29a614e1e2";
+      sha256 = "11pns71zpg9nh3mf2g24k194371jhkkv7b3in8r9av107ijky3sb";
     };
     dependencies = [];
 
   };
 
   vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-webdevicons-2016-04-17";
+    name = "vim-webdevicons-2016-06-03";
     src = fetchgit {
       url = "git://github.com/ryanoasis/vim-devicons";
-      rev = "ad5d6d7f9fdf741a1e0d45b2bebab1d0116e1158";
-      sha256 = "0i3frd23zwbxypj8xgv4hc44wzc2803p15852iqz3k0xr8y8rjxd";
+      rev = "0bf80d78cba8603dd4f594f1807cc5bee706db84";
+      sha256 = "17r98gh4pk0xdfprjmqzp617szwq4j6yrn6pbx0l1n7k7q5crv89";
     };
     dependencies = [];
 
-- 
cgit 1.4.1


From 54f80775cb58b3aa784b323b1eddb14e45d86fc4 Mon Sep 17 00:00:00 2001
From: David Craven <david@craven.ch>
Date: Tue, 14 Jun 2016 12:49:48 +0200
Subject: rust: Refactoring of rust and cargo packages

---
 pkgs/build-support/rust/default.nix                |   6 +-
 pkgs/build-support/rust/fetchcargo.nix             |   4 +-
 pkgs/development/compilers/rust/beta.nix           |  27 +++++
 pkgs/development/compilers/rust/bootstrap.nix      |  78 ++++++++++++++
 pkgs/development/compilers/rust/cargo.nix          |  64 ++++++++++++
 pkgs/development/compilers/rust/default.nix        |  33 ++++++
 pkgs/development/compilers/rust/head.nix           |  27 +++++
 .../rust/patches/disable-lockfile-check.patch      |  25 +++++
 .../development/compilers/rust/patches/grsec.patch |  24 +++++
 .../rust/patches/remove-uneeded-git.patch          |  19 ++++
 .../compilers/rust/patches/use-rustc-1.9.0.patch   |  25 +++++
 pkgs/development/compilers/rust/print-hashes.sh    |  17 ++++
 pkgs/development/compilers/rust/rustc.nix          | 112 +++++++++++++++++++++
 pkgs/development/compilers/rust/snapshot.nix       |  65 ++++++++++++
 pkgs/development/compilers/rustc/beta.nix          |  14 ---
 pkgs/development/compilers/rustc/bootstrap.nix     |  47 ---------
 pkgs/development/compilers/rustc/default.nix       |  15 ---
 pkgs/development/compilers/rustc/generic.nix       | 111 --------------------
 pkgs/development/compilers/rustc/head.nix          |  15 ---
 .../rustc/patches/disable-lockfile-check.patch     |  25 -----
 .../compilers/rustc/patches/grsec.patch            |  24 -----
 .../rustc/patches/remove-uneeded-git.patch         |  19 ----
 .../compilers/rustc/patches/use-rustc-1.9.0.patch  |  25 -----
 pkgs/development/compilers/rustc/print-hashes.sh   |  17 ----
 pkgs/development/compilers/rustc/snapshot.nix      |  61 -----------
 .../tools/build-managers/cargo/bootstrap.nix       |  50 ---------
 .../tools/build-managers/cargo/default.nix         |  14 ---
 .../tools/build-managers/cargo/generic.nix         |  64 ------------
 .../tools/build-managers/cargo/head.nix            |  10 --
 .../tools/build-managers/cargo/print-hashes.sh     |  17 ----
 pkgs/development/tools/rust/racer/default.nix      |   4 +-
 pkgs/development/tools/rust/racerd/default.nix     |   2 +-
 pkgs/misc/vim-plugins/default.nix                  |   4 +-
 .../vim2nix/additional-nix-code/youcompleteme      |   2 +-
 pkgs/tools/misc/exa/default.nix                    |   2 +-
 pkgs/top-level/all-packages.nix                    |  31 +++---
 36 files changed, 541 insertions(+), 558 deletions(-)
 create mode 100644 pkgs/development/compilers/rust/beta.nix
 create mode 100644 pkgs/development/compilers/rust/bootstrap.nix
 create mode 100644 pkgs/development/compilers/rust/cargo.nix
 create mode 100644 pkgs/development/compilers/rust/default.nix
 create mode 100644 pkgs/development/compilers/rust/head.nix
 create mode 100644 pkgs/development/compilers/rust/patches/disable-lockfile-check.patch
 create mode 100644 pkgs/development/compilers/rust/patches/grsec.patch
 create mode 100644 pkgs/development/compilers/rust/patches/remove-uneeded-git.patch
 create mode 100644 pkgs/development/compilers/rust/patches/use-rustc-1.9.0.patch
 create mode 100755 pkgs/development/compilers/rust/print-hashes.sh
 create mode 100644 pkgs/development/compilers/rust/rustc.nix
 create mode 100644 pkgs/development/compilers/rust/snapshot.nix
 delete mode 100644 pkgs/development/compilers/rustc/beta.nix
 delete mode 100644 pkgs/development/compilers/rustc/bootstrap.nix
 delete mode 100644 pkgs/development/compilers/rustc/default.nix
 delete mode 100644 pkgs/development/compilers/rustc/generic.nix
 delete mode 100644 pkgs/development/compilers/rustc/head.nix
 delete mode 100644 pkgs/development/compilers/rustc/patches/disable-lockfile-check.patch
 delete mode 100644 pkgs/development/compilers/rustc/patches/grsec.patch
 delete mode 100644 pkgs/development/compilers/rustc/patches/remove-uneeded-git.patch
 delete mode 100644 pkgs/development/compilers/rustc/patches/use-rustc-1.9.0.patch
 delete mode 100755 pkgs/development/compilers/rustc/print-hashes.sh
 delete mode 100644 pkgs/development/compilers/rustc/snapshot.nix
 delete mode 100644 pkgs/development/tools/build-managers/cargo/bootstrap.nix
 delete mode 100644 pkgs/development/tools/build-managers/cargo/default.nix
 delete mode 100644 pkgs/development/tools/build-managers/cargo/generic.nix
 delete mode 100644 pkgs/development/tools/build-managers/cargo/head.nix
 delete mode 100755 pkgs/development/tools/build-managers/cargo/print-hashes.sh

(limited to 'pkgs/misc')

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index b889c4f24583..bbea045f6371 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cacert, git, cargo, rustRegistry }:
+{ stdenv, cacert, git, rust, rustRegistry }:
 { name, depsSha256
 , src ? null
 , srcs ? null
@@ -10,7 +10,7 @@
 
 let
   fetchDeps = import ./fetchcargo.nix {
-    inherit stdenv cacert git cargo rustRegistry;
+    inherit stdenv cacert git rust rustRegistry;
   };
 
   cargoDeps = fetchDeps {
@@ -23,7 +23,7 @@ in stdenv.mkDerivation (args // {
 
   patchRegistryDeps = ./patch-registry-deps;
 
-  buildInputs = [ git cargo cargo.rustc ] ++ buildInputs;
+  buildInputs = [ git rust.cargo rust.rustc ] ++ buildInputs;
 
   configurePhase = args.configurePhase or "true";
 
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index 518420002622..1b4983e32597 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -1,9 +1,9 @@
-{ stdenv, cacert, git, cargo, rustRegistry }:
+{ stdenv, cacert, git, rust, rustRegistry }:
 { name ? "cargo-deps", src, srcs, sourceRoot, sha256, cargoUpdateHook ? "" }:
 
 stdenv.mkDerivation {
   name = "${name}-fetch";
-  buildInputs = [ cargo git ];
+  buildInputs = [ rust.cargo rust.rustc git ];
   inherit src srcs sourceRoot rustRegistry cargoUpdateHook;
 
   phases = "unpackPhase installPhase";
diff --git a/pkgs/development/compilers/rust/beta.nix b/pkgs/development/compilers/rust/beta.nix
new file mode 100644
index 000000000000..4b4ee89f981b
--- /dev/null
+++ b/pkgs/development/compilers/rust/beta.nix
@@ -0,0 +1,27 @@
+{ stdenv, callPackage, rustPlatform,
+  targets ? [], targetToolchains ? [], targetPatches ? [] }:
+
+rec {
+  rustc = callPackage ./rustc.nix {
+    shortVersion = "beta-1.10.0";
+    forceBundledLLVM = false;
+    configureFlags = [ "--release-channel=beta" ];
+    srcRev = "d18e321abeecc69e4d1bf9cafba4fba53ddf267d";
+    srcSha = "1ck8mbjrq0bzq5xzwgaqdilakwm2ab0xpzqibjycds62ad4yw774";
+    patches = [ ./patches/disable-lockfile-check.patch ]
+      ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
+    inherit targets;
+    inherit targetPatches;
+    inherit targetToolchains;
+    inherit rustPlatform;
+  };
+
+  cargo = callPackage ./cargo.nix rec {
+    version = "0.10.0";
+    srcRev = "refs/tags/${version}";
+    srcSha = "06scvx5qh60mgvlpvri9ig4np2fsnicsfd452fi9w983dkxnz4l2";
+    depsSha256 = "0js4697n7v93wnqnpvamhp446w58llj66za5hkd6wannmc0gsy3b";
+    inherit rustc; # the rustc that will be wrapped by cargo
+    inherit rustPlatform; # used to build cargo
+  };
+}
diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
new file mode 100644
index 000000000000..300f69294532
--- /dev/null
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -0,0 +1,78 @@
+{ stdenv, fetchurl, makeWrapper, cacert, zlib }:
+
+let
+  platform =
+    if stdenv.system == "i686-linux"
+    then "i686-unknown-linux-gnu"
+    else if stdenv.system == "x86_64-linux"
+    then "x86_64-unknown-linux-gnu"
+    else if stdenv.system == "i686-darwin"
+    then "i686-apple-darwin"
+    else if stdenv.system == "x86_64-darwin"
+    then "x86_64-apple-darwin"
+    else abort "missing boostrap url for platform ${stdenv.system}";
+
+  # fetch hashes by running `print-hashes.sh 1.9.0`
+  bootstrapHash =
+    if stdenv.system == "i686-linux"
+    then "dd4d9bf1b9393867eb18d00431e8fb733894984f2c7b5154bc1b64d045077b45"
+    else if stdenv.system == "x86_64-linux"
+    then "288ff13efa2577e81c77fc2cb6e2b49b1ed0ceab51b4fa12f7efb87039ac49b7"
+    else if stdenv.system == "i686-darwin"
+    then "4d4d4b256d6bd6ae2527cf61007b2553de200f0a1910b7ad41e4f51d2b21e536"
+    else if stdenv.system == "x86_64-darwin"
+    then "d59b5509e69c1cace20a57072e3b3ecefdbfd8c7e95657b0ff2ac10aa1dfebe6"
+    else throw "missing boostrap hash for platform ${stdenv.system}";
+
+  src = fetchurl {
+     url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz";
+     sha256 = bootstrapHash;
+  };
+
+  version = "1.9.0";
+in
+
+rec {
+  rustc = stdenv.mkDerivation rec {
+    name = "rustc-bootstrap-${version}";
+
+    inherit version;
+    inherit src;
+
+    buildInputs = [ makeWrapper ];
+    phases = ["unpackPhase" "installPhase"];
+
+    installPhase = ''
+      ./install.sh --prefix=$out \
+        --components=rustc,rust-std-${platform},rust-docs
+
+      patchelf \
+        --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+        "$out/bin/rustc"
+
+      wrapProgram "$out/bin/rustc"
+    '';
+  };
+
+  cargo = stdenv.mkDerivation rec {
+    name = "cargo-bootstrap-${version}";
+
+    inherit version;
+    inherit src;
+
+    buildInputs = [ makeWrapper zlib rustc ];
+    phases = ["unpackPhase" "installPhase"];
+
+    installPhase = ''
+      ./install.sh --prefix=$out \
+        --components=cargo
+
+      patchelf \
+        --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+        "$out/bin/cargo"
+
+      wrapProgram "$out/bin/cargo" \
+        --suffix PATH : "${rustc}/bin"
+    '';
+  };
+}
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
new file mode 100644
index 000000000000..fc4bf732cf6b
--- /dev/null
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchgit, file, curl, pkgconfig, python, openssl, cmake, zlib
+, makeWrapper, libiconv, cacert, rustPlatform, rustc
+, version, srcRev, srcSha, depsSha256 }:
+
+rustPlatform.buildRustPackage rec {
+  name = "cargo-${version}";
+  inherit version;
+
+  src = fetchgit {
+    url = "https://github.com/rust-lang/cargo";
+    rev = srcRev;
+    sha256 = srcSha;
+  };
+
+  inherit depsSha256;
+
+  passthru.rustc = rustc;
+
+  buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ]
+    ++ stdenv.lib.optional stdenv.isDarwin libiconv;
+
+  configurePhase = ''
+    ./configure --enable-optimize --prefix=$out --local-cargo=${rustPlatform.rust.cargo}/bin/cargo
+  '';
+
+  buildPhase = "make";
+
+  installPhase = ''
+    make install
+    ${postInstall}
+  '';
+
+  postInstall = ''
+    rm "$out/lib/rustlib/components" \
+       "$out/lib/rustlib/install.log" \
+       "$out/lib/rustlib/rust-installer-version" \
+       "$out/lib/rustlib/uninstall.sh" \
+       "$out/lib/rustlib/manifest-cargo"
+
+    wrapProgram "$out/bin/cargo" \
+      --suffix PATH : "${rustc}/bin" \
+      --run "export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt" \
+      ${stdenv.lib.optionalString stdenv.isDarwin ''--suffix DYLD_LIBRARY_PATH : "${rustc}/lib"''}
+  '';
+
+  checkPhase = ''
+    # Export SSL_CERT_FILE as without it one test fails with SSL verification error
+    export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
+    # Disable cross compilation tests
+    export CFG_DISABLE_CROSS_TESTS=1
+    cargo test
+  '';
+
+  # Disable check phase as there are failures (author_prefers_cargo test fails)
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = http://crates.io;
+    description = "Downloads your Rust project's dependencies and builds your project";
+    maintainers = with maintainers; [ wizeman retrry ];
+    license = [ licenses.mit licenses.asl20 ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
new file mode 100644
index 000000000000..d1e7460fa54c
--- /dev/null
+++ b/pkgs/development/compilers/rust/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform,
+  targets ? [], targetToolchains ? [], targetPatches ? [] }:
+
+let
+  rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}) rustPlatform);
+  rustSnapshotPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./snapshot.nix {}) rustPlatform);
+in
+
+rec {
+  rustc = callPackage ./rustc.nix {
+    shortVersion = "1.9.0";
+    isRelease = true;
+    forceBundledLLVM = false;
+    configureFlags = [ "--release-channel=stable" ];
+    srcRev = "e4e8b666850a763fdf1c3c2c142856ab51e32779";
+    srcSha = "1pz4qx70mqv78fxm4w1mq7csk5pssq4qmr2vwwb5v8hyx03caff8";
+    patches = [ ./patches/remove-uneeded-git.patch ]
+      ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
+    inherit targets;
+    inherit targetPatches;
+    inherit targetToolchains;
+    rustPlatform = rustSnapshotPlatform;
+  };
+
+  cargo = callPackage ./cargo.nix rec {
+    version = "0.10.0";
+    srcRev = "refs/tags/${version}";
+    srcSha = "06scvx5qh60mgvlpvri9ig4np2fsnicsfd452fi9w983dkxnz4l2";
+    depsSha256 = "0js4697n7v93wnqnpvamhp446w58llj66za5hkd6wannmc0gsy3b";
+    inherit rustc; # the rustc that will be wrapped by cargo
+    inherit rustPlatform; # used to build cargo
+  };
+}
diff --git a/pkgs/development/compilers/rust/head.nix b/pkgs/development/compilers/rust/head.nix
new file mode 100644
index 000000000000..bbfe5c9a1529
--- /dev/null
+++ b/pkgs/development/compilers/rust/head.nix
@@ -0,0 +1,27 @@
+{ stdenv, callPackage, rustPlatform,
+  targets ? [], targetToolchains ? [], targetPatches ? [] }:
+
+rec {
+  rustc = callPackage ./rustc.nix {
+    shortVersion = "master-1.11.0";
+    forceBundledLLVM = false;
+    srcRev = "298730e7032cd55809423773da397cd5c7d827d4";
+    srcSha = "0hyz5j1z75sjkgsifzgxviv3b1lhgaz8wqwvmq80xx5vd78yd0c1";
+    patches = [ ./patches/disable-lockfile-check.patch
+                ./patches/use-rustc-1.9.0.patch ]
+      ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
+    inherit targets;
+    inherit targetPatches;
+    inherit targetToolchains;
+    inherit rustPlatform;
+  };
+
+  cargo = callPackage ./cargo.nix rec {
+    version = "2016.06.07";
+    srcRev = "3e70312a2a4ebedace131fc63bb8f27463c5db28";
+    srcSha = "0nibzyfjkiqfnq0c00hhqvs856l5qls8wds252p97q5q92yvp40f";
+    depsSha256 = "1xbb33aqnf5yyws6gjys9w8kznbh9rh6hw8mpg1hhq1ahipc2j1f";
+    inherit rustc; # the rustc that will be wrapped by cargo
+    inherit rustPlatform; # used to build cargo
+  };
+}
diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check.patch
new file mode 100644
index 000000000000..0c01cb1a7f19
--- /dev/null
+++ b/pkgs/development/compilers/rust/patches/disable-lockfile-check.patch
@@ -0,0 +1,25 @@
+From e7378e267bba203bd593b49705c24303b0a46cb7 Mon Sep 17 00:00:00 2001
+From: David Craven <david@craven.ch>
+Date: Wed, 1 Jun 2016 01:41:35 +0200
+Subject: [PATCH] disable-lockfile-check
+
+---
+ src/tools/tidy/src/main.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs
+index 2839bbd..50142ff 100644
+--- a/src/tools/tidy/src/main.rs
++++ b/src/tools/tidy/src/main.rs
+@@ -47,7 +47,7 @@ fn main() {
+     errors::check(&path, &mut bad);
+     cargo::check(&path, &mut bad);
+     features::check(&path, &mut bad);
+-    cargo_lock::check(&path, &mut bad);
++    //cargo_lock::check(&path, &mut bad);
+ 
+     if bad {
+         panic!("some tidy checks failed");
+-- 
+2.8.3
+
diff --git a/pkgs/development/compilers/rust/patches/grsec.patch b/pkgs/development/compilers/rust/patches/grsec.patch
new file mode 100644
index 000000000000..b97b40c24091
--- /dev/null
+++ b/pkgs/development/compilers/rust/patches/grsec.patch
@@ -0,0 +1,24 @@
+diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile
+index b22f34f..c6489bd 100644
+--- a/src/test/run-make/relocation-model/Makefile
++++ b/src/test/run-make/relocation-model/Makefile
+@@ -2,9 +2,11 @@
+ 
+ all: others
+ 	$(RUSTC) -C relocation-model=dynamic-no-pic foo.rs
++	paxctl -czexm $(TMPDIR)/foo
+ 	$(call RUN,foo)
+ 
+ 	$(RUSTC) -C relocation-model=default foo.rs
++	paxctl -czexm $(TMPDIR)/foo
+ 	$(call RUN,foo)
+ 
+ 	$(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs
+@@ -16,6 +18,7 @@ others:
+ else
+ others:
+ 	$(RUSTC) -C relocation-model=static foo.rs
++	paxctl -czexm $(TMPDIR)/foo
+ 	$(call RUN,foo)
+ 	$(RUSTC) -C relocation-model=static --crate-type=dylib foo.rs
+ endif
diff --git a/pkgs/development/compilers/rust/patches/remove-uneeded-git.patch b/pkgs/development/compilers/rust/patches/remove-uneeded-git.patch
new file mode 100644
index 000000000000..3c68d777f885
--- /dev/null
+++ b/pkgs/development/compilers/rust/patches/remove-uneeded-git.patch
@@ -0,0 +1,19 @@
+diff --git a/src/etc/tidy.py b/src/etc/tidy.py
+index 9f5f919..a607180 100644
+--- a/src/etc/tidy.py
++++ b/src/etc/tidy.py
+@@ -66,13 +66,9 @@ def interesting_file(f):
+     return any(os.path.splitext(f)[1] == ext for ext in interesting_files)
+ 
+ 
+-# Be careful to support Python 2.4, 2.6, and 3.x here!
+-config_proc = subprocess.Popen(["git", "config", "core.autocrlf"],
+-                               stdout=subprocess.PIPE)
+-result = config_proc.communicate()[0]
+ 
+ true = "true".encode('utf8')
+-autocrlf = result.strip() == true if result is not None else False
++autocrlf = False
+ 
+ current_name = ""
+ current_contents = ""
diff --git a/pkgs/development/compilers/rust/patches/use-rustc-1.9.0.patch b/pkgs/development/compilers/rust/patches/use-rustc-1.9.0.patch
new file mode 100644
index 000000000000..150306744be6
--- /dev/null
+++ b/pkgs/development/compilers/rust/patches/use-rustc-1.9.0.patch
@@ -0,0 +1,25 @@
+From 2710f3c8ae142abe1720b3476cd1ca60cee0c077 Mon Sep 17 00:00:00 2001
+From: David Craven <david@craven.ch>
+Date: Wed, 1 Jun 2016 00:12:35 +0200
+Subject: [PATCH] Patch stage0.txt to use rustc 1.9.0
+
+---
+ src/stage0.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/stage0.txt b/src/stage0.txt
+index 58b7f8f..3c84cab 100644
+--- a/src/stage0.txt
++++ b/src/stage0.txt
+@@ -12,6 +12,6 @@
+ # tarball for a stable release you'll likely see `1.x.0-$date` where `1.x.0` was
+ # released on `$date`
+ 
+-rustc: beta-2016-04-13
+-rustc_key: c2743eb4
++rustc: 1.9.0-2016-05-24
++rustc_key: d16b8f0e
+ cargo: nightly-2016-04-10
+-- 
+2.8.3
+
diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh
new file mode 100755
index 000000000000..4d1d20066b85
--- /dev/null
+++ b/pkgs/development/compilers/rust/print-hashes.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+PLATFORMS="i686-unknown-linux-gnu x86_64-unknown-linux-gnu i686-apple-darwin x86_64-apple-darwin"
+BASEURL="https://static.rust-lang.org/dist"
+VERSION=$1
+
+if [[ -z  $VERSION ]]
+then
+    echo "No version supplied"
+    exit -1
+fi
+
+for PLATFORM in $PLATFORMS
+do
+    URL="$BASEURL/rust-$VERSION-$PLATFORM.tar.gz.sha256"
+    curl $URL
+done
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
new file mode 100644
index 000000000000..b1b33d57bb25
--- /dev/null
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -0,0 +1,112 @@
+{ stdenv, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps
+, llvm, jemalloc, ncurses, darwin, binutils, rustPlatform, git
+
+, isRelease ? false
+, shortVersion
+, forceBundledLLVM ? false
+, srcSha, srcRev
+, configureFlags ? []
+, patches
+, targets
+, targetPatches
+, targetToolchains
+} @ args:
+
+let
+    version = if isRelease then
+        "${shortVersion}"
+      else
+        "${shortVersion}-g${builtins.substring 0 7 srcRev}";
+
+    name = "rustc-${version}";
+
+    procps = if stdenv.isDarwin then darwin.ps else args.procps;
+
+    llvmShared = llvm.override { enableSharedLibraries = true; };
+
+    target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
+
+    meta = with stdenv.lib; {
+      homepage = http://www.rust-lang.org/;
+      description = "A safe, concurrent, practical language";
+      maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington retrry ];
+      license = [ licenses.mit licenses.asl20 ];
+      platforms = platforms.linux ++ platforms.darwin;
+    };
+in
+
+stdenv.mkDerivation {
+  inherit name;
+  inherit version;
+  inherit meta;
+
+  __impureHostDeps = [ "/usr/lib/libedit.3.dylib" ];
+
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib";
+
+  src = fetchgit {
+    url = https://github.com/rust-lang/rust;
+    rev = srcRev;
+    sha256 = srcSha;
+  };
+
+  # We need rust to build rust. If we don't provide it, configure will try to download it.
+  configureFlags = configureFlags
+                ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ]
+                # ++ [ "--jemalloc-root=${jemalloc}/lib"
+                ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils.out}/bin/ar" ]
+                ++ stdenv.lib.optional (stdenv.cc.cc ? isClang) "--enable-clang"
+                ++ stdenv.lib.optional (targets != []) "--target=${target}"
+                ++ stdenv.lib.optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";
+
+  patches = patches ++ targetPatches;
+  passthru.target = target;
+
+  postPatch = ''
+    substituteInPlace src/rust-installer/gen-install-script.sh \
+      --replace /bin/echo "$(type -P echo)"
+    substituteInPlace src/rust-installer/gen-installer.sh \
+      --replace /bin/echo "$(type -P echo)"
+
+    # Workaround for NixOS/nixpkgs#8676
+    substituteInPlace mk/rustllvm.mk \
+      --replace "\$\$(subst  /,//," "\$\$(subst /,/,"
+
+    # Fix dynamic linking against llvm
+    ${stdenv.lib.optionalString (!forceBundledLLVM) ''sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py''}
+
+    # Fix the configure script to not require curl as we won't use it
+    sed -i configure \
+      -e '/probe_need CFG_CURLORWGET/d'
+
+    # Fix the use of jemalloc prefixes which our jemalloc doesn't have
+    # TODO: reenable if we can figure out how to get our jemalloc to work
+    #[ -f src/liballoc_jemalloc/lib.rs ] && sed -i 's,je_,,g' src/liballoc_jemalloc/lib.rs
+    #[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+
+
+    # Useful debugging parameter
+    #export VERBOSE=1
+  '';
+
+  preConfigure = ''
+    # Needed flags as the upstream configure script has a broken prefix substitution
+    configureFlagsArray+=("--datadir=$out/share")
+    configureFlagsArray+=("--infodir=$out/share/info")
+  '';
+
+  # ps is needed for one of the test cases
+  nativeBuildInputs = [ file python2 procps rustPlatform.rust.rustc git ];
+  buildInputs = [ ncurses ] ++ targetToolchains
+    ++ stdenv.lib.optional (!forceBundledLLVM) llvmShared;
+
+  # https://github.com/rust-lang/rust/issues/30181
+  # enableParallelBuilding = false; # missing files during linking, occasionally
+
+  outputs = [ "out" "doc" ];
+  setOutputFlags = false;
+
+  preCheck = "export TZDIR=${tzdata}/share/zoneinfo";
+
+  doCheck = true;
+  dontSetConfigureCross = true;
+}
diff --git a/pkgs/development/compilers/rust/snapshot.nix b/pkgs/development/compilers/rust/snapshot.nix
new file mode 100644
index 000000000000..47f271b18e06
--- /dev/null
+++ b/pkgs/development/compilers/rust/snapshot.nix
@@ -0,0 +1,65 @@
+/* NOTE: Rust 1.9.0 is the last version that uses snapshots
+         This file can be deleted after the 1.10.0 release and bootstrap.nix
+         can be used instead
+*/
+{ stdenv, fetchurl, callPackage }:
+
+let
+  platform = if stdenv.system == "i686-linux"
+    then "linux-i386"
+    else if stdenv.system == "x86_64-linux"
+    then "linux-x86_64"
+    else if stdenv.system == "i686-darwin"
+    then "macos-i386"
+    else if stdenv.system == "x86_64-darwin"
+    then "macos-x86_64"
+    else abort "no snapshot to bootstrap for this platform (missing platform url suffix)";
+
+  /* Rust is bootstrapped from an earlier built version. We need
+    to fetch these earlier versions, which vary per platform.
+    The shapshot info you want can be found at
+    https://github.com/rust-lang/rust/blob/{$shortVersion}/src/snapshots.txt
+    with the set you want at the top. Make sure this is the latest snapshot
+    for the tagged release and not a snapshot in the current HEAD.
+  */
+
+  snapshotHashLinux686 = "0e0e4448b80d0a12b75485795244bb3857a0a7ef";
+  snapshotHashLinux64 = "1273b6b6aed421c9e40c59f366d0df6092ec0397";
+  snapshotHashDarwin686 = "9f9c0b4a2db09acbce54b792fb8839a735585565";
+  snapshotHashDarwin64 = "52570f6fd915b0210a9be98cfc933148e16a75f8";
+  snapshotDate = "2016-03-18";
+  snapshotRev = "235d774";
+
+  snapshotHash = if stdenv.system == "i686-linux"
+    then snapshotHashLinux686
+    else if stdenv.system == "x86_64-linux"
+    then snapshotHashLinux64
+    else if stdenv.system == "i686-darwin"
+    then snapshotHashDarwin686
+    else if stdenv.system == "x86_64-darwin"
+    then snapshotHashDarwin64
+    else abort "no snapshot for platform ${stdenv.system}";
+
+  snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshotHash}.tar.bz2";
+in
+
+rec {
+  rustc = stdenv.mkDerivation {
+    name = "rustc-snapshot";
+    src = fetchurl {
+      url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}";
+      sha1 = snapshotHash;
+    };
+    dontStrip = true;
+    installPhase = ''
+      mkdir -p "$out"
+      cp -r bin "$out/bin"
+    '' + stdenv.lib.optionalString stdenv.isLinux ''
+      patchelf --interpreter "${stdenv.glibc.out}/lib/${stdenv.cc.dynamicLinker}" \
+               --set-rpath "${stdenv.cc.cc.lib}/lib/:${stdenv.cc.cc.lib}/lib64/" \
+               "$out/bin/rustc"
+    '';
+  };
+
+  cargo = null;
+}
diff --git a/pkgs/development/compilers/rustc/beta.nix b/pkgs/development/compilers/rustc/beta.nix
deleted file mode 100644
index 363dc71c02da..000000000000
--- a/pkgs/development/compilers/rustc/beta.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ stdenv, callPackage, rustcStable, targets ? [], targetToolchains ? [] }:
-
-callPackage ./generic.nix {
-  shortVersion = "beta-1.10.0";
-  forceBundledLLVM = false;
-  configureFlags = [ "--release-channel=beta" ];
-  srcRev = "39f3c16cca889ef3f1719d9177e3315258222a65";
-  srcSha = "01bx6616lslp2mbj4h8bb6m042fs0y1z8g0jgpxvbk3fbhzwafrx";
-  patches = [ ./patches/disable-lockfile-check.patch ] ++
-    stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
-  rustc = rustcStable;
-  inherit targets;
-  inherit targetToolchains;
-}
diff --git a/pkgs/development/compilers/rustc/bootstrap.nix b/pkgs/development/compilers/rustc/bootstrap.nix
deleted file mode 100644
index 0361bb78a9ce..000000000000
--- a/pkgs/development/compilers/rustc/bootstrap.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, fetchurl, makeWrapper }:
-
-let
-  platform =
-    if stdenv.system == "i686-linux"
-    then "i686-unknown-linux-gnu"
-    else if stdenv.system == "x86_64-linux"
-    then "x86_64-unknown-linux-gnu"
-    else if stdenv.system == "i686-darwin"
-    then "i686-apple-darwin"
-    else if stdenv.system == "x86_64-darwin"
-    then "x86_64-apple-darwin"
-    else abort "missing boostrap url for platform ${stdenv.system}";
-
-  # fetch hashes by running `print-hashes.sh 1.9.0`
-  bootstrapHash =
-    if stdenv.system == "i686-linux"
-    then "2951dec835827974d03c7aafbf2c969f39bb530e1c200fd46f90bc01772fae39"
-    else if stdenv.system == "x86_64-linux"
-    then "d0704d10237c66c3efafa6f7e5570c59a1d3fe5c6d99487540f90ebb37cd84c4"
-    else if stdenv.system == "i686-darwin"
-    then "c7aa93e2475aa8e65259f606ca70e98da41cf5d2b20f91703b98f9572a84f7e6"
-    else if stdenv.system == "x86_64-darwin"
-    then "7204226b42e9c380d44e722efd4a886178a1867a064c90f12e0553a21a4184c6"
-    else throw "missing boostrap hash for platform ${stdenv.system}";
-in
-stdenv.mkDerivation rec {
-  name = "rustc-bootstrap-${version}";
-  version = "1.9.0";
-  src = fetchurl {
-     url = "https://static.rust-lang.org/dist/rustc-${version}-${platform}.tar.gz";
-     sha256 = bootstrapHash;
-  };
-  buildInputs = [makeWrapper];
-  phases = ["unpackPhase" "installPhase"];
-
-  installPhase = ''
-    mkdir -p "$out"
-    ./install.sh "--prefix=$out"
-
-    patchelf \
-      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-      "$out/bin/rustc"
-
-    wrapProgram "$out/bin/rustc"
-  '';
-}
diff --git a/pkgs/development/compilers/rustc/default.nix b/pkgs/development/compilers/rustc/default.nix
deleted file mode 100644
index dd7fd8a88dab..000000000000
--- a/pkgs/development/compilers/rustc/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ stdenv, callPackage, targets ? [], targetToolchains ? [] }:
-
-callPackage ./generic.nix {
-  shortVersion = "1.9.0";
-  isRelease = true;
-  forceBundledLLVM = false;
-  configureFlags = [ "--release-channel=stable" ];
-  srcRev = "e4e8b666850a763fdf1c3c2c142856ab51e32779";
-  srcSha = "167rh7hs77grn895h54s7np7f0k7b6i8z4wdfinncg4chy08hxq1";
-  patches = [ ./patches/remove-uneeded-git.patch ]
-    ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
-  rustc = callPackage ./snapshot.nix {};
-  inherit targets;
-  inherit targetToolchains;
-}
diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix
deleted file mode 100644
index a08843f494e9..000000000000
--- a/pkgs/development/compilers/rustc/generic.nix
+++ /dev/null
@@ -1,111 +0,0 @@
-{ stdenv, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps
-, llvm, jemalloc, ncurses, darwin, binutils, rustc, git
-
-, isRelease ? false
-, shortVersion
-, forceBundledLLVM ? false
-, srcSha, srcRev
-, configureFlags ? []
-, patches
-, targets
-, targetToolchains
-} @ args:
-
-let
-    version = if isRelease then
-        "${shortVersion}"
-      else
-        "${shortVersion}-g${builtins.substring 0 7 srcRev}";
-
-    name = "rustc-${version}";
-
-    procps = if stdenv.isDarwin then darwin.ps else args.procps;
-
-    llvmShared = llvm.override { enableSharedLibraries = true; };
-
-    target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
-
-    meta = with stdenv.lib; {
-      homepage = http://www.rust-lang.org/;
-      description = "A safe, concurrent, practical language";
-      maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington retrry ];
-      license = [ licenses.mit licenses.asl20 ];
-      platforms = platforms.linux ++ platforms.darwin;
-    };
-in
-
-stdenv.mkDerivation {
-  inherit name;
-  inherit version;
-  inherit meta;
-
-  __impureHostDeps = [ "/usr/lib/libedit.3.dylib" ];
-
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib";
-
-  src = fetchgit {
-    url = https://github.com/rust-lang/rust;
-    rev = srcRev;
-    sha256 = srcSha;
-  };
-
-  # We need rust to build rust. If we don't provide it, configure will try to download it.
-  configureFlags = configureFlags
-                ++ [ "--enable-local-rust" "--local-rust-root=${rustc}" "--enable-rpath" ]
-                # ++ [ "--jemalloc-root=${jemalloc}/lib"
-                ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils.out}/bin/ar" ]
-                ++ stdenv.lib.optional (stdenv.cc.cc ? isClang) "--enable-clang"
-                ++ stdenv.lib.optional (targets != []) "--target=${target}"
-                ++ stdenv.lib.optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";
-
-  inherit patches;
-  passthru.target = target;
-
-  postPatch = ''
-    substituteInPlace src/rust-installer/gen-install-script.sh \
-      --replace /bin/echo "$(type -P echo)"
-    substituteInPlace src/rust-installer/gen-installer.sh \
-      --replace /bin/echo "$(type -P echo)"
-
-    # Workaround for NixOS/nixpkgs#8676
-    substituteInPlace mk/rustllvm.mk \
-      --replace "\$\$(subst  /,//," "\$\$(subst /,/,"
-
-    # Fix dynamic linking against llvm
-    ${stdenv.lib.optionalString (!forceBundledLLVM) ''sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py''}
-
-    # Fix the configure script to not require curl as we won't use it
-    sed -i configure \
-      -e '/probe_need CFG_CURLORWGET/d'
-
-    # Fix the use of jemalloc prefixes which our jemalloc doesn't have
-    # TODO: reenable if we can figure out how to get our jemalloc to work
-    #[ -f src/liballoc_jemalloc/lib.rs ] && sed -i 's,je_,,g' src/liballoc_jemalloc/lib.rs
-    #[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+
-
-    # Useful debugging parameter
-    #export VERBOSE=1
-  '';
-
-  preConfigure = ''
-    # Needed flags as the upstream configure script has a broken prefix substitution
-    configureFlagsArray+=("--datadir=$out/share")
-    configureFlagsArray+=("--infodir=$out/share/info")
-  '';
-
-  # ps is needed for one of the test cases
-  nativeBuildInputs = [ file python2 procps rustc git ];
-  buildInputs = [ ncurses ] ++ targetToolchains
-    ++ stdenv.lib.optional (!forceBundledLLVM) llvmShared;
-
-  # https://github.com/rust-lang/rust/issues/30181
-  # enableParallelBuilding = false; # missing files during linking, occasionally
-
-  outputs = [ "out" "doc" ];
-  setOutputFlags = false;
-
-  preCheck = "export TZDIR=${tzdata}/share/zoneinfo";
-
-  doCheck = true;
-  dontSetConfigureCross = true;
-}
diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
deleted file mode 100644
index aa32416c6495..000000000000
--- a/pkgs/development/compilers/rustc/head.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# Please make sure to check if rustfmt still builds when updating nightly
-{ stdenv, callPackage, rustcStable, targets ? [], targetToolchains ? [] }:
-
-callPackage ./generic.nix {
-  shortVersion = "master-1.11.0";
-  forceBundledLLVM = false;
-  srcRev = "298730e7032cd55809423773da397cd5c7d827d4";
-  srcSha = "0hyz5j1z75sjkgsifzgxviv3b1lhgaz8wqwvmq80xx5vd78yd0c1";
-  patches = [ ./patches/disable-lockfile-check.patch
-              ./patches/use-rustc-1.9.0.patch ] ++
-    stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
-  rustc = rustcStable;
-  inherit targets;
-  inherit targetToolchains;
-}
diff --git a/pkgs/development/compilers/rustc/patches/disable-lockfile-check.patch b/pkgs/development/compilers/rustc/patches/disable-lockfile-check.patch
deleted file mode 100644
index 0c01cb1a7f19..000000000000
--- a/pkgs/development/compilers/rustc/patches/disable-lockfile-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e7378e267bba203bd593b49705c24303b0a46cb7 Mon Sep 17 00:00:00 2001
-From: David Craven <david@craven.ch>
-Date: Wed, 1 Jun 2016 01:41:35 +0200
-Subject: [PATCH] disable-lockfile-check
-
----
- src/tools/tidy/src/main.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs
-index 2839bbd..50142ff 100644
---- a/src/tools/tidy/src/main.rs
-+++ b/src/tools/tidy/src/main.rs
-@@ -47,7 +47,7 @@ fn main() {
-     errors::check(&path, &mut bad);
-     cargo::check(&path, &mut bad);
-     features::check(&path, &mut bad);
--    cargo_lock::check(&path, &mut bad);
-+    //cargo_lock::check(&path, &mut bad);
- 
-     if bad {
-         panic!("some tidy checks failed");
--- 
-2.8.3
-
diff --git a/pkgs/development/compilers/rustc/patches/grsec.patch b/pkgs/development/compilers/rustc/patches/grsec.patch
deleted file mode 100644
index b97b40c24091..000000000000
--- a/pkgs/development/compilers/rustc/patches/grsec.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile
-index b22f34f..c6489bd 100644
---- a/src/test/run-make/relocation-model/Makefile
-+++ b/src/test/run-make/relocation-model/Makefile
-@@ -2,9 +2,11 @@
- 
- all: others
- 	$(RUSTC) -C relocation-model=dynamic-no-pic foo.rs
-+	paxctl -czexm $(TMPDIR)/foo
- 	$(call RUN,foo)
- 
- 	$(RUSTC) -C relocation-model=default foo.rs
-+	paxctl -czexm $(TMPDIR)/foo
- 	$(call RUN,foo)
- 
- 	$(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs
-@@ -16,6 +18,7 @@ others:
- else
- others:
- 	$(RUSTC) -C relocation-model=static foo.rs
-+	paxctl -czexm $(TMPDIR)/foo
- 	$(call RUN,foo)
- 	$(RUSTC) -C relocation-model=static --crate-type=dylib foo.rs
- endif
diff --git a/pkgs/development/compilers/rustc/patches/remove-uneeded-git.patch b/pkgs/development/compilers/rustc/patches/remove-uneeded-git.patch
deleted file mode 100644
index 3c68d777f885..000000000000
--- a/pkgs/development/compilers/rustc/patches/remove-uneeded-git.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/etc/tidy.py b/src/etc/tidy.py
-index 9f5f919..a607180 100644
---- a/src/etc/tidy.py
-+++ b/src/etc/tidy.py
-@@ -66,13 +66,9 @@ def interesting_file(f):
-     return any(os.path.splitext(f)[1] == ext for ext in interesting_files)
- 
- 
--# Be careful to support Python 2.4, 2.6, and 3.x here!
--config_proc = subprocess.Popen(["git", "config", "core.autocrlf"],
--                               stdout=subprocess.PIPE)
--result = config_proc.communicate()[0]
- 
- true = "true".encode('utf8')
--autocrlf = result.strip() == true if result is not None else False
-+autocrlf = False
- 
- current_name = ""
- current_contents = ""
diff --git a/pkgs/development/compilers/rustc/patches/use-rustc-1.9.0.patch b/pkgs/development/compilers/rustc/patches/use-rustc-1.9.0.patch
deleted file mode 100644
index 150306744be6..000000000000
--- a/pkgs/development/compilers/rustc/patches/use-rustc-1.9.0.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2710f3c8ae142abe1720b3476cd1ca60cee0c077 Mon Sep 17 00:00:00 2001
-From: David Craven <david@craven.ch>
-Date: Wed, 1 Jun 2016 00:12:35 +0200
-Subject: [PATCH] Patch stage0.txt to use rustc 1.9.0
-
----
- src/stage0.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/stage0.txt b/src/stage0.txt
-index 58b7f8f..3c84cab 100644
---- a/src/stage0.txt
-+++ b/src/stage0.txt
-@@ -12,6 +12,6 @@
- # tarball for a stable release you'll likely see `1.x.0-$date` where `1.x.0` was
- # released on `$date`
- 
--rustc: beta-2016-04-13
--rustc_key: c2743eb4
-+rustc: 1.9.0-2016-05-24
-+rustc_key: d16b8f0e
- cargo: nightly-2016-04-10
--- 
-2.8.3
-
diff --git a/pkgs/development/compilers/rustc/print-hashes.sh b/pkgs/development/compilers/rustc/print-hashes.sh
deleted file mode 100755
index 710d4c0b585c..000000000000
--- a/pkgs/development/compilers/rustc/print-hashes.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-PLATFORMS="i686-unknown-linux-gnu x86_64-unknown-linux-gnu i686-apple-darwin x86_64-apple-darwin"
-BASEURL="https://static.rust-lang.org/dist"
-VERSION=$1
-
-if [[ -z  $VERSION ]]
-then
-    echo "No version supplied"
-    exit -1
-fi
-
-for PLATFORM in $PLATFORMS
-do
-    URL="$BASEURL/rustc-$VERSION-$PLATFORM.tar.gz.sha256"
-    curl $URL
-done
diff --git a/pkgs/development/compilers/rustc/snapshot.nix b/pkgs/development/compilers/rustc/snapshot.nix
deleted file mode 100644
index 8f7005dc0d76..000000000000
--- a/pkgs/development/compilers/rustc/snapshot.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-/* NOTE: Rust 1.9.0 is the last version that uses snapshots
-         This file can be deleted after the 1.10.0 release and bootstrap.nix
-         can be used instead
-*/
-{ stdenv, fetchurl }:
-
-let
-  platform = if stdenv.system == "i686-linux"
-    then "linux-i386"
-    else if stdenv.system == "x86_64-linux"
-    then "linux-x86_64"
-    else if stdenv.system == "i686-darwin"
-    then "macos-i386"
-    else if stdenv.system == "x86_64-darwin"
-    then "macos-x86_64"
-    else abort "no snapshot to bootstrap for this platform (missing platform url suffix)";
-
-  /* Rust is bootstrapped from an earlier built version. We need
-    to fetch these earlier versions, which vary per platform.
-    The shapshot info you want can be found at
-    https://github.com/rust-lang/rust/blob/{$shortVersion}/src/snapshots.txt
-    with the set you want at the top. Make sure this is the latest snapshot
-    for the tagged release and not a snapshot in the current HEAD.
-  */
-
-  snapshotHashLinux686 = "0e0e4448b80d0a12b75485795244bb3857a0a7ef";
-  snapshotHashLinux64 = "1273b6b6aed421c9e40c59f366d0df6092ec0397";
-  snapshotHashDarwin686 = "9f9c0b4a2db09acbce54b792fb8839a735585565";
-  snapshotHashDarwin64 = "52570f6fd915b0210a9be98cfc933148e16a75f8";
-  snapshotDate = "2016-03-18";
-  snapshotRev = "235d774";
-
-  snapshotHash = if stdenv.system == "i686-linux"
-    then snapshotHashLinux686
-    else if stdenv.system == "x86_64-linux"
-    then snapshotHashLinux64
-    else if stdenv.system == "i686-darwin"
-    then snapshotHashDarwin686
-    else if stdenv.system == "x86_64-darwin"
-    then snapshotHashDarwin64
-    else abort "no snapshot for platform ${stdenv.system}";
-
-  snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshotHash}.tar.bz2";
-in
-
-stdenv.mkDerivation {
-  name = "rust-bootstrap";
-  src = fetchurl {
-    url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}";
-    sha1 = snapshotHash;
-  };
-  dontStrip = true;
-  installPhase = ''
-    mkdir -p "$out"
-    cp -r bin "$out/bin"
-  '' + stdenv.lib.optionalString stdenv.isLinux ''
-    patchelf --interpreter "${stdenv.glibc.out}/lib/${stdenv.cc.dynamicLinker}" \
-             --set-rpath "${stdenv.cc.cc.lib}/lib/:${stdenv.cc.cc.lib}/lib64/" \
-             "$out/bin/rustc"
-  '';
-}
diff --git a/pkgs/development/tools/build-managers/cargo/bootstrap.nix b/pkgs/development/tools/build-managers/cargo/bootstrap.nix
deleted file mode 100644
index c4052232a8bb..000000000000
--- a/pkgs/development/tools/build-managers/cargo/bootstrap.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, cacert, zlib, rustc }:
-
-let
-  platform =
-    if stdenv.system == "i686-linux"
-    then "i686-unknown-linux-gnu"
-    else if stdenv.system == "x86_64-linux"
-    then "x86_64-unknown-linux-gnu"
-    else if stdenv.system == "i686-darwin"
-    then "i686-apple-darwin"
-    else if stdenv.system == "x86_64-darwin"
-    then "x86_64-apple-darwin"
-    else abort "missing boostrap url for platform ${stdenv.system}";
-
-  # fetch hashes by running `print-hashes.sh 1.9.0`
-  bootstrapHash =
-    if stdenv.system == "i686-linux"
-    then "dd4d9bf1b9393867eb18d00431e8fb733894984f2c7b5154bc1b64d045077b45"
-    else if stdenv.system == "x86_64-linux"
-    then "288ff13efa2577e81c77fc2cb6e2b49b1ed0ceab51b4fa12f7efb87039ac49b7"
-    else if stdenv.system == "i686-darwin"
-    then "4d4d4b256d6bd6ae2527cf61007b2553de200f0a1910b7ad41e4f51d2b21e536"
-    else if stdenv.system == "x86_64-darwin"
-    then "d59b5509e69c1cace20a57072e3b3ecefdbfd8c7e95657b0ff2ac10aa1dfebe6"
-    else throw "missing boostrap hash for platform ${stdenv.system}";
-in
-stdenv.mkDerivation rec {
-  name = "cargo-bootstrap-${version}";
-  version = "1.9.0";
-
-  src = fetchurl {
-     url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz";
-     sha256 = bootstrapHash;
-  };
-
-  passthru.rustc = rustc;
-  buildInputs = [makeWrapper zlib];
-  phases = ["unpackPhase" "installPhase"];
-
-  installPhase = ''
-    cp -r cargo "$out"
-
-    patchelf \
-      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-      "$out/bin/cargo"
-
-    wrapProgram "$out/bin/cargo" \
-      --suffix PATH : "${rustc}/bin"
-  '';
-}
diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
deleted file mode 100644
index 253a62e7bbe2..000000000000
--- a/pkgs/development/tools/build-managers/cargo/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ stdenv, callPackage, rustc, makeRustPlatform, recurseIntoAttrs }:
-
-let
-  cargoBootstrap = callPackage ./bootstrap.nix {};
-  rustPlatformBootstrap = recurseIntoAttrs (makeRustPlatform cargoBootstrap rustPlatformBootstrap);
-in
-callPackage ./generic.nix rec {
-  version = "0.10.0";
-  srcRev = "refs/tags/${version}";
-  srcSha = "06scvx5qh60mgvlpvri9ig4np2fsnicsfd452fi9w983dkxnz4l2";
-  depsSha256 = "0js4697n7v93wnqnpvamhp446w58llj66za5hkd6wannmc0gsy3b";
-  inherit rustc;
-  rustPlatform = rustPlatformBootstrap;
-}
diff --git a/pkgs/development/tools/build-managers/cargo/generic.nix b/pkgs/development/tools/build-managers/cargo/generic.nix
deleted file mode 100644
index 4f74166bf625..000000000000
--- a/pkgs/development/tools/build-managers/cargo/generic.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ stdenv, fetchgit, file, curl, pkgconfig, python, openssl, cmake, zlib
-, makeWrapper, libiconv, cacert, rustPlatform, rustc
-, version, srcRev, srcSha, depsSha256 }:
-
-rustPlatform.buildRustPackage rec {
-  name = "cargo-${version}";
-  inherit version;
-
-  src = fetchgit {
-    url = "https://github.com/rust-lang/cargo";
-    rev = srcRev;
-    sha256 = srcSha;
-  };
-
-  inherit depsSha256;
-
-  passthru.rustc = rustc;
-
-  buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ]
-    ++ stdenv.lib.optional stdenv.isDarwin libiconv;
-
-  configurePhase = ''
-    ./configure --enable-optimize --prefix=$out --local-cargo=${rustPlatform.cargo}/bin/cargo
-  '';
-
-  buildPhase = "make";
-
-  installPhase = ''
-    make install
-    ${postInstall}
-  '';
-
-  postInstall = ''
-    rm "$out/lib/rustlib/components" \
-       "$out/lib/rustlib/install.log" \
-       "$out/lib/rustlib/rust-installer-version" \
-       "$out/lib/rustlib/uninstall.sh" \
-       "$out/lib/rustlib/manifest-cargo"
-
-    wrapProgram "$out/bin/cargo" \
-      --suffix PATH : "${rustc}/bin" \
-      --run "export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt" \
-      ${stdenv.lib.optionalString stdenv.isDarwin ''--suffix DYLD_LIBRARY_PATH : "${rustc}/lib"''}
-  '';
-
-  checkPhase = ''
-    # Export SSL_CERT_FILE as without it one test fails with SSL verification error
-    export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
-    # Disable cross compilation tests
-    export CFG_DISABLE_CROSS_TESTS=1
-    cargo test
-  '';
-
-  # Disable check phase as there are failures (author_prefers_cargo test fails)
-  doCheck = false;
-
-  meta = with stdenv.lib; {
-    homepage = http://crates.io;
-    description = "Downloads your Rust project's dependencies and builds your project";
-    maintainers = with maintainers; [ wizeman retrry ];
-    license = [ licenses.mit licenses.asl20 ];
-    platforms = platforms.linux ++ platforms.darwin;
-  };
-}
diff --git a/pkgs/development/tools/build-managers/cargo/head.nix b/pkgs/development/tools/build-managers/cargo/head.nix
deleted file mode 100644
index 0faaf5e9a719..000000000000
--- a/pkgs/development/tools/build-managers/cargo/head.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, callPackage, rustc, rustPlatform }:
-
-callPackage ./generic.nix rec {
-  version = "2016.06.07";
-  srcRev = "3e70312a2a4ebedace131fc63bb8f27463c5db28";
-  srcSha = "0nibzyfjkiqfnq0c00hhqvs856l5qls8wds252p97q5q92yvp40f";
-  depsSha256 = "1xbb33aqnf5yyws6gjys9w8kznbh9rh6hw8mpg1hhq1ahipc2j1f";
-  inherit rustc;
-  inherit rustPlatform;
-}
diff --git a/pkgs/development/tools/build-managers/cargo/print-hashes.sh b/pkgs/development/tools/build-managers/cargo/print-hashes.sh
deleted file mode 100755
index 4d1d20066b85..000000000000
--- a/pkgs/development/tools/build-managers/cargo/print-hashes.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-PLATFORMS="i686-unknown-linux-gnu x86_64-unknown-linux-gnu i686-apple-darwin x86_64-apple-darwin"
-BASEURL="https://static.rust-lang.org/dist"
-VERSION=$1
-
-if [[ -z  $VERSION ]]
-then
-    echo "No version supplied"
-    exit -1
-fi
-
-for PLATFORM in $PLATFORMS
-do
-    URL="$BASEURL/rust-$VERSION-$PLATFORM.tar.gz.sha256"
-    curl $URL
-done
diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index 76f5354d596d..0f4477c9b3ff 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -17,13 +17,13 @@ buildRustPackage rec {
   buildInputs = [ makeWrapper ];
 
   preCheck = ''
-    export RUST_SRC;_PATH="${rustc.src}/src"
+    export RUST_SRC;_PATH="${rustPlatform.rust.rustc.src}/src"
   '';
 
   installPhase = ''
     mkdir -p $out/bin
     cp -p target/release/racer $out/bin/
-    wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustc.src}/src"
+    wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustPlatform.rust.rustc.src}/src"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix
index a5a3418388d6..d1e3ba8b0cb7 100644
--- a/pkgs/development/tools/rust/racerd/default.nix
+++ b/pkgs/development/tools/rust/racerd/default.nix
@@ -17,7 +17,7 @@ buildRustPackage rec {
 
   buildInputs = [ makeWrapper ];
 
-  RUST_SRC_PATH = ''${rustc.src}/src'';
+  RUST_SRC_PATH = ''${rustPlatform.rust.rustc.src}/src'';
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index f6f6f68d89a0..8a36263ebb6a 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,7 +1,7 @@
 # TODO check that no license information gets lost
 { fetchurl, bash, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip
 , which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages, zip
-, vim_configurable, vimPlugins, xkb_switch, git, racerdRust, fzf
+, vim_configurable, vimPlugins, xkb_switch, git, rustracerd, fzf
 , Cocoa ? null
 }:
 
@@ -1116,7 +1116,7 @@ rec {
     ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
 
     propogatedBuildInputs = [
-      racerdRust
+      rustracerd
     ];
 
     buildPhase = ''
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
index 12bcf53f1e04..a27b1f053a29 100644
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
@@ -5,7 +5,7 @@
     ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
 
     propogatedBuildInputs = [
-      racerdRust
+      rustracerd
     ];
 
     buildPhase = ''
diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix
index 39ba9bb2e509..14d1417e5a42 100644
--- a/pkgs/tools/misc/exa/default.nix
+++ b/pkgs/tools/misc/exa/default.nix
@@ -6,7 +6,7 @@ buildRustPackage rec {
   name = "exa-${version}";
   version = "2016-04-20";
 
-  depsSha256 = "1rpynsni2r3gim10xc1qkj51wpbzafwsr99y61zh41v4vh047g1k";
+  depsSha256 = "0dm8zaxy29pfbq68ysssab9i06sj4azgi3vib9617rklg7w3hdmk";
 
   src = fetchFromGitHub {
     owner = "ogham";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4653fcbb1d5..298c7f1c07ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5261,32 +5261,31 @@ in
 
   rtags = callPackage ../development/tools/rtags/default.nix {};
 
-  rustc = rustcStable;
-  rustcStable = callPackage ../development/compilers/rustc {};
-  rustcBeta = lowPrio (callPackage ../development/compilers/rustc/beta.nix {});
-  rustcUnstable = lowPrio (callPackage ../development/compilers/rustc/head.nix {});
+  rust = rustStable;
+  rustStable = callPackage ../development/compilers/rust {};
+  rustBeta = lowPrio (callPackage ../development/compilers/rust/beta.nix {});
+  rustUnstable = lowPrio (callPackage ../development/compilers/rust/head.nix {});
 
-  cargo = callPackage ../development/tools/build-managers/cargo {};
-  cargoUnstable = lowPrio (callPackage ../development/tools/build-managers/cargo/head.nix {});
+  cargo = rust.cargo;
+  rustc = rust.rustc;
+  rustPlatform = recurseIntoAttrs (makeRustPlatform rust rustPlatform);
 
-  rustPlatform = recurseIntoAttrs (makeRustPlatform cargo rustPlatform);
-
-  makeRustPlatform = cargo: self:
+  makeRustPlatform = rust: self:
     let
       callPackage = newScope self;
     in {
-      inherit cargo;
-
-      rustc = cargo.rustc;
+      inherit rust;
 
       rustRegistry = callPackage ./rust-packages.nix { };
 
       buildRustPackage = callPackage ../build-support/rust {
-        inherit cargo;
+        inherit rust;
       };
     };
 
   rustfmt = callPackage ../development/tools/rust/rustfmt { };
+  rustracer = callPackage ../development/tools/rust/racer { };
+  rustracerd = callPackage ../development/tools/rust/racerd { };
 
   sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};
   sbcl = callPackage ../development/compilers/sbcl {};
@@ -6363,10 +6362,6 @@ in
     withDocumentation = false; # 'true' is currently broken with qt>=5.5
   };
 
-  racerRust = callPackage ../development/tools/rust/racer { };
-
-  racerdRust = callPackage ../development/tools/rust/racerd { };
-
   radare = callPackage ../development/tools/analysis/radare {
     inherit (gnome) vte;
     lua = lua5;
@@ -7494,7 +7489,7 @@ in
   };
   libkrb5 = self.krb5Full.override { type = "lib"; };
 
-  lasso = callPackage ../development/libraries/lasso { };  
+  lasso = callPackage ../development/libraries/lasso { };
 
   LASzip = callPackage ../development/libraries/LASzip { };
 
-- 
cgit 1.4.1


From 41d523a8bc91767a47cdcede69037a3989cbf5aa Mon Sep 17 00:00:00 2001
From: Benno Fünfstück <benno.fuenfstueck@gmail.com>
Date: Wed, 15 Jun 2016 23:55:57 +0200
Subject: gnome-breeze: init

---
 pkgs/misc/themes/gnome-breeze/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/misc/themes/gnome-breeze/default.nix

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/themes/gnome-breeze/default.nix b/pkgs/misc/themes/gnome-breeze/default.nix
new file mode 100644
index 000000000000..ac0fb2cfee7d
--- /dev/null
+++ b/pkgs/misc/themes/gnome-breeze/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation {
+  name = "gnome-breeze";
+  src = fetchgit {
+    url = "https://github.com/dirruk1/gnome-breeze";
+    sha256 = "0hkk0gqlnrs1m4rb5r84f5y96qfamrbiwm09z89yc32124x1a1lm";
+    rev = "49a5cd67a270e13a4c04a4b904f126ef728e9221";
+  };
+  installPhase = ''
+    mkdir -p $out/share/themes
+    cp -r Breeze* $out/share/themes
+  '';
+
+  meta = {
+    description = "A GTK theme built to match KDE's breeze theme";
+    homepage = "https://github.com/dirruk1/gnome-breeze";
+    license = stdenv.lib.licenses.lgpl2;
+    maintainers = with stdenv.lib.maintainers; [ bennofs ];
+    platforms = stdenv.lib.platforms.all;
+    hydraPlatforms = [];
+    preferLocalBuild = true;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8148ccc178a2..e816b0c33779 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16563,6 +16563,8 @@ in
     x11Support = true;
   });
 
+  gnome-breeze = callPackage ../misc/themes/gnome-breeze { };
+
   gnuk = callPackage ../misc/gnuk { };
   gnuk-unstable = lowPrio (callPackage ../misc/gnuk/unstable.nix { });
   gnuk-git = lowPrio (callPackage ../misc/gnuk/git.nix { });
-- 
cgit 1.4.1


From a20b8c114be5944399e7ad6976dca823d7fc6b92 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 17 Jun 2016 08:16:39 +0200
Subject: vimPlugins: added deoplete-jedi

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 8a36263ebb6a..8ded4ca98cbd 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -375,6 +375,17 @@ rec {
 
   };
 
+  deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "deoplete-jedi-2016-06-5";
+    src = fetchgit {
+      url = "git://github.com/zchee/deoplete-jedi";
+      rev = "36aec0d7166f9e18e05b45468e161f01909d77ec";
+      sha256 = "0h8vn7r5fkwvbxhqx6xh95iq1klz9ppbax9l3rxlfkp3w67kkj2k";
+    };
+    dependencies = [];
+
+  };
+
   Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "Spacegray-vim-2016-06-04";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 1771a618e143..7069a8021f35 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -22,6 +22,7 @@
 "github:Chiel92/vim-autoformat"
 "github:LnL7/vim-nix"
 "github:Shougo/deoplete.nvim"
+"github:zchee/deoplete-jedi"
 "github:ajh17/Spacegray.vim"
 "github:alvan/vim-closetag"
 "github:ap/vim-css-color"
-- 
cgit 1.4.1


From 08f41462d7db05629a5fd8aed8a7f978b62411a9 Mon Sep 17 00:00:00 2001
From: Márton Boros <martonboros@gmail.com>
Date: Sat, 18 Jun 2016 08:35:36 +0200
Subject: urbit: 2015.09.26 -> 2016-06-02

Updated to latest revision in urbit git master, fixes build error caused by missing sources.
Updated description and website.
Fixed date/version format to ISO 8061.
---
 pkgs/misc/urbit/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix
index e4049f07897a..abfeb4dd22d7 100644
--- a/pkgs/misc/urbit/default.nix
+++ b/pkgs/misc/urbit/default.nix
@@ -1,15 +1,16 @@
-{ stdenv, fetchgit, gcc, gmp, libsigsegv, openssl, automake, autoconf, ragel,
+{ stdenv, fetchFromGitHub, gcc, gmp, libsigsegv, openssl, automake, autoconf, ragel,
   cmake, re2c, libtool, ncurses, perl, zlib, python }:
 
 stdenv.mkDerivation rec {
 
   name = "urbit-${version}";
-  version = "2015.09.26";
+  version = "2016-06-02";
 
-  src = fetchgit {
-    url = "https://github.com/urbit/urbit.git";
-    rev = "c9592664c797b2dd74f26886528656f8a7058640";
-    sha256 = "0sgrxnmpqh54mgar81wlb6gff8c0pc24p53xwxr448g5shvnzjx9";
+  src = fetchFromGitHub {
+    owner = "urbit";
+    repo = "urbit";
+    rev = "8c113559872e4a97bce3f3ee5b370ad9545c7459";
+    sha256 = "055qdpp4gm0v04pddq4380pdsi0gp2ybgv1d2lchkhwsnjyl46jl";
   };
 
   buildInputs = with stdenv.lib; [
@@ -34,8 +35,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "an operating function";
-    homepage = http://urbit.org/preview/~2015.9.25/materials;
+    description = "An operating function";
+    homepage = http://urbit.org;
     license = licenses.mit;
     maintainers = with maintainers; [ mudri ];
   };
-- 
cgit 1.4.1


From 915edac0ce0806ba65f1d73db7b80dcd3d13da9e Mon Sep 17 00:00:00 2001
From: Severen Redwood <severen@shrike.me>
Date: Sat, 18 Jun 2016 23:33:29 +1200
Subject: adapta-gtk-theme: Init at 3.21.2

---
 lib/maintainers.nix                 |  1 +
 pkgs/misc/themes/adapta/default.nix | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 3 files changed, 30 insertions(+)
 create mode 100644 pkgs/misc/themes/adapta/default.nix

(limited to 'pkgs/misc')

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index c6a10610354d..151412a9400e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -359,6 +359,7 @@
   spinus = "Tomasz Czyż <tomasz.czyz@gmail.com>";
   sprock = "Roger Mason <rmason@mun.ca>";
   spwhitt = "Spencer Whitt <sw@swhitt.me>";
+  SShrike = "Severen Redwood <severen@shrike.me>";
   stephenmw = "Stephen Weinberg <stephen@q5comm.com>";
   steveej = "Stefan Junker <mail@stefanjunker.de>";
   swistak35 = "Rafał Łasocha <me@swistak35.com>";
diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
new file mode 100644
index 000000000000..96c43af84854
--- /dev/null
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  name = "adapta-gtk-theme-${version}";
+  version = "3.21.2";
+
+  meta = with stdenv.lib; {
+    description = "An adaptive GTK+ theme based on Material Design";
+    homepage = "https://github.com/tista500/Adapta";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.SShrike ];
+  };
+
+  src = fetchFromGitHub {
+    owner = "tista500";
+    repo = "Adapta";
+    rev = "c48da995abc46087c22b05d2cdb0975d10774641";
+    sha256 = "17w9nsrwqwgafswyvhc5h8ld2ggi96ix5fjv6yf1hfz3l1ln9qg7";
+  };
+
+  preferLocalBuild = true;
+  buildInputs = [ gtk-engine-murrine ];
+  nativeBuildInputs = [ autoreconfHook ];
+
+  configureFlags = "--enable-chrome --disable-unity";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4228ffaee052..d6c8ecb6ae88 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -501,6 +501,8 @@ in
 
   arc-gtk-theme = callPackage ../misc/themes/arc { };
 
+  adapta-gtk-theme = callPackage ../misc/themes/adapta { };
+
   aria2 = callPackage ../tools/networking/aria2 {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-- 
cgit 1.4.1


From e83687fe8ef183aa9afc46bbbcce797d6232ccc2 Mon Sep 17 00:00:00 2001
From: Severen Redwood <severen@shrike.me>
Date: Sun, 19 Jun 2016 01:48:55 +1200
Subject: Clean up the inconsistent naming of themes

---
 pkgs/misc/themes/numix-gtk-theme/default.nix | 31 ----------------------------
 pkgs/misc/themes/numix/default.nix           | 31 ++++++++++++++++++++++++++++
 pkgs/misc/themes/paper-gtk-theme/default.nix | 31 ----------------------------
 pkgs/misc/themes/paper/default.nix           | 31 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  4 ++--
 5 files changed, 64 insertions(+), 64 deletions(-)
 delete mode 100644 pkgs/misc/themes/numix-gtk-theme/default.nix
 create mode 100644 pkgs/misc/themes/numix/default.nix
 delete mode 100644 pkgs/misc/themes/paper-gtk-theme/default.nix
 create mode 100644 pkgs/misc/themes/paper/default.nix

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/themes/numix-gtk-theme/default.nix b/pkgs/misc/themes/numix-gtk-theme/default.nix
deleted file mode 100644
index b8dac2540090..000000000000
--- a/pkgs/misc/themes/numix-gtk-theme/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchFromGitHub, sass, glib, libxml2, gdk_pixbuf
-, gtk-engine-murrine
-}:
-
-stdenv.mkDerivation rec {
-  version = "2016-06-12";
-  name = "numix-gtk-theme-${version}";
-
-  src = fetchFromGitHub {
-    repo = "numix-gtk-theme";
-    owner = "numixproject";
-    rev = "1d941a15971f43fb2f5675c7059bf313b78797fc";
-    sha256 = "14b1gl761acdza4bkqr6dvsblvi2wsph79j5jircxfd3wgvm756i";
-  };
-
-  nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ];
-
-  buildInputs = [ gtk-engine-murrine ];
-
-  postPatch = ''
-    substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out
-  '';
-
-  meta = {
-    description = "Modern flat theme with a combination of light and dark elements (GNOME, Unity, Xfce and Openbox)";
-    homepage = https://numixproject.org;
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
-  };
-}
diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix
new file mode 100644
index 000000000000..b8dac2540090
--- /dev/null
+++ b/pkgs/misc/themes/numix/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, sass, glib, libxml2, gdk_pixbuf
+, gtk-engine-murrine
+}:
+
+stdenv.mkDerivation rec {
+  version = "2016-06-12";
+  name = "numix-gtk-theme-${version}";
+
+  src = fetchFromGitHub {
+    repo = "numix-gtk-theme";
+    owner = "numixproject";
+    rev = "1d941a15971f43fb2f5675c7059bf313b78797fc";
+    sha256 = "14b1gl761acdza4bkqr6dvsblvi2wsph79j5jircxfd3wgvm756i";
+  };
+
+  nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ];
+
+  buildInputs = [ gtk-engine-murrine ];
+
+  postPatch = ''
+    substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out
+  '';
+
+  meta = {
+    description = "Modern flat theme with a combination of light and dark elements (GNOME, Unity, Xfce and Openbox)";
+    homepage = https://numixproject.org;
+    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+  };
+}
diff --git a/pkgs/misc/themes/paper-gtk-theme/default.nix b/pkgs/misc/themes/paper-gtk-theme/default.nix
deleted file mode 100644
index 5dfb54fa493c..000000000000
--- a/pkgs/misc/themes/paper-gtk-theme/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }:
-
-stdenv.mkDerivation rec {
-  version = "2016-05-27";
-  name = "paper-gtk-theme-${version}";
-
-  src = fetchFromGitHub {
-    owner = "snwh";
-    repo = "paper-gtk-theme";
-    rev = "06fb8b41743dd99410c08a9beabc323e6631d009";
-    sha256 = "1gffjsgs43rvxs8ryd5c3yfrp3a69d5wvjmiixwwp1qn1fr46dni";
-  };
-
-  nativeBuildInputs = [ autoreconfHook ];
-
-  buildInputs = [ gtk_engines ];
-
-  postPatch = ''
-    substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out
-  '';
-
-  preferLocalBuild = true;
-
-  meta = with stdenv.lib; {
-    description = "A modern desktop theme suite featuring a mostly flat with a minimal use of shadows for depth";
-    homepage = "http://snwh.org/paper";
-    license = licenses.gpl3;
-    maintainers = [ maintainers.simonvandel maintainers.romildo ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/misc/themes/paper/default.nix b/pkgs/misc/themes/paper/default.nix
new file mode 100644
index 000000000000..5dfb54fa493c
--- /dev/null
+++ b/pkgs/misc/themes/paper/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }:
+
+stdenv.mkDerivation rec {
+  version = "2016-05-27";
+  name = "paper-gtk-theme-${version}";
+
+  src = fetchFromGitHub {
+    owner = "snwh";
+    repo = "paper-gtk-theme";
+    rev = "06fb8b41743dd99410c08a9beabc323e6631d009";
+    sha256 = "1gffjsgs43rvxs8ryd5c3yfrp3a69d5wvjmiixwwp1qn1fr46dni";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  buildInputs = [ gtk_engines ];
+
+  postPatch = ''
+    substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out
+  '';
+
+  preferLocalBuild = true;
+
+  meta = with stdenv.lib; {
+    description = "A modern desktop theme suite featuring a mostly flat with a minimal use of shadows for depth";
+    homepage = "http://snwh.org/paper";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.simonvandel maintainers.romildo ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6c8ecb6ae88..ad3d07ebbf22 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2817,7 +2817,7 @@ in
 
   pamtester = callPackage ../tools/security/pamtester { };
 
-  paper-gtk-theme = callPackage ../misc/themes/paper-gtk-theme { };
+  paper-gtk-theme = callPackage ../misc/themes/paper { };
 
   par2cmdline = callPackage ../tools/networking/par2cmdline { };
 
@@ -15843,7 +15843,7 @@ in
 
   gnome_themes_standard = gnome3.gnome_themes_standard;
 
-  numix-gtk-theme = callPackage ../misc/themes/numix-gtk-theme { };
+  numix-gtk-theme = callPackage ../misc/themes/numix { };
 
   kde5PackagesFun = self: with self; {
 
-- 
cgit 1.4.1


From 97c484a10f4b38efc4fb3dd210defed96003ae7d Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 19 Jun 2016 10:18:30 +0200
Subject: treewide: fix #include errors after gcc-5.4

They were mostly missing <cmath> or <math.h>.
---
 pkgs/applications/graphics/leocad/default.nix                |  1 +
 pkgs/applications/graphics/photivo/default.nix               | 12 ++++++++----
 pkgs/applications/misc/cli-visualizer/default.nix            |  4 ++++
 pkgs/applications/misc/termite/default.nix                   |  2 ++
 .../applications/science/robotics/qgroundcontrol/default.nix |  5 +++++
 pkgs/applications/video/simplescreenrecorder/default.nix     |  4 ++++
 pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix    |  3 +++
 pkgs/development/libraries/botan/generic.nix                 |  2 ++
 pkgs/development/libraries/botan/unstable.nix                |  1 +
 pkgs/development/libraries/xgboost/default.nix               |  2 ++
 pkgs/development/tools/misc/hydra/default.nix                |  8 +++++++-
 pkgs/games/cataclysm-dda/default.nix                         |  3 +++
 pkgs/games/dwarf-fortress/dfhack/default.nix                 |  1 +
 pkgs/games/dwarf-fortress/unfuck.nix                         |  2 ++
 pkgs/games/openspades/default.nix                            |  5 ++++-
 pkgs/games/openspades/git.nix                                |  2 ++
 pkgs/games/the-butterfly-effect/default.nix                  |  4 ++++
 pkgs/misc/emulators/higan/default.nix                        |  1 +
 pkgs/misc/emulators/pcsx2/default.nix                        |  4 ++++
 pkgs/os-specific/linux/sysdig/default.nix                    |  3 +++
 20 files changed, 63 insertions(+), 6 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix
index 884dc1158534..96384765bd03 100644
--- a/pkgs/applications/graphics/leocad/default.nix
+++ b/pkgs/applications/graphics/leocad/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ qt4 qmake4Hook zlib ];
 
   postPatch = ''
+    sed '1i#include <cmath>' -i common/camera.cpp
     substituteInPlace common/camera.cpp --replace "isnan(" "std::isnan("
     export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out"
   '';
diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix
index 12816ba96af4..d84363df899e 100644
--- a/pkgs/applications/graphics/photivo/default.nix
+++ b/pkgs/applications/graphics/photivo/default.nix
@@ -10,15 +10,19 @@ stdenv.mkDerivation rec {
     sha256 = "0f6y18k7db2ci6xn664zcwm1g1k04sdv7gg1yd5jk41bndjb7z8h";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
-
-  buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ];
-  patchPhase = '' # kinda icky
+  postPatch = '' # kinda icky
     sed -e '/("@INSTALL@")/d' \
         -e s,@INSTALL@,$out/share/photivo, \
         -i Sources/ptSettings.cpp
+    sed '1i#include <math.h>' -i Sources/filters/ptFilter_StdCurve.cpp
   '';
 
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ];
+
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
       platforms = platforms.linux;
       maintainers = [ maintainers.mornfall ];
diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix
index 6b9856a996ac..1c7fd62f8ecc 100644
--- a/pkgs/applications/misc/cli-visualizer/default.nix
+++ b/pkgs/applications/misc/cli-visualizer/default.nix
@@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
     sha256 = "16768gyi85mkizfn874q2q9xf32knw08z27si3k5bk99492dxwzw";
   };
 
+  postPatch = ''
+    sed '1i#include <cmath>' -i src/Transformer/SpectrumCircleTransformer.cpp
+  '';
+
   buildInputs = [ fftw ncurses libpulseaudio ];
 
   buildFlags = [ "ENABLE_PULSE=1" ];
diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index 33bc29f871c7..33c42e3dc1dd 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/misc/termite/default.nix
@@ -13,6 +13,8 @@ let
       sha256 = "1cw4yw7n9m2si8b7zcfyz9pyihncabxm5g39v1mxslfajxgwzmd8";
     };
 
+    postPatch = "sed '1i#include <math.h>' -i termite.cc";
+
     makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ];
 
     buildInputs = [ pkgconfig vte gtk3 ncurses ];
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index b67da5b55162..37e9c9c858f1 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -27,6 +27,11 @@ stdenv.mkDerivation rec {
  ] ++ qtInputs;
 
   patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ];
+  postPatch = ''
+    sed '1i#include <cmath>' -i src/Vehicle/Vehicle.cc \
+      -i src/comm/{QGCFlightGearLink,QGCJSBSimLink}.cc \
+      -i src/{uas/UAS,ui/QGCDataPlot2D}.cc
+  '';
 
   preConfigure = ''
     mkdir build
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index a5fb122cf897..3ea04a39393b 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -11,11 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "1d89ncspjd8c4mckf0nb6y3hrxpv4rjpbj868pznhvfmdgr5nvql";
   };
 
+  postPatch = "sed '1i#include <random>' -i src/Benchmark.cpp";
+
   buildInputs = [
     alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa pkgconfig
     libpulseaudio qt4
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "A screen recorder for Linux";
     homepage = http://www.maartenbaert.be/simplescreenrecorder;
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
index 618e7387e62c..2a1d95806c10 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
@@ -34,6 +34,9 @@ plasmaPackage rec {
     })
     ./0003-tzdir.patch
   ];
+  postPatch = ''
+    sed '1i#include <cmath>' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
+  '';
   NIX_CFLAGS_COMPILE = [ "-I${xorgserver.dev}/include/xorg" ];
   cmakeFlags = [
     "-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg"
diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix
index 823e50e32272..4a4ec5d9fe9c 100644
--- a/pkgs/development/libraries/botan/generic.nix
+++ b/pkgs/development/libraries/botan/generic.nix
@@ -2,6 +2,7 @@
 # Passed by version specific builders
 , baseVersion, revision, sha256
 , extraConfigureFlags ? ""
+, postPatch ? null
 , ...
 }:
 
@@ -17,6 +18,7 @@ stdenv.mkDerivation rec {
     ];
     inherit sha256;
   };
+  inherit postPatch;
 
   buildInputs = [ python bzip2 zlib gmp openssl boost ];
 
diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix
index dd185f21035d..d952b50aeb8e 100644
--- a/pkgs/development/libraries/botan/unstable.nix
+++ b/pkgs/development/libraries/botan/unstable.nix
@@ -5,4 +5,5 @@ callPackage ./generic.nix (args // {
   revision = "29";
   sha256 = "157bp8716h17agrxyj7xpsj2i5sqhafj1nfx4gpzccx7y2kyq176";
   openssl = null;
+  postPatch = "sed '1i#include <cmath>' -i src/tests/test_bigint.cpp";
 })
diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix
index e3c5d7573107..4ba366be56f0 100644
--- a/pkgs/development/libraries/xgboost/default.nix
+++ b/pkgs/development/libraries/xgboost/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1d7lnbwxwakclqqfjwyk9w3wd2clkihdr6ljs5z08ydiaspri093";
   };
 
+  postPatch = "sed '1i#include <cmath>' -i src/tree/param.h";
+
   enableParallelBuilding = true;
 
   installPhase = ''
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index 510a0679527e..a4f1a96c6a4c 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -3,7 +3,7 @@
 , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt
 , guile, perl, postgresql92, aws-sdk-cpp, nukeReferences, git, boehmgc
 , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
-, rpm, dpkg, cdrkit }:
+, rpm, dpkg, cdrkit, fetchpatch }:
 
 with stdenv;
 
@@ -70,6 +70,12 @@ in releaseTools.nixBuild rec {
     sha256 = "0ngipzm2i2vz5ygfd70hh82d027snpl85r8ncn1rxlkak0g8fxsl";
   };
 
+  patches = [(fetchpatch {
+    name = "cmath.diff";
+    url = https://github.com/vcunat/hydra/commit/3c6fca1ba299.diff; # https://github.com/NixOS/hydra/pull/337
+    sha256 = "02m9q304ay45s7xfkm2y7lppakrkx3hrq39mm6348isnbqmbarc0";
+  })];
+
   buildInputs =
     [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx
       gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix
index 3956c994531e..b46114ec62be 100644
--- a/pkgs/games/cataclysm-dda/default.nix
+++ b/pkgs/games/cataclysm-dda/default.nix
@@ -21,6 +21,9 @@ stdenv.mkDerivation rec {
     sed -i Makefile \
       -e 's,-Werror,,g' \
       -e 's,\(DATA_PREFIX=$(PREFIX)/share/\)cataclysm-dda/,\1,g'
+
+    sed '1i#include <cmath>' \
+      -i src/{crafting,skill,weather_data,melee,vehicle,overmap,iuse_actor}.cpp
   '';
 
   makeFlags = "PREFIX=$(out) LUA=1 TILES=1 SOUND=1 RELEASE=1 USE_HOME_DIR=1";
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index 3d3b1c4d9aa8..1ee0f829571d 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -39,6 +39,7 @@ in stdenv.mkDerivation rec {
   };
 
   patches = [ ./use-system-libraries.patch ];
+  postPatch = "sed '1i#include <math.h>' -i plugins/3dveins.cpp";
 
   nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ];
   # we can't use native Lua; upstream uses private headers
diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index 1d6ea1196dab..5b2327c2ff54 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation {
     sha256 = "12bqh3k4wsk1c0bz2zly8h0ilbsdmsbwr9cdjc6i7liwg9906g7i";
   };
 
+  postPatch = "sed '1i#include <math.h>' -i g_src/ttf_manager.cpp";
+
   cmakeFlags = [
     "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
     "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix
index 2203bb6337eb..d263be3ec115 100644
--- a/pkgs/games/openspades/default.nix
+++ b/pkgs/games/openspades/default.nix
@@ -16,7 +16,10 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace Sources/Client/Client_Input.cpp --replace "isnan(" "std::isnan("
     substituteInPlace Sources/Client/Corpse.cpp --replace "isnan(" "std::isnan("
-    substituteInPlace Sources/Draw/SWMapRenderer.cpp --replace "isnan(" "std::isnan(" --replace "isinf(" "std::isinf("
+    substituteInPlace Sources/Draw/SWMapRenderer.cpp \
+      --replace "isnan(" "std::isnan(" --replace "isinf(" "std::isinf("
+    sed '1i#include <cmath>' -i Sources/Client/{Player,Client_Input,Corpse}.cpp \
+      -i Sources/Draw/SWMapRenderer.cpp
   '';
 
   nativeBuildInputs = 
diff --git a/pkgs/games/openspades/git.nix b/pkgs/games/openspades/git.nix
index 8212f160cda8..7d76573f7345 100644
--- a/pkgs/games/openspades/git.nix
+++ b/pkgs/games/openspades/git.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
     sha256 = "0vyvmgim03q8pcmfa1i0njr4w1lpjq5g3b47f67v9b5c5jcjycwn";
   };
 
+  postPatch = "sed '1i#include <cmath>' -i Sources/Client/{,Client}Player.cpp";
+
   nativeBuildInputs = 
     with stdenv.lib;
     [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ]
diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix
index 8775fb103d8d..cf587ce89dd6 100644
--- a/pkgs/games/the-butterfly-effect/default.nix
+++ b/pkgs/games/the-butterfly-effect/default.nix
@@ -9,8 +9,12 @@ stdenv.mkDerivation rec {
     sha256 = "1cs4q9qiakfd2m1lvfsvfgf8yvhxzmc06glng5d80piwyn6ymzxg";
   };
 
+  postPatch = "sed '1i#include <vector>' -i src/model/World.h";
+
   buildInputs = [ qt4 box2d which cmake ];
 
+  enableParallelBuilding = true;
+
   installPhase = ''
     make DESTDIR=.. install
     mkdir -p $out/bin
diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix
index 1395e3ac3efe..77392913cb1a 100644
--- a/pkgs/misc/emulators/higan/default.nix
+++ b/pkgs/misc/emulators/higan/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
   };
 
   patches = [ ./0001-change-flags.diff ];
+  postPatch = "sed '1i#include <cmath>' -i higan/fc/ppu/ppu.cpp";
 
   buildInputs =
   [ p7zip pkgconfig libX11 libXv udev mesa SDL libao openal libpulseaudio gtk gtksourceview ];
diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix
index 1b95bca643c7..673e4c3ed087 100644
--- a/pkgs/misc/emulators/pcsx2/default.nix
+++ b/pkgs/misc/emulators/pcsx2/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
     sha256 = "0s7mxq2cgzwjfsq0vhpz6ljk7wr725nxg48128iyirf85585l691";
   };
 
+  postPatch = "sed '1i#include \"x86intrin.h\"' -i common/src/x86emitter/cpudetect.cpp";
+
   configurePhase = ''
     mkdir -p build
     cd build
@@ -50,6 +52,8 @@ stdenv.mkDerivation rec {
     soundtouch wxGTK30 zlib
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Playstation 2 emulator";
     longDescription= ''
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 8296ec62c5b2..82e088b76c20 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -18,6 +18,9 @@ stdenv.mkDerivation {
   src = fetchurl {
     inherit (s) url sha256;
   };
+  postPatch = ''
+    sed '1i#include <cmath>' -i userspace/libsinsp/{cursesspectro,filterchecks}.cpp
+  '';
 
   cmakeFlags = [
     "-DUSE_BUNDLED_DEPS=OFF"
-- 
cgit 1.4.1


From bd01fad0ed2c0e9f84db55989159f425e82884e6 Mon Sep 17 00:00:00 2001
From: Bjørn Forsman <bjorn.forsman@gmail.com>
Date: Mon, 20 Jun 2016 12:53:46 +0200
Subject: Captialize meta.description of all packages

In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
---
 pkgs/applications/audio/cd-discid/default.nix      |  2 +-
 pkgs/applications/audio/csound/default.nix         |  2 +-
 pkgs/applications/audio/qsampler/default.nix       |  2 +-
 pkgs/applications/audio/rakarrack/default.nix      |  2 +-
 pkgs/applications/audio/renoise/default.nix        |  2 +-
 pkgs/applications/audio/seq24/default.nix          |  2 +-
 pkgs/applications/audio/shntool/default.nix        |  2 +-
 pkgs/applications/audio/xsynth-dssi/default.nix    |  2 +-
 pkgs/applications/audio/yoshimi/default.nix        |  2 +-
 .../editors/emacs-modes/logito/default.nix         |  2 +-
 .../editors/emacs-modes/metaweblog/default.nix     |  2 +-
 .../session-management-for-emacs/default.nix       |  2 +-
 pkgs/applications/editors/lighttable/default.nix   |  2 +-
 pkgs/applications/editors/ne/default.nix           |  2 +-
 .../applications/graphics/gimp/plugins/default.nix |  2 +-
 pkgs/applications/graphics/xournal/default.nix     |  2 +-
 pkgs/applications/misc/dmenu/wayland.nix           |  2 +-
 pkgs/applications/misc/fetchmail/default.nix       |  2 +-
 pkgs/applications/misc/goldendict/default.nix      |  2 +-
 pkgs/applications/misc/gphoto2/default.nix         |  2 +-
 pkgs/applications/misc/gxmessage/default.nix       |  2 +-
 pkgs/applications/misc/jbidwatcher/default.nix     |  2 +-
 pkgs/applications/misc/multisync/default.nix       |  2 +-
 pkgs/applications/misc/openjump/default.nix        |  2 +-
 pkgs/applications/misc/tasknc/default.nix          |  2 +-
 pkgs/applications/misc/xpdf/default.nix            |  2 +-
 .../networking/browsers/kwebkitpart/default.nix    |  2 +-
 .../networking/cluster/hadoop/default.nix          |  2 +-
 .../networking/instant-messengers/gale/default.nix |  2 +-
 pkgs/applications/networking/netperf/default.nix   |  2 +-
 pkgs/applications/office/beancount/default.nix     |  2 +-
 pkgs/applications/office/timetrap/default.nix      |  2 +-
 pkgs/applications/science/logic/ltl2ba/default.nix |  2 +-
 pkgs/applications/science/math/msieve/default.nix  |  2 +-
 pkgs/applications/science/math/pssp/default.nix    |  2 +-
 .../science/robotics/qgroundcontrol/default.nix    |  2 +-
 .../git-and-tools/git-crypt/default.nix            |  2 +-
 .../git-and-tools/git-remote-hg/default.nix        |  2 +-
 .../git-and-tools/git2cl/default.nix               |  2 +-
 pkgs/applications/video/makemkv/default.nix        |  2 +-
 pkgs/applications/video/xvidcap/default.nix        |  2 +-
 pkgs/desktops/kde-4.14/kdegames/bomber.nix         |  2 +-
 pkgs/desktops/kde-4.14/kdegames/bovo.nix           |  2 +-
 pkgs/desktops/kde-4.14/kdegames/granatier.nix      |  2 +-
 pkgs/desktops/kde-4.14/kdegames/kajongg.nix        |  2 +-
 pkgs/desktops/kde-4.14/kdegames/kapman.nix         |  2 +-
 pkgs/desktops/kde-4.14/kdegames/katomic.nix        |  2 +-
 pkgs/desktops/kde-4.14/kdegames/kblackbox.nix      |  2 +-
 pkgs/desktops/kde-4.14/kdegames/kblocks.nix        |  2 +-
 pkgs/desktops/kde-4.14/kdegames/kbounce.nix        |  2 +-
 pkgs/desktops/kde-4.14/kdegames/kbreakout.nix      |  2 +-
 pkgs/desktops/kde-4.14/kdegames/kdiamond.nix       |  2 +-
 pkgs/desktops/kde-4.14/kdegames/kfourinline.nix    |  2 +-
 pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix    |  2 +-
 pkgs/desktops/kde-4.14/kdegames/kigo.nix           |  2 +-
 pkgs/desktops/kde-4.14/kdegames/killbots.nix       |  2 +-
 pkgs/desktops/kde-4.14/kdegames/kiriki.nix         |  2 +-
 pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix   |  2 +-
 pkgs/desktops/kde-4.14/kdegames/klickety.nix       |  2 +-
 pkgs/desktops/kde-4.14/kdegames/klines.nix         |  2 +-
 pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix      |  2 +-
 pkgs/desktops/kde-4.14/kdegames/kmines.nix         |  2 +-
 pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix   |  2 +-
 pkgs/desktops/kde-4.14/kdegames/knetwalk.nix       |  2 +-
 pkgs/desktops/kde-4.14/kdegames/kolf.nix           |  2 +-
 pkgs/desktops/kde-4.14/kdegames/kollision.nix      |  2 +-
 pkgs/desktops/kde-4.14/kdegames/konquest.nix       |  2 +-
 pkgs/desktops/kde-4.14/kdegames/kpat.nix           |  2 +-
 pkgs/desktops/kde-4.14/kdegames/kreversi.nix       |  2 +-
 pkgs/desktops/kde-4.14/kdegames/kshisen.nix        |  2 +-
 pkgs/desktops/kde-4.14/kdegames/ksirk.nix          |  2 +-
 pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix     |  2 +-
 pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix     |  2 +-
 pkgs/desktops/kde-4.14/kdegames/ksquares.nix       |  2 +-
 pkgs/desktops/kde-4.14/kdegames/ksudoku.nix        |  2 +-
 pkgs/desktops/kde-4.14/kdegames/ktuberling.nix     |  2 +-
 pkgs/desktops/kde-4.14/kdegames/kubrick.nix        |  2 +-
 pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix   |  2 +-
 pkgs/desktops/kde-4.14/kdegames/lskat.nix          |  2 +-
 pkgs/desktops/kde-4.14/kdegames/palapeli.nix       |  2 +-
 pkgs/desktops/kde-4.14/kdegames/picmi.nix          |  2 +-
 .../kde-4.14/kdemultimedia/audiocd-kio.nix         |  2 +-
 pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix    |  2 +-
 .../kde-4.14/kdemultimedia/ffmpegthumbs.nix        |  2 +-
 pkgs/desktops/kde-4.14/kdemultimedia/juk.nix       |  2 +-
 pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix      |  2 +-
 pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix  |  2 +-
 .../kde-4.14/kdemultimedia/mplayerthumbs.nix       |  2 +-
 pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix    |  2 +-
 .../pantheon/apps/pantheon-terminal/default.nix    |  2 +-
 .../compilers/elm/packages/elm-repl.nix            |  2 +-
 .../compilers/emscripten-fastcomp/default.nix      |  2 +-
 pkgs/development/compilers/manticore/default.nix   |  2 +-
 pkgs/development/haskell-modules/ghcjs/stage2.nix  |  2 +-
 pkgs/development/interpreters/luajit/default.nix   |  2 +-
 .../interpreters/python/2.6/default.nix            |  2 +-
 .../interpreters/python/2.7/default.nix            |  2 +-
 .../libraries/audio/zita-resampler/default.nix     |  2 +-
 pkgs/development/libraries/buddy/default.nix       |  2 +-
 pkgs/development/libraries/capstone/default.nix    |  2 +-
 pkgs/development/libraries/cyrus-sasl/default.nix  |  2 +-
 pkgs/development/libraries/frame/default.nix       |  2 +-
 pkgs/development/libraries/ftgl/2.1.2.nix          |  2 +-
 pkgs/development/libraries/ftgl/default.nix        |  2 +-
 pkgs/development/libraries/git2/0.21.nix           |  2 +-
 pkgs/development/libraries/git2/default.nix        |  2 +-
 pkgs/development/libraries/idnkit/default.nix      |  2 +-
 pkgs/development/libraries/jbigkit/default.nix     |  2 +-
 .../libraries/kinetic-cpp-client/default.nix       |  2 +-
 .../development/libraries/kyotocabinet/default.nix |  2 +-
 pkgs/development/libraries/ldb/default.nix         |  2 +-
 pkgs/development/libraries/libasyncns/default.nix  |  2 +-
 pkgs/development/libraries/libconfig/default.nix   |  2 +-
 pkgs/development/libraries/libdwg/default.nix      |  2 +-
 pkgs/development/libraries/libestr/default.nix     |  2 +-
 pkgs/development/libraries/libical/default.nix     |  2 +-
 pkgs/development/libraries/liblo/default.nix       |  2 +-
 pkgs/development/libraries/liblognorm/default.nix  |  2 +-
 pkgs/development/libraries/libmnl/default.nix      |  2 +-
 .../libraries/libnetfilter_queue/default.nix       |  2 +-
 .../libraries/libomxil-bellagio/default.nix        |  2 +-
 pkgs/development/libraries/libqb/default.nix       |  2 +-
 pkgs/development/libraries/librelp/default.nix     |  2 +-
 pkgs/development/libraries/libseccomp/default.nix  |  2 +-
 pkgs/development/libraries/libstatgrab/default.nix |  2 +-
 pkgs/development/libraries/libstroke/default.nix   |  2 +-
 pkgs/development/libraries/libwacom/default.nix    |  2 +-
 pkgs/development/libraries/libykneomgr/default.nix |  2 +-
 pkgs/development/libraries/log4cplus/default.nix   |  2 +-
 .../libraries/mediastreamer/default.nix            |  2 +-
 pkgs/development/libraries/minixml/default.nix     |  2 +-
 pkgs/development/libraries/poker-eval/default.nix  |  2 +-
 pkgs/development/libraries/popt/default.nix        |  2 +-
 .../libraries/resolv_wrapper/default.nix           |  2 +-
 .../libraries/socket_wrapper/default.nix           |  2 +-
 pkgs/development/libraries/speex/default.nix       |  2 +-
 pkgs/development/libraries/speexdsp/default.nix    |  2 +-
 pkgs/development/libraries/uid_wrapper/default.nix |  2 +-
 .../libraries/webrtc-audio-processing/default.nix  |  2 +-
 pkgs/development/libraries/x264/default.nix        |  2 +-
 pkgs/development/lisp-modules/lisp-packages.nix    |  2 +-
 .../mobile/titaniumenv/cli/registry.nix            | 20 +++---
 pkgs/development/ocaml-modules/http/default.nix    |  2 +-
 pkgs/development/ocaml-modules/zarith/default.nix  |  2 +-
 pkgs/development/pure-modules/gplot/default.nix    |  2 +-
 .../python-modules/matplotlib/default.nix          |  2 +-
 pkgs/development/tools/analysis/kcov/default.nix   |  2 +-
 pkgs/development/tools/gnulib/default.nix          |  2 +-
 pkgs/development/tools/misc/distcc/default.nix     |  2 +-
 .../development/tools/misc/usb-modeswitch/data.nix |  2 +-
 .../tools/misc/usb-modeswitch/default.nix          |  2 +-
 pkgs/development/tools/misc/xxdiff/default.nix     |  2 +-
 pkgs/development/tools/neoload/default.nix         |  2 +-
 pkgs/development/web/csslint/default.nix           |  2 +-
 pkgs/games/planetaryannihilation/default.nix       |  2 +-
 pkgs/games/zandronum/bin.nix                       |  2 +-
 pkgs/games/zangband/default.nix                    |  2 +-
 pkgs/misc/emulators/snes9x-gtk/default.nix         |  2 +-
 pkgs/misc/gnuk/generic.nix                         |  2 +-
 pkgs/misc/screensavers/light-locker/default.nix    |  2 +-
 pkgs/os-specific/linux/cgmanager/default.nix       |  2 +-
 pkgs/os-specific/linux/fswebcam/default.nix        |  2 +-
 pkgs/os-specific/linux/fusionio/vsl.nix            |  2 +-
 pkgs/os-specific/linux/libsmbios/default.nix       |  2 +-
 pkgs/os-specific/linux/lockdep/default.nix         |  2 +-
 pkgs/os-specific/linux/lxc/default.nix             |  2 +-
 pkgs/os-specific/linux/nftables/default.nix        |  2 +-
 pkgs/os-specific/linux/trace-cmd/default.nix       |  2 +-
 pkgs/servers/http/micro-httpd/default.nix          |  2 +-
 pkgs/servers/http/mini-httpd/default.nix           |  2 +-
 pkgs/servers/ldap/389/default.nix                  |  2 +-
 pkgs/servers/mail/petidomo/default.nix             |  2 +-
 pkgs/servers/mail/postfix/pfixtools.nix            |  2 +-
 pkgs/servers/mail/rspamd/default.nix               |  2 +-
 pkgs/servers/nosql/mongodb/default.nix             |  2 +-
 pkgs/servers/nosql/neo4j/default.nix               |  2 +-
 pkgs/servers/squid/default.nix                     |  2 +-
 pkgs/tools/X11/xvkbd/default.nix                   |  2 +-
 pkgs/tools/backup/partimage/default.nix            |  2 +-
 pkgs/tools/backup/rdiff-backup/default.nix         |  2 +-
 pkgs/tools/cd-dvd/bashburn/default.nix             |  2 +-
 pkgs/tools/compression/bzip2/default.nix           |  2 +-
 pkgs/tools/compression/lbzip2/default.nix          |  2 +-
 pkgs/tools/compression/lzip/default.nix            |  2 +-
 pkgs/tools/filesystems/davfs2/default.nix          |  2 +-
 pkgs/tools/filesystems/extundelete/default.nix     |  2 +-
 pkgs/tools/filesystems/grive/default.nix           |  2 +-
 pkgs/tools/filesystems/zerofree/default.nix        |  2 +-
 pkgs/tools/graphics/bins/default.nix               |  2 +-
 pkgs/tools/graphics/editres/default.nix            |  2 +-
 pkgs/tools/misc/aescrypt/default.nix               |  2 +-
 pkgs/tools/misc/apt-offline/default.nix            |  2 +-
 pkgs/tools/misc/direnv/default.nix                 |  2 +-
 pkgs/tools/misc/proxytunnel/default.nix            |  2 +-
 pkgs/tools/misc/rockbox-utility/default.nix        |  2 +-
 .../misc/yubikey-personalization-gui/default.nix   |  2 +-
 .../tools/misc/yubikey-personalization/default.nix |  2 +-
 pkgs/tools/networking/keepalived/default.nix       |  2 +-
 pkgs/tools/networking/mpack/default.nix            |  2 +-
 pkgs/tools/networking/nbd/default.nix              |  2 +-
 pkgs/tools/networking/ratools/default.nix          |  2 +-
 pkgs/tools/networking/spiped/default.nix           |  2 +-
 pkgs/tools/networking/stunnel/default.nix          |  2 +-
 pkgs/tools/networking/vpnc/default.nix             |  2 +-
 pkgs/tools/security/gnupg/1.nix                    |  2 +-
 pkgs/tools/security/gnupg/20.nix                   |  2 +-
 pkgs/tools/security/gnupg/21.nix                   |  2 +-
 pkgs/tools/security/stricat/default.nix            |  2 +-
 pkgs/tools/security/vidalia/default.nix            |  2 +-
 pkgs/tools/security/volatility/default.nix         |  2 +-
 pkgs/tools/system/dcfldd/default.nix               |  2 +-
 pkgs/tools/system/dfc/default.nix                  |  2 +-
 pkgs/tools/system/s6-rc/default.nix                |  2 +-
 pkgs/tools/system/safecopy/default.nix             |  2 +-
 pkgs/tools/system/tm/default.nix                   |  2 +-
 pkgs/tools/system/tree/default.nix                 |  2 +-
 pkgs/tools/system/ts/default.nix                   |  2 +-
 pkgs/tools/text/gist/default.nix                   |  2 +-
 pkgs/tools/text/qprint/default.nix                 |  2 +-
 pkgs/tools/typesetting/pdfgrep/default.nix         |  2 +-
 pkgs/tools/typesetting/tex/tex4ht/default.nix      |  2 +-
 pkgs/tools/typesetting/tex/texlive/moderncv.nix    |  2 +-
 .../typesetting/tex/texlive/moderntimeline.nix     |  2 +-
 pkgs/tools/virtualization/cloud-init/default.nix   |  2 +-
 pkgs/top-level/emacs-packages.nix                  |  2 +-
 pkgs/top-level/lua-packages.nix                    |  2 +-
 pkgs/top-level/python-packages.nix                 | 84 +++++++++++-----------
 227 files changed, 277 insertions(+), 277 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix
index 7e0c245d3579..5286362b50f5 100644
--- a/pkgs/applications/audio/cd-discid/default.nix
+++ b/pkgs/applications/audio/cd-discid/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.rycee ];
     platforms = platforms.unix;
-    description = "command-line utility to get CDDB discid information from a CD-ROM disc";
+    description = "Command-line utility to get CDDB discid information from a CD-ROM disc";
 
     longDescription = ''
       cd-discid is a backend utility to get CDDB discid information
diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index afca63a2a8a2..664d80490f2a 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   buildInputs = [ cmake libsndfile flex bison alsaLib libpulseaudio tcltk ];
 
   meta = {
-    description = "sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms";
+    description = "Sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms";
     homepage = http://www.csounds.com/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [stdenv.lib.maintainers.marcweber];
diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix
index b851517b8724..692938884b63 100644
--- a/pkgs/applications/audio/qsampler/default.nix
+++ b/pkgs/applications/audio/qsampler/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://www.linuxsampler.org;
-    description = "graphical frontend to LinuxSampler";
+    description = "Graphical frontend to LinuxSampler";
     license = licenses.gpl2;
     maintainers = [ maintainers.goibhniu ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix
index b746cccd113d..37815412fc35 100644
--- a/pkgs/applications/audio/rakarrack/default.nix
+++ b/pkgs/applications/audio/rakarrack/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation  rec {
     libpng libsamplerate libsndfile zlib ];
 
   meta = with stdenv.lib; {
-    description = "multi-effects processor emulating a guitar effects pedalboard";
+    description = "Multi-effects processor emulating a guitar effects pedalboard";
     homepage = http://rakarrack.sourceforge.net;
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix
index 7b4c1143fb4c..91e8f1be6ece 100644
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/pkgs/applications/audio/renoise/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "modern tracker-based DAW";
+    description = "Modern tracker-based DAW";
     homepage = http://www.renoise.com/;
     license = stdenv.lib.licenses.unfree;
   };
diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix
index 7976a7bf6789..d1de6f1abd49 100644
--- a/pkgs/applications/audio/seq24/default.nix
+++ b/pkgs/applications/audio/seq24/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation  rec {
   nativeBuildInputs = [ pkgconfig ];
 
   meta = with stdenv.lib; {
-    description = "minimal loop based midi sequencer";
+    description = "Minimal loop based midi sequencer";
     homepage = "http://www.filter24.org/seq24";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/applications/audio/shntool/default.nix b/pkgs/applications/audio/shntool/default.nix
index 12ef79d746ec..8645251b384d 100644
--- a/pkgs/applications/audio/shntool/default.nix
+++ b/pkgs/applications/audio/shntool/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ flac ];
 
   meta = {
-    description = "multi-purpose WAVE data processing and reporting utility";
+    description = "Multi-purpose WAVE data processing and reporting utility";
     homepage = http://www.etree.org/shnutils/shntool/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix
index c4ed20defd68..96da8ad8c557 100644
--- a/pkgs/applications/audio/xsynth-dssi/default.nix
+++ b/pkgs/applications/audio/xsynth-dssi/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation  rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "classic-analog (VCOs-VCF-VCA) style software synthesizer";
+    description = "Classic-analog (VCOs-VCF-VCA) style software synthesizer";
     longDescription = ''
       Xsynth-DSSI is a classic-analog (VCOs-VCF-VCA) style software
       synthesizer which operates as a plugin for the DSSI Soft Synth
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index ab7eb10798d7..0ec399407758 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation  rec {
   cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc.out}/lib/libm.so -DCMAKE_INSTALL_DATAROOTDIR=$out" ];
 
   meta = with stdenv.lib; {
-    description = "high quality software synthesizer based on ZynAddSubFX";
+    description = "High quality software synthesizer based on ZynAddSubFX";
     longDescription = ''
       Yoshimi delivers the same synthesizer capabilities as
       ZynAddSubFX along with very good Jack and Alsa midi/audio
diff --git a/pkgs/applications/editors/emacs-modes/logito/default.nix b/pkgs/applications/editors/emacs-modes/logito/default.nix
index a47f04472ec7..c324e395fa9e 100644
--- a/pkgs/applications/editors/emacs-modes/logito/default.nix
+++ b/pkgs/applications/editors/emacs-modes/logito/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "tiny logging framework for Emacs";
+    description = "Tiny logging framework for Emacs";
     homepage = https://github.com/sigma/logito;
     license = stdenv.lib.licenses.gpl2Plus;
 
diff --git a/pkgs/applications/editors/emacs-modes/metaweblog/default.nix b/pkgs/applications/editors/emacs-modes/metaweblog/default.nix
index 77bfedf62748..a5633cdfabaa 100644
--- a/pkgs/applications/editors/emacs-modes/metaweblog/default.nix
+++ b/pkgs/applications/editors/emacs-modes/metaweblog/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "an emacs library to access metaweblog based weblogs";
+    description = "An emacs library to access metaweblog based weblogs";
     homepage = https://github.com/punchagan/metaweblog;
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
index 0d2fcf097863..f5aeb35d1840 100644
--- a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
+++ b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
        (require 'session)
        (add-hook 'after-init-hook 'session-initialize)
     */
-    description = "small session management for emacs";
+    description = "Small session management for emacs";
     homepage = http://emacs-session.sourceforge.net/;
     license = "GPL";
   };
diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix
index 9b87f13d623d..108b7cceb4e2 100644
--- a/pkgs/applications/editors/lighttable/default.nix
+++ b/pkgs/applications/editors/lighttable/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "the next generation code editor";
+    description = "The next generation code editor";
     homepage = http://www.lighttable.com/;
     license = licenses.gpl3;
     maintainers = [ maintainers.matejc ];
diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix
index 4e8324894abf..169e078edbd6 100644
--- a/pkgs/applications/editors/ne/default.nix
+++ b/pkgs/applications/editors/ne/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
   
   meta = {
-    description = "the nice editor";
+    description = "The nice editor";
     homepage = https://github.com/vigna/ne;
     longDescription = ''
       ne is a free (GPL'd) text editor based on the POSIX standard that runs (we hope) on almost any 
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 4084018d1d53..74abc06bc4e3 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -174,7 +174,7 @@ rec {
       installPhase = "installPlugins gmic_gimp";
 
       meta = {
-        description = "script language for image processing which comes with its open-source interpreter";
+        description = "Script language for image processing which comes with its open-source interpreter";
         homepage = http://gmic.eu/gimp.shtml;
         license = stdenv.lib.licenses.cecill20;
         /*
diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix
index f614eb0a1b5a..56d46088669d 100644
--- a/pkgs/applications/graphics/xournal/default.nix
+++ b/pkgs/applications/graphics/xournal/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://xournal.sourceforge.net/;
-    description = "note-taking application (supposes stylus)";
+    description = "Note-taking application (supposes stylus)";
     maintainers = [ stdenv.lib.maintainers.guibert ];
     license = stdenv.lib.licenses.gpl2;
   };
diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix
index d55e22c5a3b8..9a13da677456 100644
--- a/pkgs/applications/misc/dmenu/wayland.nix
+++ b/pkgs/applications/misc/dmenu/wayland.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-      description = "a generic, highly customizable, and efficient menu for the X Window System";
+      description = "A generic, highly customizable, and efficient menu for the X Window System";
       homepage = http://tools.suckless.org/dmenu;
       license = stdenv.lib.licenses.mit;
       maintainers = with stdenv.lib.maintainers; [ ];
diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix
index 4cec2ca41b67..88475dd761e1 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/applications/misc/fetchmail/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://www.fetchmail.info/";
-    description = "a full-featured remote-mail retrieval and forwarding utility";
+    description = "A full-featured remote-mail retrieval and forwarding utility";
     longDescription = ''
       A full-featured, robust, well-documented remote-mail retrieval and
       forwarding utility intended to be used over on-demand TCP/IP links
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index 36840c656d34..facbe50662c8 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://goldendict.org/;
-    description = "a feature-rich dictionary lookup program";
+    description = "A feature-rich dictionary lookup program";
 
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.astsmtl ];
diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
index 4c0e091bf653..742bdaad9966 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ];
 
   meta = {
-    description = "a ready to use set of digital camera software applications";
+    description = "A ready to use set of digital camera software applications";
     longDescription = ''
 
       A set of command line utilities for manipulating over 1400 different
diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix
index ce8109717d44..08ae34f97055 100644
--- a/pkgs/applications/misc/gxmessage/default.nix
+++ b/pkgs/applications/misc/gxmessage/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ intltool gnome3.gtk pkgconfig texinfo ];
   meta = {
-    description = "a GTK enabled dropin replacement for xmessage";
+    description = "A GTK enabled dropin replacement for xmessage";
     homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage";
     license = stdenv.lib.licenses.gpl3;
     maintainers = with stdenv.lib.maintainers; [jfb];
diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix
index e4b362ec25d4..d26ad94648aa 100644
--- a/pkgs/applications/misc/jbidwatcher/default.nix
+++ b/pkgs/applications/misc/jbidwatcher/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.jbidwatcher.com/";
-    description = "monitor and snipe Ebay auctions";
+    description = "Monitor and snipe Ebay auctions";
     license = "LGPL";
 
     longDescription = ''
diff --git a/pkgs/applications/misc/multisync/default.nix b/pkgs/applications/misc/multisync/default.nix
index 8fd043539698..fc55b275dd0a 100644
--- a/pkgs/applications/misc/multisync/default.nix
+++ b/pkgs/applications/misc/multisync/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   preConfigure = "./autogen.sh"; # install.sh is not contained in the tar
 
   meta = {
-    description = "modular program to synchronize calendars, addressbooks and other PIM data between pcs, mobile devices etc";
+    description = "Modular program to synchronize calendars, addressbooks and other PIM data between pcs, mobile devices etc";
   };
 }
 
diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix
index 8a68bd7ccfb9..fdc4cd5b6d93 100644
--- a/pkgs/applications/misc/openjump/default.nix
+++ b/pkgs/applications/misc/openjump/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   buildInputs = [unzip];
 
   meta = {
-    description = "open source Geographic Information System (GIS) written in the Java programming language";
+    description = "Open source Geographic Information System (GIS) written in the Java programming language";
     homepage = http://www.openjump.org/index.html;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [stdenv.lib.maintainers.marcweber];
diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix
index f7460618d964..85e6c07d670a 100644
--- a/pkgs/applications/misc/tasknc/default.nix
+++ b/pkgs/applications/misc/tasknc/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://github.com/mjheagle8/tasknc";
-    description = "a ncurses wrapper around taskwarrior";
+    description = "A ncurses wrapper around taskwarrior";
     maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
     platforms = stdenv.lib.platforms.linux; # Cannot test others
   };
diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix
index f11d5e6d7009..a7d288162e39 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/pkgs/applications/misc/xpdf/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://www.foolabs.com/xpdf/";
-    description = "viewer for Portable Document Format (PDF) files";
+    description = "Viewer for Portable Document Format (PDF) files";
 
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.peti ];
diff --git a/pkgs/applications/networking/browsers/kwebkitpart/default.nix b/pkgs/applications/networking/browsers/kwebkitpart/default.nix
index 56147883f4be..1cbffdd25446 100644
--- a/pkgs/applications/networking/browsers/kwebkitpart/default.nix
+++ b/pkgs/applications/networking/browsers/kwebkitpart/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     platforms = platforms.linux;
     maintainers = [ maintainers.phreedom ];
-    description = "a WebKit KPart for Konqueror, Akregator and other KDE applications";
+    description = "A WebKit KPart for Konqueror, Akregator and other KDE applications";
     homepage = https://projects.kde.org/projects/extragear/base/kwebkitpart;
   };
 }
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index 96d263a525e2..925fe19d72ec 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://hadoop.apache.org/";
-    description = "framework for distributed processing of large data sets across clusters of computers";
+    description = "Framework for distributed processing of large data sets across clusters of computers";
     license = stdenv.lib.licenses.asl20;
 
     longDescription = ''
diff --git a/pkgs/applications/networking/instant-messengers/gale/default.nix b/pkgs/applications/networking/instant-messengers/gale/default.nix
index 65f6cab6e81c..21f2afdde68b 100644
--- a/pkgs/applications/networking/instant-messengers/gale/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gale/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     homepage = "http://gale.org/";
-    description = "chat/messaging system (server and client)";
+    description = "Chat/messaging system (server and client)";
     platforms = platforms.all;
     license = licenses.gpl2Plus;
   };
diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix
index 40aa32636297..9bad7a8b42a3 100644
--- a/pkgs/applications/networking/netperf/default.nix
+++ b/pkgs/applications/networking/netperf/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "benchmark to measure the performance of many different types of networking";
+    description = "Benchmark to measure the performance of many different types of networking";
     homepage = "http://www.netperf.org/netperf/";
     license = "Hewlett-Packard BSD-like license";
 
diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix
index 4114fbffa392..77fcb8ce7e91 100644
--- a/pkgs/applications/office/beancount/default.nix
+++ b/pkgs/applications/office/beancount/default.nix
@@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication rec {
 
   meta = {
     homepage = http://furius.ca/beancount/;
-    description = "double-entry bookkeeping computer language";
+    description = "Double-entry bookkeeping computer language";
     longDescription = ''
         A double-entry bookkeeping computer language that lets you define
         financial transaction records in a text file, read them in memory,
diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix
index 71d0f923dbdc..f6a408d03842 100644
--- a/pkgs/applications/office/timetrap/default.nix
+++ b/pkgs/applications/office/timetrap/default.nix
@@ -9,7 +9,7 @@ bundlerEnv {
   gemset = ./gemset.nix;
 
   meta = {
-    description = "a simple command line time tracker written in ruby";
+    description = "A simple command line time tracker written in ruby";
     homepage = https://github.com/samg/timetrap;
     license = lib.licenses.mit;
   };
diff --git a/pkgs/applications/science/logic/ltl2ba/default.nix b/pkgs/applications/science/logic/ltl2ba/default.nix
index f9bdd9a6b3b9..59c6461f5b6c 100644
--- a/pkgs/applications/science/logic/ltl2ba/default.nix
+++ b/pkgs/applications/science/logic/ltl2ba/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "fast translation from LTL formulae to Buchi automata";
+    description = "Fast translation from LTL formulae to Buchi automata";
     homepage    = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba";
     license     = stdenv.lib.licenses.gpl2Plus;
     platforms   = stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix
index c8b388a06b78..5a6d3dd54043 100644
--- a/pkgs/applications/science/math/msieve/default.nix
+++ b/pkgs/applications/science/math/msieve/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
                    cp msieve $out/bin/'';
 
   meta = {
-    description = "a C library implementing a suite of algorithms to factor large integers";
+    description = "A C library implementing a suite of algorithms to factor large integers";
     license = stdenv.lib.licenses.publicDomain;
     homepage = http://msieve.sourceforge.net/;
     maintainers = [ stdenv.lib.maintainers.roconnor ];
diff --git a/pkgs/applications/science/math/pssp/default.nix b/pkgs/applications/science/math/pssp/default.nix
index 4a126797d697..6ced805b3115 100644
--- a/pkgs/applications/science/math/pssp/default.nix
+++ b/pkgs/applications/science/math/pssp/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.gnu.org/software/pspp/";
-    description = "a free replacement for SPSS, a program for statistical analysis of sampled data";
+    description = "A free replacement for SPSS, a program for statistical analysis of sampled data";
     license = stdenv.lib.licenses.gpl3Plus;
 
     longDescription = ''
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index b67da5b55162..1e33a1be8567 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "provides full ground station support and configuration for the PX4 and APM Flight Stacks";
+    description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks";
     homepage = http://qgroundcontrol.org/;
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
index 8e537c32313c..5ce665dda0f0 100644
--- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = "https://www.agwa.name/projects/git-crypt";
-    description = "transparent file encryption in git";
+    description = "Transparent file encryption in git";
     longDescription = ''
       git-crypt enables transparent encryption and decryption of files in a git
       repository. Files which you choose to protect are encrypted when
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
index 86a11d04ed7d..e90fc9ad2580 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/felipec/git-remote-hg";
-    description = "semi-official Mercurial bridge from Git project, once installed, it allows you to clone, fetch and push to and from Mercurial repositories as if they were Git ones";
+    description = "Semi-official Mercurial bridge from Git project, once installed, it allows you to clone, fetch and push to and from Mercurial repositories as if they were Git ones";
     license = licenses.gpl2;
     maintainers = [ maintainers.garbas ];
   };
diff --git a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix
index 1e372c928f88..ade9ac1312a7 100644
--- a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://josefsson.org/git2cl/";
-    description = "convert git logs to GNU style ChangeLog files";
+    description = "Convert git logs to GNU style ChangeLog files";
   };
 }
diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index 46b5712ca9a4..6a13bcc015a9 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
           + ":" + stdenv.cc.cc + "/lib64";
 
   meta = with stdenv.lib; {
-    description = "convert blu-ray and dvd to mkv";
+    description = "Convert blu-ray and dvd to mkv";
     longDescription = ''
       makemkv is a one-click QT application that transcodes an encrypted
       blu-ray or DVD disc into a more portable set of mkv files, preserving
diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix
index ade840dc0218..527d31004b01 100644
--- a/pkgs/applications/video/xvidcap/default.nix
+++ b/pkgs/applications/video/xvidcap/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   NIX_LDFLAGS = "-lXext -lX11 -lz -lgcc_s";
 
   meta = with stdenv.lib; { 
-    description = "screencast video catpuring tool";
+    description = "Screencast video catpuring tool";
     homepage = http://xvidcap.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/desktops/kde-4.14/kdegames/bomber.nix b/pkgs/desktops/kde-4.14/kdegames/bomber.nix
index 026227910f21..542ff24f5e65 100644
--- a/pkgs/desktops/kde-4.14/kdegames/bomber.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/bomber.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a single player arcade game. The player is invading various cities in a plane that is decreasing in height";
+    description = "A single player arcade game. The player is invading various cities in a plane that is decreasing in height";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/bovo.nix b/pkgs/desktops/kde-4.14/kdegames/bovo.nix
index b0e7d99c589f..89dff46129b6 100644
--- a/pkgs/desktops/kde-4.14/kdegames/bovo.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/bovo.nix
@@ -2,7 +2,7 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a Gomoku (from Japanese 五目並べ - lit. \"five points\") like game for two players, where the opponents alternate in placing their respective pictogram on the game board";
+    description = "A Gomoku (from Japanese 五目並べ - lit. \"five points\") like game for two players, where the opponents alternate in placing their respective pictogram on the game board";
   };
 
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/granatier.nix b/pkgs/desktops/kde-4.14/kdegames/granatier.nix
index 9f1ab0053099..50c3bf985b5b 100644
--- a/pkgs/desktops/kde-4.14/kdegames/granatier.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/granatier.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a clone of the classic Bomberman game, inspired by the work of the Clanbomber clone";
+    description = "A clone of the classic Bomberman game, inspired by the work of the Clanbomber clone";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/kajongg.nix b/pkgs/desktops/kde-4.14/kdegames/kajongg.nix
index 9a6f5e836955..cea4fb38b4fb 100644
--- a/pkgs/desktops/kde-4.14/kdegames/kajongg.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/kajongg.nix
@@ -8,6 +8,6 @@ kde rec {
   postInstall = "wrapPythonPrograms";
 
   meta = {
-    description = "an ancient Chinese board game for 4 players";
+    description = "An ancient Chinese board game for 4 players";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/kapman.nix b/pkgs/desktops/kde-4.14/kdegames/kapman.nix
index f10e099da3cc..616533911ff8 100644
--- a/pkgs/desktops/kde-4.14/kdegames/kapman.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/kapman.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a clone of the well known game Pac-Man";
+    description = "A clone of the well known game Pac-Man";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/katomic.nix b/pkgs/desktops/kde-4.14/kdegames/katomic.nix
index a9936c04f0ea..3f7c1343289a 100644
--- a/pkgs/desktops/kde-4.14/kdegames/katomic.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/katomic.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a fun and educational puzzle game built around molecular geometry";
+    description = "A fun and educational puzzle game built around molecular geometry";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix b/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix
index 27eeff2f65bb..1e20cf0051ea 100644
--- a/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a game of hide and seek played on an grid of boxes, where the player shoots rays into the grid to deduce the positions of hidden objects";
+    description = "A game of hide and seek played on an grid of boxes, where the player shoots rays into the grid to deduce the positions of hidden objects";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/kblocks.nix b/pkgs/desktops/kde-4.14/kdegames/kblocks.nix
index 98cf068de09a..08e8c62d2629 100644
--- a/pkgs/desktops/kde-4.14/kdegames/kblocks.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/kblocks.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a classic single player falling blocks puzzle game";
+    description = "A classic single player falling blocks puzzle game";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/kbounce.nix b/pkgs/desktops/kde-4.14/kdegames/kbounce.nix
index 77fa0db63529..291e4c65a43a 100644
--- a/pkgs/desktops/kde-4.14/kdegames/kbounce.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/kbounce.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a single player arcade game with the elements of puzzle";
+    description = "A single player arcade game with the elements of puzzle";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix b/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix
index 3a484d919bbb..4c5b2f62852f 100644
--- a/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a Breakout-like game. Its object is to destroy as many bricks as possible without losing the ball";
+    description = "A Breakout-like game. Its object is to destroy as many bricks as possible without losing the ball";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix b/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix
index 06dfcee5ac39..b21a945a64b9 100644
--- a/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a single player puzzle game. The object of the game is to build lines of three similar diamonds";
+    description = "A single player puzzle game. The object of the game is to build lines of three similar diamonds";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix b/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix
index 11b8838e7082..6504d069660b 100644
--- a/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a board game for two players based on the Connect-Four game";
+    description = "A board game for two players based on the Connect-Four game";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix b/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix
index 6217c47a8065..86aff7e77ace 100644
--- a/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "an action game where the hero runs through a maze, climbs stairs, dig holes and dodges enemies in order to collect all the gold nuggets and escape to the next level";
+    description = "An action game where the hero runs through a maze, climbs stairs, dig holes and dodges enemies in order to collect all the gold nuggets and escape to the next level";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/kigo.nix b/pkgs/desktops/kde-4.14/kdegames/kigo.nix
index 32eee67cc1e0..e417e89a0078 100644
--- a/pkgs/desktops/kde-4.14/kdegames/kigo.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/kigo.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "an open-source implementation of the popular Go game";
+    description = "An open-source implementation of the popular Go game";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/killbots.nix b/pkgs/desktops/kde-4.14/kdegames/killbots.nix
index d9c1472495e7..9d8b307be756 100644
--- a/pkgs/desktops/kde-4.14/kdegames/killbots.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/killbots.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a simple game of evading killer robots";
+    description = "A simple game of evading killer robots";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/kiriki.nix b/pkgs/desktops/kde-4.14/kdegames/kiriki.nix
index 72f7ab67501b..433991abd75b 100644
--- a/pkgs/desktops/kde-4.14/kdegames/kiriki.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/kiriki.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "an addictive and fun dice game, designed to be played by as many as six players";
+    description = "An addictive and fun dice game, designed to be played by as many as six players";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix b/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix
index a6d22cff51c3..888dba71b662 100644
--- a/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a simple dice driven tactical game";
+    description = "A simple dice driven tactical game";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/klickety.nix b/pkgs/desktops/kde-4.14/kdegames/klickety.nix
index b592bc40641f..87415f9a4f81 100644
--- a/pkgs/desktops/kde-4.14/kdegames/klickety.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/klickety.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a puzzle game where the player removes groups of colored marbles to clear the board";
+    description = "A puzzle game where the player removes groups of colored marbles to clear the board";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/klines.nix b/pkgs/desktops/kde-4.14/kdegames/klines.nix
index 90952fe91c07..e5c32d3fa9ab 100644
--- a/pkgs/desktops/kde-4.14/kdegames/klines.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/klines.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a simple but highly addictive one player game. The player has to move the colored balls around the game board, gathering them into the lines of the same color by five";
+    description = "A simple but highly addictive one player game. The player has to move the colored balls around the game board, gathering them into the lines of the same color by five";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix b/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix
index 946b531ff127..6aca3c229946 100644
--- a/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames libkmahjongg ];
   meta = {
-    description = "the tiles are scrambled and staked on top of each other to resemble a certain shape. The player is then expected to remove all the tiles off the game board by locating each tile's matching pair";
+    description = "The tiles are scrambled and staked on top of each other to resemble a certain shape. The player is then expected to remove all the tiles off the game board by locating each tile's matching pair";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/kmines.nix b/pkgs/desktops/kde-4.14/kdegames/kmines.nix
index 538454e95984..c02a61506d75 100644
--- a/pkgs/desktops/kde-4.14/kdegames/kmines.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/kmines.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a classic Minesweeper game";
+    description = "A classic Minesweeper game";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix b/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix
index 42ffd2fcb4d5..aed9b48511ac 100644
--- a/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a Battle Ship game";
+    description = "A Battle Ship game";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix b/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix
index a16e578ce848..d7a80f133168 100644
--- a/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a small game where you have to build up a computer network by rotating the wires to connect the terminals to the server";
+    description = "A small game where you have to build up a computer network by rotating the wires to connect the terminals to the server";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/kolf.nix b/pkgs/desktops/kde-4.14/kdegames/kolf.nix
index 78815ee57996..67a75cb9a36f 100644
--- a/pkgs/desktops/kde-4.14/kdegames/kolf.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/kolf.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a miniature golf game";
+    description = "A miniature golf game";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/kollision.nix b/pkgs/desktops/kde-4.14/kdegames/kollision.nix
index 3147c7305ea0..b0911d093ddd 100644
--- a/pkgs/desktops/kde-4.14/kdegames/kollision.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/kollision.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a simple ball dodging game";
+    description = "A simple ball dodging game";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/konquest.nix b/pkgs/desktops/kde-4.14/kdegames/konquest.nix
index 53ddd64928cc..974730a46d0b 100644
--- a/pkgs/desktops/kde-4.14/kdegames/konquest.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/konquest.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "the KDE version of Gnu-Lactic Konquest";
+    description = "The KDE version of Gnu-Lactic Konquest";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/kpat.nix b/pkgs/desktops/kde-4.14/kdegames/kpat.nix
index b60afa786d17..f33ddfb8570c 100644
--- a/pkgs/desktops/kde-4.14/kdegames/kpat.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/kpat.nix
@@ -3,6 +3,6 @@ kde {
   buildInputs = [ kdelibs libkdegames ];
   nativeBuildInputs = [ shared_mime_info ];
   meta = {
-    description = "a relaxing card sorting game";
+    description = "A relaxing card sorting game";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/kreversi.nix b/pkgs/desktops/kde-4.14/kdegames/kreversi.nix
index 2aed981428e1..065ee4bb657c 100644
--- a/pkgs/desktops/kde-4.14/kdegames/kreversi.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/kreversi.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a simple one player strategy game played against the computer. If a player's piece is captured by an opposing player, that piece is turned over to reveal the color of that player";
+    description = "A simple one player strategy game played against the computer. If a player's piece is captured by an opposing player, that piece is turned over to reveal the color of that player";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/kshisen.nix b/pkgs/desktops/kde-4.14/kdegames/kshisen.nix
index 9c8880340388..085b91584c70 100644
--- a/pkgs/desktops/kde-4.14/kdegames/kshisen.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/kshisen.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames libkmahjongg ];
   meta = {
-    description = "a solitaire-like game played using the standard set of Mahjong tiles";
+    description = "A solitaire-like game played using the standard set of Mahjong tiles";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/ksirk.nix b/pkgs/desktops/kde-4.14/kdegames/ksirk.nix
index 767eb67971a8..bfdd8f358dd1 100644
--- a/pkgs/desktops/kde-4.14/kdegames/ksirk.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/ksirk.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames qca2 ];
   meta = {
-    description = "a computerized version of the well known strategic board game Risk";
+    description = "A computerized version of the well known strategic board game Risk";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix b/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix
index ccf1fb551e9a..ce5e75336c97 100644
--- a/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a simple Tron-Clone";
+    description = "A simple Tron-Clone";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix b/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix
index 5285f7916cad..692eb1c085af 100644
--- a/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "each of two possible players control a satellite spaceship orbiting the sun. As the game progresses players have to eliminate the opponent's spacecraft with bullets or mines";
+    description = "Each of two possible players control a satellite spaceship orbiting the sun. As the game progresses players have to eliminate the opponent's spacecraft with bullets or mines";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/ksquares.nix b/pkgs/desktops/kde-4.14/kdegames/ksquares.nix
index a17be2da6325..7cad6bf0e5ae 100644
--- a/pkgs/desktops/kde-4.14/kdegames/ksquares.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/ksquares.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a game modeled after the well known pen and paper based game of Dots and Boxes";
+    description = "A game modeled after the well known pen and paper based game of Dots and Boxes";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix b/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix
index ea4e13a5e4f3..72a6a72b66d5 100644
--- a/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a logic-based symbol placement puzzle";
+    description = "A logic-based symbol placement puzzle";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix b/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix
index 1a6ba9d653c2..a4480864fd8b 100644
--- a/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a simple constructor game suitable for children and adults alike";
+    description = "A simple constructor game suitable for children and adults alike";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/kubrick.nix b/pkgs/desktops/kde-4.14/kdegames/kubrick.nix
index 9bdc6879db4b..f80cf4a8b356 100644
--- a/pkgs/desktops/kde-4.14/kdegames/kubrick.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/kubrick.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a game based on the Rubik's Cube™ puzzle";
+    description = "A game based on the Rubik's Cube™ puzzle";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix b/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix
index 383b347dc330..d7687c1435f7 100644
--- a/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a library for KMahjongg game";
+    description = "A library for KMahjongg game";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/lskat.nix b/pkgs/desktops/kde-4.14/kdegames/lskat.nix
index 2a5050cd6676..d3e8268784bb 100644
--- a/pkgs/desktops/kde-4.14/kdegames/lskat.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/lskat.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a fun and engaging card game for two players, where the second player is either live opponent, or a built in artificial intelligence";
+    description = "A fun and engaging card game for two players, where the second player is either live opponent, or a built in artificial intelligence";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/palapeli.nix b/pkgs/desktops/kde-4.14/kdegames/palapeli.nix
index ddecc78c75bc..a73fcf100eb7 100644
--- a/pkgs/desktops/kde-4.14/kdegames/palapeli.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/palapeli.nix
@@ -8,6 +8,6 @@ kde {
   buildInputs = [ kdelibs libkdegames ];
 
   meta = {
-    description = "a single-player jigsaw puzzle game";
+    description = "A single-player jigsaw puzzle game";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdegames/picmi.nix b/pkgs/desktops/kde-4.14/kdegames/picmi.nix
index 165d7422f95b..77dcdcf48dce 100644
--- a/pkgs/desktops/kde-4.14/kdegames/picmi.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/picmi.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkdegames ];
   meta = {
-    description = "a single player logic-based puzzle game";
+    description = "A single player logic-based puzzle game";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix b/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix
index 4c56e7529dd7..20e63baf723f 100644
--- a/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix
+++ b/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libkcompactdisc cdparanoia libkcddb libvorbis flac lame ];
   meta = {
-    description = "transparent audio CD access for applications using the KDE Platform";
+    description = "Transparent audio CD access for applications using the KDE Platform";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix b/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix
index 006300742ecd..bb44c3b7234e 100644
--- a/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix
+++ b/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs ];
   meta = {
-    description = "a multimedia player with the focus on simplicity";
+    description = "A multimedia player with the focus on simplicity";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix b/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix
index 45f6c9abcb66..2311b1dda589 100644
--- a/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix
+++ b/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs ffmpeg ];
   meta = {
-    description = "a video thumbnail generator for KDE file managers like Dolphin and Konqueror";
+    description = "A video thumbnail generator for KDE file managers like Dolphin and Konqueror";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix b/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix
index 93365b194b2e..1bf5584de2fa 100644
--- a/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix
+++ b/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix
@@ -5,6 +5,6 @@ kde {
 
   buildInputs = [ kdelibs taglib_1_9 libtunepimp ];
   meta = {
-    description = "an audio jukebox application";
+    description = "An audio jukebox application";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix b/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix
index 8d8bc84e16ef..4d36aaf4f68a 100644
--- a/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix
+++ b/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs libcanberra libpulseaudio ];
   meta = {
-    description = "sound mixer, an application to allow you to change the volume of your sound card";
+    description = "Sound mixer, an application to allow you to change the volume of your sound card";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix b/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix
index 720b01d1861e..66b0cfe869f6 100644
--- a/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix
+++ b/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix
@@ -3,6 +3,6 @@ kde {
 #todo: libmusicbrainz5
   buildInputs = [ kdelibs ];
   meta = {
-    description = "a library used to retrieve audio CD meta data from the internet";
+    description = "A library used to retrieve audio CD meta data from the internet";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix b/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix
index c88ebcc2a5a3..c34b849f4c92 100644
--- a/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix
+++ b/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix
@@ -2,6 +2,6 @@
 kde {
   buildInputs = [ kdelibs ];
   meta = {
-    description = "a video thumbnail generator for KDE";
+    description = "A video thumbnail generator for KDE";
   };
 }
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix b/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix
index 5c357cede8e9..5d4f83e26562 100644
--- a/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix
+++ b/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix
@@ -6,6 +6,6 @@ kde {
   preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.cc}";
 
   meta = {
-    description = "various KDE development utilities";
+    description = "Various KDE development utilities";
   };
 }
diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
index 7d5447ae52ab..bb04df6134d4 100644
--- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     vte_290 libgee gsettings_desktop_schemas defaultIconTheme
   ];
   meta = {
-    description = "elementary OS's terminal";
+    description = "Elementary OS's terminal";
     longDescription = "A super lightweight, beautiful, and simple terminal. It's designed to be setup with sane defaults and little to no configuration. It's just a terminal, nothing more, nothing less. Designed for elementary OS.";
     homepage = https://launchpad.net/pantheon-terminal;
     license = stdenv.lib.licenses.gpl3;
diff --git a/pkgs/development/compilers/elm/packages/elm-repl.nix b/pkgs/development/compilers/elm/packages/elm-repl.nix
index 030378e1811b..3b17722b91d8 100644
--- a/pkgs/development/compilers/elm/packages/elm-repl.nix
+++ b/pkgs/development/compilers/elm/packages/elm-repl.nix
@@ -24,6 +24,6 @@ mkDerivation {
   ];
   jailbreak = true;
   homepage = "https://github.com/elm-lang/elm-repl";
-  description = "a REPL for Elm";
+  description = "A REPL for Elm";
   license = stdenv.lib.licenses.bsd3;
 }
diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix
index 9c540b0c10eb..5403c29baab4 100644
--- a/pkgs/development/compilers/emscripten-fastcomp/default.nix
+++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://github.com/kripken/emscripten-fastcomp;
-    description = "emscripten llvm";
+    description = "Emscripten llvm";
     platforms = platforms.all;
     maintainers = with maintainers; [ qknight matthewbauer ];
     license = stdenv.lib.licenses.ncsa;
diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix
index 983f86531dc9..7e8312549da9 100644
--- a/pkgs/development/compilers/manticore/default.nix
+++ b/pkgs/development/compilers/manticore/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   inherit stdenv coreutils autoconf automake smlnj;
 
   meta = {
-    description = "a parallel, pure variant of Standard ML";
+    description = "A parallel, pure variant of Standard ML";
 
     longDescription = '' 
       Manticore is a high-level parallel programming language aimed at
diff --git a/pkgs/development/haskell-modules/ghcjs/stage2.nix b/pkgs/development/haskell-modules/ghcjs/stage2.nix
index 4b31e77ca7bd..aca4c6c7828f 100644
--- a/pkgs/development/haskell-modules/ghcjs/stage2.nix
+++ b/pkgs/development/haskell-modules/ghcjs/stage2.nix
@@ -312,7 +312,7 @@
         ];
         jailbreak = true;
         homepage = "http://github.com/ghcjs/ghcjs-base";
-        description = "base library for GHCJS";
+        description = "Base library for GHCJS";
         license = stdenv.lib.licenses.mit;
       }) {};
   Cabal = callPackage
diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index 23ea2fd65528..adf743848d19 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "high-performance JIT compiler for Lua 5.1";
+    description = "High-performance JIT compiler for Lua 5.1";
     homepage    = http://luajit.org;
     license     = licenses.mit;
     platforms   = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 726e2aa6aca1..48712cc21b98 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -109,7 +109,7 @@ let
 
     meta = {
       homepage = "http://python.org";
-      description = "a high-level dynamically-typed programming language";
+      description = "A high-level dynamically-typed programming language";
       longDescription = ''
         Python is a remarkably powerful dynamic programming language that
         is used in a wide variety of application domains. Some of its key
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index a72377a47708..3538f901d460 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -162,7 +162,7 @@ let
 
     meta = {
       homepage = "http://python.org";
-      description = "a high-level dynamically-typed programming language";
+      description = "A high-level dynamically-typed programming language";
       longDescription = ''
         Python is a remarkably powerful dynamic programming language that
         is used in a wide variety of application domains. Some of its key
diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix
index 8c7e82557ab5..3f3627b6b238 100644
--- a/pkgs/development/libraries/audio/zita-resampler/default.nix
+++ b/pkgs/development/libraries/audio/zita-resampler/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "resample library by Fons Adriaensen";
+    description = "Resample library by Fons Adriaensen";
     version = "${version}";
     homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
     license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix
index 8b40260ddf39..12670ab711ae 100644
--- a/pkgs/development/libraries/buddy/default.nix
+++ b/pkgs/development/libraries/buddy/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://sourceforge.net/projects/buddy/";
-    description = "binary decision diagram package";
+    description = "Binary decision diagram package";
     license = "as-is";
 
     platforms = with stdenv.lib.platforms; allBut cygwin;
diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index a72532ee35bc..76069e72b0d6 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   enableParallelBuild = true;
 
   meta = {
-    description = "advanced disassembly library";
+    description = "Advanced disassembly library";
     homepage    = "http://www.capstone-engine.org";
     license     = stdenv.lib.licenses.bsd3;
     platforms   = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 366e5f613a97..9573358a22f5 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://cyrusimap.web.cmu.edu/";
-    description = "library for adding authentication support to connection-based protocols";
+    description = "Library for adding authentication support to connection-based protocols";
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix
index fa8e9f0ef2c9..26357b440498 100644
--- a/pkgs/development/libraries/frame/default.nix
+++ b/pkgs/development/libraries/frame/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://launchpad.net/frame";
-    description = "handles the buildup and synchronization of a set of simultaneous touches";
+    description = "Handles the buildup and synchronization of a set of simultaneous touches";
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/libraries/ftgl/2.1.2.nix b/pkgs/development/libraries/ftgl/2.1.2.nix
index c83173450b19..0a4a6e6b9b00 100644
--- a/pkgs/development/libraries/ftgl/2.1.2.nix
+++ b/pkgs/development/libraries/ftgl/2.1.2.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://sourceforge.net/apps/mediawiki/ftgl/";
-    description = "font rendering library for OpenGL applications";
+    description = "Font rendering library for OpenGL applications";
     license = stdenv.lib.licenses.gpl3Plus;
 
     longDescription = ''
diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix
index ce750fc1696f..8fc69ec75685 100644
--- a/pkgs/development/libraries/ftgl/default.nix
+++ b/pkgs/development/libraries/ftgl/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://sourceforge.net/apps/mediawiki/ftgl/";
-    description = "font rendering library for OpenGL applications";
+    description = "Font rendering library for OpenGL applications";
     license = stdenv.lib.licenses.gpl3Plus;
 
     longDescription = ''
diff --git a/pkgs/development/libraries/git2/0.21.nix b/pkgs/development/libraries/git2/0.21.nix
index 823f09b8bced..4ea430865485 100644
--- a/pkgs/development/libraries/git2/0.21.nix
+++ b/pkgs/development/libraries/git2/0.21.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ zlib libssh2 openssl http-parser ];
 
   meta = {
-    description = "the Git linkable library";
+    description = "The Git linkable library";
     homepage = http://libgit2.github.com/;
     license = stdenv.lib.licenses.gpl2;
     platforms = with stdenv.lib.platforms; all;
diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index 3e9e0bea8e3b..7aaac299b0e3 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (rec {
   buildInputs = [ zlib libssh2 openssl http-parser ];
 
   meta = {
-    description = "the Git linkable library";
+    description = "The Git linkable library";
     homepage = http://libgit2.github.com/;
     license = stdenv.lib.licenses.gpl2;
     platforms = with stdenv.lib.platforms; all;
diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix
index 25c8d7e561b6..fe816ee5267c 100644
--- a/pkgs/development/libraries/idnkit/default.nix
+++ b/pkgs/development/libraries/idnkit/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://www.nic.ad.jp/ja/idn/idnkit;
-    description = "provides functionalities about i18n domain name processing";
+    description = "Provides functionalities about i18n domain name processing";
     license = "idnkit-2 license";
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix
index 7dba9e025198..35eabdd35563 100644
--- a/pkgs/development/libraries/jbigkit/default.nix
+++ b/pkgs/development/libraries/jbigkit/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/";
-    description = "a software implementation of the JBIG1 data compression standard";
+    description = "A software implementation of the JBIG1 data compression standard";
     license = licenses.gpl2;
     platforms = platforms.all;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/kinetic-cpp-client/default.nix b/pkgs/development/libraries/kinetic-cpp-client/default.nix
index 64fd951d70dd..445f65b9202e 100644
--- a/pkgs/development/libraries/kinetic-cpp-client/default.nix
+++ b/pkgs/development/libraries/kinetic-cpp-client/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://github.com/Seagate/kinetic-cpp-client;
-    description = "code for producing C and C++ kinetic clients";
+    description = "Code for producing C and C++ kinetic clients";
     license = licenses.lgpl21;
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix
index 6617816b642b..8e7971d8087c 100644
--- a/pkgs/development/libraries/kyotocabinet/default.nix
+++ b/pkgs/development/libraries/kyotocabinet/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://fallabs.com/kyotocabinet;
-    description = "a library of routines for managing a database";
+    description = "A library of routines for managing a database";
     license = licenses.gpl3;
     platforms = platforms.all;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix
index d266a97535e6..07689fbdd277 100644
--- a/pkgs/development/libraries/ldb/default.nix
+++ b/pkgs/development/libraries/ldb/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    description = "a LDAP-like embedded database";
+    description = "A LDAP-like embedded database";
     homepage = http://ldb.samba.org/;
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/development/libraries/libasyncns/default.nix
index bc21237e238d..bafcc5210b38 100644
--- a/pkgs/development/libraries/libasyncns/default.nix
+++ b/pkgs/development/libraries/libasyncns/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://0pointer.de/lennart/projects/libasyncns/;
-    description = "a C library for Linux/Unix for executing name service queries asynchronously";
+    description = "A C library for Linux/Unix for executing name service queries asynchronously";
     license = licenses.lgpl21;
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix
index ff9cd25293aa..df18ae06ed66 100644
--- a/pkgs/development/libraries/libconfig/default.nix
+++ b/pkgs/development/libraries/libconfig/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://www.hyperrealm.com/libconfig;
-    description = "a simple library for processing structured configuration files";
+    description = "A simple library for processing structured configuration files";
     license = licenses.lgpl3;
     maintainers = [ maintainers.goibhniu ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/development/libraries/libdwg/default.nix
index 8ffa1ff81924..f44d228f6501 100644
--- a/pkgs/development/libraries/libdwg/default.nix
+++ b/pkgs/development/libraries/libdwg/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ indent ];
 
   meta = {
-    description = "library reading dwg files";
+    description = "Library reading dwg files";
     homepage = http://libdwg.sourceforge.net/en/;
     license = stdenv.lib.licenses.gpl3;
     maintainers = [stdenv.lib.maintainers.marcweber];
diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/development/libraries/libestr/default.nix
index ad37f9010c5c..96de7eb7b3c2 100644
--- a/pkgs/development/libraries/libestr/default.nix
+++ b/pkgs/development/libraries/libestr/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://libestr.adiscon.com/;
-    description = "some essentials for string handling";
+    description = "Some essentials for string handling";
     license = licenses.lgpl21;
     platforms = platforms.all;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix
index 6292318d5ca9..a91205e182c7 100644
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://github.com/libical/libical;
-    description = "an Open Source implementation of the iCalendar protocols";
+    description = "An Open Source implementation of the iCalendar protocols";
     license = licenses.mpl10;
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix
index ab8c696a66c7..cb62ff3628b8 100644
--- a/pkgs/development/libraries/liblo/default.nix
+++ b/pkgs/development/libraries/liblo/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = { 
-    description = "lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol";
+    description = "Lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol";
     homepage = http://sourceforge.net/projects/liblo;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [stdenv.lib.maintainers.marcweber];
diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix
index c5d91e266992..81490ccd5390 100644
--- a/pkgs/development/libraries/liblognorm/default.nix
+++ b/pkgs/development/libraries/liblognorm/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://www.liblognorm.com/;
-    description = "help to make sense out of syslog data, or, actually, any event data that is present in text form";
+    description = "Help to make sense out of syslog data, or, actually, any event data that is present in text form";
     license = licenses.lgpl21;
     platforms = platforms.all;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix
index 94401c30a6ba..caabde85f29b 100644
--- a/pkgs/development/libraries/libmnl/default.nix
+++ b/pkgs/development/libraries/libmnl/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "minimalistic user-space library oriented to Netlink developers";
+    description = "Minimalistic user-space library oriented to Netlink developers";
     longDescription = ''
       libmnl is a minimalistic user-space library oriented to Netlink developers.
       There are a lot of common tasks in parsing, validating, constructing of both the Netlink
diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix
index a1d2b3b8e244..b1d26b81a8d4 100644
--- a/pkgs/development/libraries/libnetfilter_queue/default.nix
+++ b/pkgs/development/libraries/libnetfilter_queue/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.netfilter.org/projects/libnetfilter_queue/";
-    description = "userspace API to packets queued by the kernel packet filter";
+    description = "Userspace API to packets queued by the kernel packet filter";
 
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix
index 4a80ac3a8755..24e46c0802b2 100644
--- a/pkgs/development/libraries/libomxil-bellagio/default.nix
+++ b/pkgs/development/libraries/libomxil-bellagio/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://sourceforge.net/projects/omxil/;
-    description = "an opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components";
+    description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components";
     license = licenses.lgpl21;
     platforms = platforms.all;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix
index 809a855835df..c19dc73abfa6 100644
--- a/pkgs/development/libraries/libqb/default.nix
+++ b/pkgs/development/libraries/libqb/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec{
 
   meta = with stdenv.lib; {
     homepage = https://github.com/clusterlabs/libqb;
-    description = "a library providing high performance logging, tracing, ipc, and poll";
+    description = "A library providing high performance logging, tracing, ipc, and poll";
     license = licenses.lgpl21;
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix
index 1a7c8c92b538..52439f0fe2cc 100644
--- a/pkgs/development/libraries/librelp/default.nix
+++ b/pkgs/development/libraries/librelp/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://www.librelp.com/;
-    description = "a reliable logging library";
+    description = "A reliable logging library";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
index 63a60820e3fc..e30271aaa384 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "high level library for the Linux Kernel seccomp filter";
+    description = "High level library for the Linux Kernel seccomp filter";
     homepage    = "http://sourceforge.net/projects/libseccomp";
     license     = licenses.lgpl2;
     platforms   = platforms.linux;
diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix
index 36327327b4dd..8ffb8f8bde98 100644
--- a/pkgs/development/libraries/libstatgrab/default.nix
+++ b/pkgs/development/libraries/libstatgrab/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://www.i-scream.org/libstatgrab/;
-    description = "a library that provides cross platforms access to statistics about the running system";
+    description = "A library that provides cross platforms access to statistics about the running system";
     license = licenses.gpl2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix
index b9c4a0a36d40..3a09a0de4bfb 100644
--- a/pkgs/development/libraries/libstroke/default.nix
+++ b/pkgs/development/libraries/libstroke/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     '';
 
   meta = {
-    description = "libstroke, a library for simple gesture recognition";
+    description = "Libstroke, a library for simple gesture recognition";
     homepage = http://etla.net/libstroke/;
     license = stdenv.lib.licenses.gpl2;
 
diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix
index 2356e5bddbd6..0d757d33cf95 100644
--- a/pkgs/development/libraries/libwacom/default.nix
+++ b/pkgs/development/libraries/libwacom/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     platforms = platforms.linux;
     homepage = http://sourceforge.net/projects/linuxwacom/;
-    description = "libraries, configuration, and diagnostic tools for Wacom tablets running under Linux";
+    description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux";
   };
 }
diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix
index c084cfb8116d..ba179e54fe0c 100644
--- a/pkgs/development/libraries/libykneomgr/default.nix
+++ b/pkgs/development/libraries/libykneomgr/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://developers.yubico.com/libykneomgr;
-    description = "a C library to interact with the CCID-part of the Yubikey NEO";
+    description = "A C library to interact with the CCID-part of the Yubikey NEO";
     license = licenses.bsd3;
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix
index 6d63e8367f79..fbae5245b6d9 100644
--- a/pkgs/development/libraries/log4cplus/default.nix
+++ b/pkgs/development/libraries/log4cplus/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://log4cplus.sourceforge.net/";
-    description = "a port the log4j library from Java to C++";
+    description = "A port the log4j library from Java to C++";
     license = stdenv.lib.licenses.asl20;
   };
 }
diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix
index 5830786f6448..164960a52833 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
 
   meta = with stdenv.lib; {
-    description = "a powerful and lightweight streaming engine specialized for voice/video telephony applications";
+    description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications";
     homepage = http://www.linphone.org/technical-corner/mediastreamer2/overview;
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix
index 345ff5d31b5d..fa4758d0877a 100644
--- a/pkgs/development/libraries/minixml/default.nix
+++ b/pkgs/development/libraries/minixml/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation  rec {
   };
 
   meta = with stdenv.lib; {
-    description = "a small XML library";
+    description = "A small XML library";
     homepage = http://www.minixml.org;
     license = licenses.lgpl2;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/poker-eval/default.nix b/pkgs/development/libraries/poker-eval/default.nix
index 1291617ad6fa..f6e7ed56adc4 100644
--- a/pkgs/development/libraries/poker-eval/default.nix
+++ b/pkgs/development/libraries/poker-eval/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://pokersource.org/poker-eval/;
-    description = "poker hand evaluator";
+    description = "Poker hand evaluator";
     license = stdenv.lib.licenses.gpl3;
     maintainers = [stdenv.lib.maintainers.mtreskin];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix
index f99514f054a5..02d758f89f26 100644
--- a/pkgs/development/libraries/popt/default.nix
+++ b/pkgs/development/libraries/popt/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
   ] else null;
 
   meta = {
-    description = "command line option parsing library";
+    description = "Command line option parsing library";
   };
 }
diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix
index c39314843c02..90e1dfded6ae 100644
--- a/pkgs/development/libraries/resolv_wrapper/default.nix
+++ b/pkgs/development/libraries/resolv_wrapper/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   meta = with stdenv.lib; {
-    description = "a wrapper for the user, group and hosts NSS API";
+    description = "A wrapper for the user, group and hosts NSS API";
     homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary";
     license = licenses.bsd3;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix
index 0c6f40c8b143..b93312b0e8c9 100644
--- a/pkgs/development/libraries/socket_wrapper/default.nix
+++ b/pkgs/development/libraries/socket_wrapper/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   meta = with stdenv.lib; {
-    description = "a library passing all socket communications through unix sockets";
+    description = "A library passing all socket communications through unix sockets";
     homepage = "https://git.samba.org/?p=socket_wrapper.git;a=summary";
     license = licenses.bsd3;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix
index 8e3cf899e40b..ce313e351686 100644
--- a/pkgs/development/libraries/speex/default.nix
+++ b/pkgs/development/libraries/speex/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     hompage = http://www.speex.org/;
-    description = "an Open Source/Free Software patent-free audio compression format designed for speech";
+    description = "An Open Source/Free Software patent-free audio compression format designed for speech";
     license = licenses.bsd3;
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix
index 56b1900837ac..e31c793a7d7a 100644
--- a/pkgs/development/libraries/speexdsp/default.nix
+++ b/pkgs/development/libraries/speexdsp/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     hompage = http://www.speex.org/;
-    description = "an Open Source/Free Software patent-free audio compression format designed for speech";
+    description = "An Open Source/Free Software patent-free audio compression format designed for speech";
     license = licenses.bsd3;
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix
index 35d7f53173fb..d53941b5e2f5 100644
--- a/pkgs/development/libraries/uid_wrapper/default.nix
+++ b/pkgs/development/libraries/uid_wrapper/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   meta = with stdenv.lib; {
-    description = "a wrapper for the user, group and hosts NSS API";
+    description = "A wrapper for the user, group and hosts NSS API";
     homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary";
     license = licenses.bsd3;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix
index 803c552b4878..9f9f90a6f176 100644
--- a/pkgs/development/libraries/webrtc-audio-processing/default.nix
+++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing;
-    description = "a more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project";
+    description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project";
     license = licenses.bsd3;
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix
index 708db269e946..6e4dc00b0387 100644
--- a/pkgs/development/libraries/x264/default.nix
+++ b/pkgs/development/libraries/x264/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ yasm ];
 
   meta = with stdenv.lib; {
-    description = "library for encoding H264/AVC video streams";
+    description = "Library for encoding H264/AVC video streams";
     homepage    = http://www.videolan.org/developers/x264.html;
     license     = licenses.gpl2;
     platforms   = platforms.unix;
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 6ec61cda9d09..e8ec8f2aa241 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -345,7 +345,7 @@ let lispPackages = rec {
   command-line-arguments = buildLispPackage rec {
     baseName = "command-line-arguments";
     version = "git-20141113";
-    description = "small library to deal with command-line arguments";
+    description = "Small library to deal with command-line arguments";
     deps = [];
     # Source type: git
     src = pkgs.fetchgit {
diff --git a/pkgs/development/mobile/titaniumenv/cli/registry.nix b/pkgs/development/mobile/titaniumenv/cli/registry.nix
index 045f619087e4..3d31d41dd434 100644
--- a/pkgs/development/mobile/titaniumenv/cli/registry.nix
+++ b/pkgs/development/mobile/titaniumenv/cli/registry.nix
@@ -120,7 +120,7 @@ let
         sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
       };
       meta = {
-        description = "get colors in your node.js console";
+        description = "Get colors in your node.js console";
         homepage = https://github.com/Marak/colors.js;
         license = "MIT";
       };
@@ -169,7 +169,7 @@ let
         sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
       };
       meta = {
-        description = "get colors in your node.js console like what";
+        description = "Get colors in your node.js console like what";
         homepage = https://github.com/Marak/colors.js;
       };
       production = true;
@@ -513,7 +513,7 @@ let
         sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
       };
       meta = {
-        description = "parse argument options";
+        description = "Parse argument options";
         homepage = https://github.com/substack/minimist;
         license = "MIT";
       };
@@ -1164,7 +1164,7 @@ let
         sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
       };
       meta = {
-        description = "read and write binary structures and data types";
+        description = "Read and write binary structures and data types";
         homepage = https://github.com/rmustacc/node-ctype;
       };
       production = true;
@@ -1599,7 +1599,7 @@ let
         };
       };
       meta = {
-        description = "the complete solution for node.js command-line programs";
+        description = "The complete solution for node.js command-line programs";
         homepage = "https://github.com/tj/commander.js#readme";
         license = "MIT";
       };
@@ -1614,7 +1614,7 @@ let
         sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
       };
       meta = {
-        description = "graceful fs.readlink";
+        description = "Graceful fs.readlink";
         homepage = https://github.com/zhiyelee/graceful-readlink;
         license = "MIT";
       };
@@ -1745,7 +1745,7 @@ let
       };
       dependencies = {};
       meta = {
-        description = "extend like a boss";
+        description = "Extend like a boss";
         homepage = https://github.com/Raynos/xtend;
         license = "MIT";
       };
@@ -2316,7 +2316,7 @@ let
         sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
       };
       meta = {
-        description = "get colors in your node.js console";
+        description = "Get colors in your node.js console";
         homepage = https://github.com/Marak/colors.js;
         license = "MIT";
       };
@@ -2332,7 +2332,7 @@ let
         sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
       };
       meta = {
-        description = "decycle your json";
+        description = "Decycle your json";
         homepage = https://github.com/douglascrockford/JSON-js;
       };
       production = true;
@@ -2347,7 +2347,7 @@ let
         sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
       };
       meta = {
-        description = "a customizable value inspector";
+        description = "A customizable value inspector";
       };
       production = true;
       linkDependencies = false;
diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix
index d2fa675bbd82..f25a6f97b392 100644
--- a/pkgs/development/ocaml-modules/http/default.nix
+++ b/pkgs/development/ocaml-modules/http/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = http://ocaml-http.forge.ocamlcore.org/;
     platforms = ocaml.meta.platforms or [];
-    description = "do it yourself (OCaml) HTTP daemon";
+    description = "Do it yourself (OCaml) HTTP daemon";
     license = licenses.lgpl2;
     maintainers = with maintainers; [ roconnor vbgl ];
   };
diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix
index 16a1ac3b30f2..10a3a1602ae9 100644
--- a/pkgs/development/ocaml-modules/zarith/default.nix
+++ b/pkgs/development/ocaml-modules/zarith/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   preInstall = "mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib";
 
   meta = with stdenv.lib; {
-    description = "fast, arbitrary precision OCaml integers";
+    description = "Fast, arbitrary precision OCaml integers";
     homepage    = "http://forge.ocamlcore.org/projects/zarith";
     license     = licenses.lgpl2;
     platforms   = ocaml.meta.platforms or [];
diff --git a/pkgs/development/pure-modules/gplot/default.nix b/pkgs/development/pure-modules/gplot/default.nix
index acaf1efdaaac..e110afa1d249 100644
--- a/pkgs/development/pure-modules/gplot/default.nix
+++ b/pkgs/development/pure-modules/gplot/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   setupHook = ../generic-setup-hook.sh;
 
   meta = {
-    description = "a pure binding to gnuplot";
+    description = "A pure binding to gnuplot";
     homepage = http://puredocs.bitbucket.org/pure-gplot.html;
     license = stdenv.lib.licenses.lgpl3Plus;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index c60ee54bec8e..6bc28fd95687 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -55,7 +55,7 @@ buildPythonPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "python plotting library, making publication quality plots";
+    description = "Python plotting library, making publication quality plots";
     homepage    = "http://matplotlib.sourceforge.net/";
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.unix;
diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix
index 00eb5b9afc13..ffb2896da359 100644
--- a/pkgs/development/tools/analysis/kcov/default.nix
+++ b/pkgs/development/tools/analysis/kcov/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ cmake pkgconfig zlib curl elfutils python libiberty binutils ];
   
   meta = with stdenv.lib; {
-    description = "code coverage tester for compiled programs, Python scripts and shell scripts";
+    description = "Code coverage tester for compiled programs, Python scripts and shell scripts";
 
     longDescription = ''
       Kcov is a code coverage tester for compiled programs, Python
diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix
index af3f4a1afffb..fdeafcbb4fe2 100644
--- a/pkgs/development/tools/gnulib/default.nix
+++ b/pkgs/development/tools/gnulib/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://www.gnu.org/software/gnulib/";
-    description = "central location for code to be shared among GNU packages";
+    description = "Central location for code to be shared among GNU packages";
     license = stdenv.lib.licenses.gpl3Plus;
   };
 }
diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix
index 26acd085bb85..7a2796b48ca8 100644
--- a/pkgs/development/tools/misc/distcc/default.nix
+++ b/pkgs/development/tools/misc/distcc/default.nix
@@ -70,7 +70,7 @@ let
     };
 
     meta = {
-      description = "a fast, free distributed C/C++ compiler";
+      description = "A fast, free distributed C/C++ compiler";
       homepage = "http://distcc.org";
       license = "GPL";
 
diff --git a/pkgs/development/tools/misc/usb-modeswitch/data.nix b/pkgs/development/tools/misc/usb-modeswitch/data.nix
index 91b343b20b4c..f543d3a475c1 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/data.nix
+++ b/pkgs/development/tools/misc/usb-modeswitch/data.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig libusb1 usb-modeswitch ];
 
   meta = {
-    description = "device database and the rules file for 'multi-mode' USB devices";
+    description = "Device database and the rules file for 'multi-mode' USB devices";
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix
index 9aad2edfa4ec..893df94d2379 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/default.nix
+++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig libusb1 ];
 
   meta = {
-    description = "a mode switching tool for controlling 'multi-mode' USB devices";
+    description = "A mode switching tool for controlling 'multi-mode' USB devices";
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix
index 1d7e6b330423..07cc55465d10 100644
--- a/pkgs/development/tools/misc/xxdiff/default.nix
+++ b/pkgs/development/tools/misc/xxdiff/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://furius.ca/xxdiff/";
-    description = "graphical file and directories comparator and merge tool";
+    description = "Graphical file and directories comparator and merge tool";
     license = stdenv.lib.licenses.gpl2;
 
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix
index 9c781e6f7577..c68c29f86dea 100644
--- a/pkgs/development/tools/neoload/default.nix
+++ b/pkgs/development/tools/neoload/default.nix
@@ -82,7 +82,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "load testing software for Web applications to realistically simulate user activity and analyze server behavior";
+    description = "Load testing software for Web applications to realistically simulate user activity and analyze server behavior";
 
     homepage = https://www.neotys.com/product/overview-neoload.html;
 
diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix
index 4a6cdc3aa34b..d5a6889c06af 100644
--- a/pkgs/development/web/csslint/default.nix
+++ b/pkgs/development/web/csslint/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "checks CSS for syntax errors and other problems";
+    description = "Checks CSS for syntax errors and other problems";
     longDescription = ''
       CSSLint is a tool to help point out problems with your CSS
       code. It does basic syntax checking as well as applying a set of
diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix
index b3237012eccd..5e5da9497e58 100644
--- a/pkgs/games/planetaryannihilation/default.nix
+++ b/pkgs/games/planetaryannihilation/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     homepage = http://www.uberent.com/pa/;
-    description = "next-generation RTS that takes the genre to a planetary scale";
+    description = "Next-generation RTS that takes the genre to a planetary scale";
     license = stdenv.lib.licenses.unfree;
     platforms = platforms.linux;
     maintainers = [ maintainers.domenkozar ];
diff --git a/pkgs/games/zandronum/bin.nix b/pkgs/games/zandronum/bin.nix
index 6ac61571d4cb..0d6c21bfa823 100644
--- a/pkgs/games/zandronum/bin.nix
+++ b/pkgs/games/zandronum/bin.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://zandronum.com/;
-    description = "multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software. Binary version for online play";
+    description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software. Binary version for online play";
     maintainers = [ stdenv.lib.maintainers.lassulus ];
     # Binary version has different version string than source code version.
     license = stdenv.lib.licenses.unfreeRedistributable;
diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix
index ab7a6d7cb432..cf5e41f389a9 100644
--- a/pkgs/games/zangband/default.nix
+++ b/pkgs/games/zangband/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "rogue-like game";
+    description = "Rogue-like game";
     license = stdenv.lib.licenses.unfree;
   };
 }
diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix
index c1ff6cb94934..e5cd08b7f9de 100644
--- a/pkgs/misc/emulators/snes9x-gtk/default.nix
+++ b/pkgs/misc/emulators/snes9x-gtk/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "a portable, freeware Super Nintendo Entertainment System (SNES) emulator";
+    description = "A portable, freeware Super Nintendo Entertainment System (SNES) emulator";
     longDescription = "Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES) emulator. It basically allows you to play most games designed for the SNES and Super Famicom Nintendo game systems on your PC or Workstation; which includes some real gems that were only ever released in Japan.";
     license = stdenv.lib.licenses.lgpl2;
     maintainers = [ stdenv.lib.maintainers.qknight ];
diff --git a/pkgs/misc/gnuk/generic.nix b/pkgs/misc/gnuk/generic.nix
index 52e970b5b822..14d487da82ba 100644
--- a/pkgs/misc/gnuk/generic.nix
+++ b/pkgs/misc/gnuk/generic.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     homepage = http://www.fsij.org/pages/gnuk;
-    description = "an implementation of USB cryptographic token for gpg";
+    description = "An implementation of USB cryptographic token for gpg";
     license = licenses.gpl3;
     maintainers = with maintainers; [ wkennington ];
   };
diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix
index 48b30bccbdd8..80e405d4442f 100644
--- a/pkgs/misc/screensavers/light-locker/default.nix
+++ b/pkgs/misc/screensavers/light-locker/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://github.com/the-cavalry/light-locker;
-    description = "light-locker is a simple locker";
+    description = "Light-locker is a simple locker";
     longDescription = ''
       light-locker is a simple locker (forked from gnome-screensaver) that aims to have simple, sane, secure defaults and be well integrated with the desktop while not carrying any desktop-specific dependencies.
       It relies on lightdm for locking and unlocking your session via ConsoleKit/UPower or logind/systemd.
diff --git a/pkgs/os-specific/linux/cgmanager/default.nix b/pkgs/os-specific/linux/cgmanager/default.nix
index 2260ac08b632..e46aecbd4142 100644
--- a/pkgs/os-specific/linux/cgmanager/default.nix
+++ b/pkgs/os-specific/linux/cgmanager/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://linuxcontainers.org/cgmanager/introduction/;
-    description = "a central privileged daemon that manages all your cgroups";
+    description = "A central privileged daemon that manages all your cgroups";
     license = licenses.lgpl21;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/os-specific/linux/fswebcam/default.nix b/pkgs/os-specific/linux/fswebcam/default.nix
index fa0797bf7a3c..fd37d35623e4 100644
--- a/pkgs/os-specific/linux/fswebcam/default.nix
+++ b/pkgs/os-specific/linux/fswebcam/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     [ libv4l gd ];
 
   meta = {
-    description = "neat and simple webcam app";
+    description = "Neat and simple webcam app";
     homepage = http://www.sanslogic.co.uk/fswebcam;
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/os-specific/linux/fusionio/vsl.nix b/pkgs/os-specific/linux/fusionio/vsl.nix
index f3909950cb91..8e24b5061cd3 100644
--- a/pkgs/os-specific/linux/fusionio/vsl.nix
+++ b/pkgs/os-specific/linux/fusionio/vsl.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://fusionio.com;
-    description = "kernel driver for accessing fusion-io cards";
+    description = "Kernel driver for accessing fusion-io cards";
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
     broken = stdenv.system != "x86_64-linux";
diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix
index 8d05a0d7d232..a3d212dda53b 100644
--- a/pkgs/os-specific/linux/libsmbios/default.nix
+++ b/pkgs/os-specific/linux/libsmbios/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://linux.dell.com/libsmbios/main";
-    description = "a library to obtain BIOS information";
+    description = "A library to obtain BIOS information";
     license = stdenv.lib.licenses.gpl2Plus; # alternatively, under the Open Software License version 2.1
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix
index 7765f5f8b9c2..3c7ceb1270c0 100644
--- a/pkgs/os-specific/linux/lockdep/default.nix
+++ b/pkgs/os-specific/linux/lockdep/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "userspace locking validation tool built on the Linux kernel";
+    description = "Userspace locking validation tool built on the Linux kernel";
     homepage    = "https://kernel.org/";
     license     = stdenv.lib.licenses.gpl2;
     platforms   = stdenv.lib.platforms.linux;
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 82ea72af1605..eda1863ec97b 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://lxc.sourceforge.net";
-    description = "userspace tools for Linux Containers, a lightweight virtualization system";
+    description = "Userspace tools for Linux Containers, a lightweight virtualization system";
     license = licenses.lgpl21Plus;
 
     longDescription = ''
diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix
index e0b16eb24f5b..4b3e078cb57d 100644
--- a/pkgs/os-specific/linux/nftables/default.nix
+++ b/pkgs/os-specific/linux/nftables/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig docbook2x flex bison libmnl libnftnl gmp readline ];
 
   meta = with stdenv.lib; {
-    description = "the project that aims to replace the existing {ip,ip6,arp,eb}tables framework";
+    description = "The project that aims to replace the existing {ip,ip6,arp,eb}tables framework";
     homepage = http://netfilter.org/projects/nftables;
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix
index c50f0185eb52..1d1712f6b476 100644
--- a/pkgs/os-specific/linux/trace-cmd/default.nix
+++ b/pkgs/os-specific/linux/trace-cmd/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   installPhase   = "make prefix=$out install install_doc";
 
   meta = {
-    description = "user-space tools for the Linux kernel ftrace subsystem";
+    description = "User-space tools for the Linux kernel ftrace subsystem";
     license     = stdenv.lib.licenses.gpl2;
     platforms   = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
diff --git a/pkgs/servers/http/micro-httpd/default.nix b/pkgs/servers/http/micro-httpd/default.nix
index ba7c69ef7dbf..02cf49854ac8 100644
--- a/pkgs/servers/http/micro-httpd/default.nix
+++ b/pkgs/servers/http/micro-httpd/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage    = "http://acme.com/software/micro_httpd/";
-    description = "a really small HTTP server";
+    description = "A really small HTTP server";
     license     = licenses.bsd2;
     platforms   = platforms.unix;
     maintainers = with maintainers; [ copumpkin ];
diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix
index f35497fef8e4..20cea2708895 100644
--- a/pkgs/servers/http/mini-httpd/default.nix
+++ b/pkgs/servers/http/mini-httpd/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://mini-httpd.nongnu.org/";
-    description = "a minimalistic high-performance web server";
+    description = "A minimalistic high-performance web server";
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.peti ];
diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix
index 39667c8ba626..c5f7a45cefea 100644
--- a/pkgs/servers/ldap/389/default.nix
+++ b/pkgs/servers/ldap/389/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://directory.fedoraproject.org/;
-    description = "enterprise-class Open Source LDAP server for Linux";
+    description = "Enterprise-class Open Source LDAP server for Linux";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix
index cf8aea594325..3ecb00b64fc3 100644
--- a/pkgs/servers/mail/petidomo/default.nix
+++ b/pkgs/servers/mail/petidomo/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://petidomo.sourceforge.net/";
-    description = "a simple and easy to administer mailing list server";
+    description = "A simple and easy to administer mailing list server";
     license = stdenv.lib.licenses.gpl3Plus;
 
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix
index f45dd3b7248a..c8202b35455c 100644
--- a/pkgs/servers/mail/postfix/pfixtools.nix
+++ b/pkgs/servers/mail/postfix/pfixtools.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
   makeFlags = "DESTDIR=$(out) prefix=";
 
   meta = {
-    description = "a collection of postfix-related tools";
+    description = "A collection of postfix-related tools";
     license = with lib.licenses; [ bsd3 ];
     homepage = https://github.com/Fruneau/pfixtools;
   };
diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index 0888eb1182a0..92b529fc564c 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "https://github.com/vstakhov/rspamd";
     license = licenses.asl20;
-    description = "advanced spam filtering system";
+    description = "Advanced spam filtering system";
     maintainers = with maintainers; [ avnik fpletz ];
   };
 }
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index ca7e30e95e3d..127d807133e0 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -93,7 +93,7 @@ in stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    description = "a scalable, high-performance, open source NoSQL database";
+    description = "A scalable, high-performance, open source NoSQL database";
     homepage = http://www.mongodb.org;
     license = licenses.agpl3;
 
diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix
index 91c4472e0492..f94ca52259e6 100644
--- a/pkgs/servers/nosql/neo4j/default.nix
+++ b/pkgs/servers/nosql/neo4j/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "a highly scalable, robust (fully ACID) native graph database";
+    description = "A highly scalable, robust (fully ACID) native graph database";
     homepage = "http://www.neo4j.org/";
     license = licenses.gpl3;
 
diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix
index e518d063dd45..7546fe37afe5 100644
--- a/pkgs/servers/squid/default.nix
+++ b/pkgs/servers/squid/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    description = "a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more";
+    description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more";
     homepage = "http://www.squid-cache.org";
     license = stdenv.lib.licenses.gpl2;
   };
diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix
index 035b4fd6ee73..c7c7b9e55674 100644
--- a/pkgs/tools/X11/xvkbd/default.nix
+++ b/pkgs/tools/X11/xvkbd/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   configurePhase = '' xmkmf -a '';
 
   meta = with stdenv.lib; {
-    description = "virtual keyboard for X window system";
+    description = "Virtual keyboard for X window system";
     longDescription = ''
       xvkbd is a virtual (graphical) keyboard program for X Window System which provides
       facility to enter characters onto other clients (softwares) by clicking on a
diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix
index e73e71da51a2..b0b9444a2380 100644
--- a/pkgs/tools/backup/partimage/default.nix
+++ b/pkgs/tools/backup/partimage/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   ];
 
   meta = {
-    description = "opensource disk backup software";
+    description = "Opensource disk backup software";
     homepage = http://www.partimage.org;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [stdenv.lib.maintainers.marcweber];
diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix
index bcbc8a846474..1c313beae9fd 100644
--- a/pkgs/tools/backup/rdiff-backup/default.nix
+++ b/pkgs/tools/backup/rdiff-backup/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   buildInputs = [ python librsync gnused ];
 
   meta = {
-    description = "backup system trying to combine best a mirror and an incremental backup system";
+    description = "Backup system trying to combine best a mirror and an incremental backup system";
     homepage = http://rdiff-backup.nongnu.org/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/pkgs/tools/cd-dvd/bashburn/default.nix
index 1a14aae62636..ada58e87fd0a 100644
--- a/pkgs/tools/cd-dvd/bashburn/default.nix
+++ b/pkgs/tools/cd-dvd/bashburn/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "bash script CD Burner Writer";
+    description = "Bash script CD Burner Writer";
     longDescription = ''
       It might not be the best looking application out there, but it works.
       It’s simple, fast and small, and can handle most things you throw at it.
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index f46ddd1c5369..d12169a0fd9a 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.bzip.org";
-    description = "high-quality data compression program";
+    description = "High-quality data compression program";
 
     platforms = stdenv.lib.platforms.all;
     maintainers = [];
diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix
index 44f6a0bb7a45..cf616a21e0aa 100644
--- a/pkgs/tools/compression/lbzip2/default.nix
+++ b/pkgs/tools/compression/lbzip2/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://lbzip2.org/;
-    description = "parallel bzip2 compression utility";
+    description = "Parallel bzip2 compression utility";
     license = licenses.gpl3;
     maintainers = with maintainers; [ abbradar ];
     platforms = platforms.unix;
diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix
index b0dfd79b9bac..a800a19e12b9 100644
--- a/pkgs/tools/compression/lzip/default.nix
+++ b/pkgs/tools/compression/lzip/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.nongnu.org/lzip/lzip.html";
-    description = "a lossless data compressor based on the LZMA algorithm";
+    description = "A lossless data compressor based on the LZMA algorithm";
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix
index b2246e73328f..a5cd54bf74d9 100644
--- a/pkgs/tools/filesystems/davfs2/default.nix
+++ b/pkgs/tools/filesystems/davfs2/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://savannah.nongnu.org/projects/davfs2";
-    description = "mount WebDAV shares like a typical filesystem";
+    description = "Mount WebDAV shares like a typical filesystem";
     license = stdenv.lib.licenses.gpl3Plus;
 
     longDescription = ''
diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix
index 5b33e31958c5..a30709d4c920 100644
--- a/pkgs/tools/filesystems/extundelete/default.nix
+++ b/pkgs/tools/filesystems/extundelete/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ e2fsprogs ];
 
   meta = with stdenv.lib; {
-    description = "utility that can recover deleted files from an ext3 or ext4 partition";
+    description = "Utility that can recover deleted files from an ext3 or ext4 partition";
     homepage = http://extundelete.sourceforge.net/;
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/tools/filesystems/grive/default.nix b/pkgs/tools/filesystems/grive/default.nix
index e9a7204f0e6c..63d3bbc3373a 100644
--- a/pkgs/tools/filesystems/grive/default.nix
+++ b/pkgs/tools/filesystems/grive/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "an open source (experimental) Linux client for Google Drive";
+    description = "An open source (experimental) Linux client for Google Drive";
     homepage = https://github.com/Grive/grive;
     license = stdenv.lib.licenses.gpl2;
 
diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix
index fa0349689119..4e027a53ffcb 100644
--- a/pkgs/tools/filesystems/zerofree/default.nix
+++ b/pkgs/tools/filesystems/zerofree/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://intgat.tigress.co.uk/rmy/uml/index.html;
-    description = "zero free blocks from ext2, ext3 and ext4 file-systems";
+    description = "Zero free blocks from ext2, ext3 and ext4 file-systems";
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.theuni ];
   };
diff --git a/pkgs/tools/graphics/bins/default.nix b/pkgs/tools/graphics/bins/default.nix
index 579ec802e092..63bf9aae5521 100644
--- a/pkgs/tools/graphics/bins/default.nix
+++ b/pkgs/tools/graphics/bins/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "generates static HTML photo albums";
+    description = "Generates static HTML photo albums";
     homepage = http://bins.sautret.org;
     license = stdenv.lib.licenses.gpl2;
   };
diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix
index c9b1febcc93a..78a66721b0c9 100644
--- a/pkgs/tools/graphics/editres/default.nix
+++ b/pkgs/tools/graphics/editres/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://cgit.freedesktop.org/xorg/app/editres/";
-    description = "a dynamic resource editor for X Toolkit applications";
+    description = "A dynamic resource editor for X Toolkit applications";
 
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix
index ba58bd86a747..819728032bb6 100644
--- a/pkgs/tools/misc/aescrypt/default.nix
+++ b/pkgs/tools/misc/aescrypt/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv";
 
   meta = with stdenv.lib; {
-    description = "encrypt files with Advanced Encryption Standard (AES)";
+    description = "Encrypt files with Advanced Encryption Standard (AES)";
     homepage    = http://www.aescrypt.com/;
     license     = licenses.gpl2;
     maintainers = with maintainers; [ lovek323 qknight ];
diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix
index e479167dc159..dc170bcd14bb 100644
--- a/pkgs/tools/misc/apt-offline/default.nix
+++ b/pkgs/tools/misc/apt-offline/default.nix
@@ -20,7 +20,7 @@ buildPythonApplication rec {
   preFixup = ''rm "$out/bin/apt-offline-gui"'';
 
   meta = with stdenv.lib; {
-    description = "offline APT package manager";
+    description = "Offline APT package manager";
     license = licenses.gpl3;
     maintainers = [ maintainers.falsifian ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index 72a8f61bf3f0..305a32edadeb 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   installPhase = "make install DESTDIR=$out";
 
   meta = {
-    description = "a shell extension that manages your environment";
+    description = "A shell extension that manages your environment";
     longDescription = ''
       Once hooked into your shell direnv is looking for an .envrc file in your
       current directory before every prompt.
diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/pkgs/tools/misc/proxytunnel/default.nix
index 993a36ea9092..a51b6238cd52 100644
--- a/pkgs/tools/misc/proxytunnel/default.nix
+++ b/pkgs/tools/misc/proxytunnel/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   installPhase = ''make DESTDIR="$out" PREFIX="" install'';
 
   meta = {
-    description = "program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy";
+    description = "Program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy";
     homepage = http://proxytunnel.sourceforge.net/download.php;
     license = stdenv.lib.licenses.gpl2;
   };
diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix
index 54a6b0309b00..3bf704ca68e9 100644
--- a/pkgs/tools/misc/rockbox-utility/default.nix
+++ b/pkgs/tools/misc/rockbox-utility/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation  rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "open source firmware for mp3 players";
+    description = "Open source firmware for mp3 players";
     homepage = http://www.rockbox.org;
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix
index 4bc68aba29df..31f39b887c56 100644
--- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://developers.yubico.com/yubikey-personalization-gui;
-    description = "a QT based cross-platform utility designed to facilitate reconfiguration of the Yubikey";
+    description = "A QT based cross-platform utility designed to facilitate reconfiguration of the Yubikey";
     license = licenses.bsd2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix
index 8b8b5074fc39..dbf0b9af8abc 100644
--- a/pkgs/tools/misc/yubikey-personalization/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://developers.yubico.com/yubikey-personalization;
-    description = "a library and command line tool to personalize YubiKeys";
+    description = "A library and command line tool to personalize YubiKeys";
     license = licenses.bsd2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix
index 1d0c9d55076e..c579d12b6bd4 100644
--- a/pkgs/tools/networking/keepalived/default.nix
+++ b/pkgs/tools/networking/keepalived/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://keepalived.org;
-    description = "routing software written in C";
+    description = "Routing software written in C";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/tools/networking/mpack/default.nix b/pkgs/tools/networking/mpack/default.nix
index 5a1095506424..41266e65aa09 100644
--- a/pkgs/tools/networking/mpack/default.nix
+++ b/pkgs/tools/networking/mpack/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   preConfigure = "configureFlags=--mandir=$out/share/man";
 
   meta = {
-    description = "utilities for encoding and decoding binary files in MIME";
+    description = "Utilities for encoding and decoding binary files in MIME";
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index b89d2adea6bc..23d4117f8b84 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://nbd.sourceforge.net";
-    description = "map arbitrary files as block devices over the network";
+    description = "Map arbitrary files as block devices over the network";
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.peti ];
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/tools/networking/ratools/default.nix b/pkgs/tools/networking/ratools/default.nix
index 423c58450c56..00c1c86ea8b5 100644
--- a/pkgs/tools/networking/ratools/default.nix
+++ b/pkgs/tools/networking/ratools/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "a fast, dynamic, multi-threading framework for IPv6 Router Advertisements";
+    description = "A fast, dynamic, multi-threading framework for IPv6 Router Advertisements";
     homepage = https://github.com/danrl/ratools;
     license = licenses.asl20;
     platforms = platforms.linux;
diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix
index 2fec2ac1bd58..b50d619b437d 100644
--- a/pkgs/tools/networking/spiped/default.nix
+++ b/pkgs/tools/networking/spiped/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "utility for secure encrypted channels between sockets";
+    description = "Utility for secure encrypted channels between sockets";
     homepage    = "https://www.tarsnap.com/spiped.html";
     license     = stdenv.lib.licenses.bsd2;
     platforms   = stdenv.lib.platforms.unix;
diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index 96169ab294ce..2f12aaa7ee23 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    description = "universal tls/ssl wrapper";
+    description = "Universal tls/ssl wrapper";
     homepage    = "http://www.stunnel.org/";
     license     = stdenv.lib.licenses.gpl2Plus;
     platforms   = stdenv.lib.platforms.unix;
diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix
index e1905e2deb65..b183b653d26e 100644
--- a/pkgs/tools/networking/vpnc/default.nix
+++ b/pkgs/tools/networking/vpnc/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.unix-ag.uni-kl.de/~massar/vpnc/";
-    description = "virtual private network (VPN) client for Cisco's VPN concentrators";
+    description = "Virtual private network (VPN) client for Cisco's VPN concentrators";
     license = stdenv.lib.licenses.gpl2Plus;
 
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix
index 8593fe69733a..4766968b06fd 100644
--- a/pkgs/tools/security/gnupg/1.nix
+++ b/pkgs/tools/security/gnupg/1.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "free implementation of the OpenPGP standard for encrypting and signing data";
+    description = "Free implementation of the OpenPGP standard for encrypting and signing data";
     homepage = http://www.gnupg.org/;
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.gnu; # arbitrary choice
diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix
index 65d43ec9dbee..932bf508c2fa 100644
--- a/pkgs/tools/security/gnupg/20.nix
+++ b/pkgs/tools/security/gnupg/20.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://gnupg.org/";
-    description = "free implementation of the OpenPGP standard for encrypting and signing data";
+    description = "Free implementation of the OpenPGP standard for encrypting and signing data";
     license = stdenv.lib.licenses.gpl3Plus;
 
     longDescription = ''
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index 6119f708070d..a1cbcb458c59 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://gnupg.org;
-    description = "a complete and free implementation of the OpenPGP standard";
+    description = "A complete and free implementation of the OpenPGP standard";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ wkennington peti fpletz ];
     platforms = platforms.all;
diff --git a/pkgs/tools/security/stricat/default.nix b/pkgs/tools/security/stricat/default.nix
index 64ebb4c0ca26..3dd00718af79 100644
--- a/pkgs/tools/security/stricat/default.nix
+++ b/pkgs/tools/security/stricat/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "multi-use cryptographic tool based on the STRIBOB algorithm";
+    description = "Multi-use cryptographic tool based on the STRIBOB algorithm";
     homepage    = "https://www.stribob.com/stricat/";
     license     = stdenv.lib.licenses.bsd3;
     platforms   = stdenv.lib.platforms.unix;
diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix
index 5a2173139403..a4aec5369fc5 100644
--- a/pkgs/tools/security/vidalia/default.nix
+++ b/pkgs/tools/security/vidalia/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://www.torproject.org/projects/vidalia.html.en;
     repositories.git = https://git.torproject.org/vidalia;
-    description = "a cross-platform graphical controller for the Tor software, built using the Qt framework";
+    description = "A cross-platform graphical controller for the Tor software, built using the Qt framework";
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.phreedom ];
     platforms = platforms.all;
diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix
index bed7d5369579..511da154c507 100644
--- a/pkgs/tools/security/volatility/default.nix
+++ b/pkgs/tools/security/volatility/default.nix
@@ -16,7 +16,7 @@ buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     homepage = https://code.google.com/p/volatility;
-    description = "advanced memory forensics framework";
+    description = "Advanced memory forensics framework";
     maintainers = with maintainers; [ bosu ];
     license = stdenv.lib.licenses.gpl2Plus;
   };
diff --git a/pkgs/tools/system/dcfldd/default.nix b/pkgs/tools/system/dcfldd/default.nix
index 27ebbf3518fc..240cc36f7266 100644
--- a/pkgs/tools/system/dcfldd/default.nix
+++ b/pkgs/tools/system/dcfldd/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ ];
 
   meta = with stdenv.lib; {
-    description = "an enhanced version of GNU dd";
+    description = "An enhanced version of GNU dd";
 
     homepage = http://dcfldd.sourceforge.net/;
 
diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix
index 63a6e7e1fa30..1876bac496da 100644
--- a/pkgs/tools/system/dfc/default.nix
+++ b/pkgs/tools/system/dfc/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://projects.gw-computing.net/projects/dfc";
-    description = "displays file system space usage using graphs and colors";
+    description = "Displays file system space usage using graphs and colors";
     license="free";
     maintainers = with stdenv.lib.maintainers; [qknight];
     platforms = with stdenv.lib.platforms; all;
diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix
index b6f3de5f5cde..02c76798fd77 100644
--- a/pkgs/tools/system/s6-rc/default.nix
+++ b/pkgs/tools/system/s6-rc/default.nix
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://skarnet.org/software/s6-rc/;
-    description = "a service manager for s6-based systems";
+    description = "A service manager for s6-based systems";
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.isc;
     maintainers = with stdenv.lib.maintainers; [ pmahoney ];
diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/tools/system/safecopy/default.nix
index 304d8f21eb28..5e7ec51bf107 100644
--- a/pkgs/tools/system/safecopy/default.nix
+++ b/pkgs/tools/system/safecopy/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "data recovery tool for damaged hardware";
+    description = "Data recovery tool for damaged hardware";
 
     longDescription =
       '' Safecopy is a data recovery tool which tries to extract as much data as possible from a
diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix
index 58036af1a947..a297f9371001 100644
--- a/pkgs/tools/system/tm/default.nix
+++ b/pkgs/tools/system/tm/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     homepage = "http://vicerveza.homeunix.net/~viric/soft/tm";
-    description = "terminal mixer - multiplexer for the i/o of terminal applications";
+    description = "Terminal mixer - multiplexer for the i/o of terminal applications";
     license = licenses.gpl2;
     maintainers = with maintainers; [ viric ];
     platforms = platforms.all;
diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix
index a5050047256b..00df3c45f4ff 100644
--- a/pkgs/tools/system/tree/default.nix
+++ b/pkgs/tools/system/tree/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://mama.indstate.edu/users/ice/tree/";
-    description = "command to produce a depth indented directory listing";
+    description = "Command to produce a depth indented directory listing";
     license = stdenv.lib.licenses.gpl2;
 
     longDescription = ''
diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix
index 8e65eda8f540..cad1230ac87a 100644
--- a/pkgs/tools/system/ts/default.nix
+++ b/pkgs/tools/system/ts/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = "http://vicerveza.homeunix.net/~viric/soft/ts";
-    description = "task spooler - batch queue";
+    description = "Task spooler - batch queue";
     license = licenses.gpl2;
     maintainers = with maintainers; [ viric ];
     platforms = platforms.all;
diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix
index ca9de0590ca2..0eb64fe1d18a 100644
--- a/pkgs/tools/text/gist/default.nix
+++ b/pkgs/tools/text/gist/default.nix
@@ -18,7 +18,7 @@ buildRubyGem rec {
   dontStrip = true;
 
   meta = with lib; {
-    description = "upload code to https://gist.github.com (or github enterprise)";
+    description = "Upload code to https://gist.github.com (or github enterprise)";
     homepage = "http://defunkt.io/gist/";
     license = licenses.mit;
     maintainers = with maintainers; [ zimbatm ];
diff --git a/pkgs/tools/text/qprint/default.nix b/pkgs/tools/text/qprint/default.nix
index 3bb147f7dd27..2eae12561861 100644
--- a/pkgs/tools/text/qprint/default.nix
+++ b/pkgs/tools/text/qprint/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.fourmilab.ch/webtools/qprint/";
     license = stdenv.lib.licenses.publicDomain;
-    description = "encode and decode Quoted-Printable files";
+    description = "Encode and decode Quoted-Printable files";
     maintainers = [ stdenv.lib.maintainers.tv ];
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix
index e6c63e029561..cef212b2a134 100644
--- a/pkgs/tools/typesetting/pdfgrep/default.nix
+++ b/pkgs/tools/typesetting/pdfgrep/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "a tool to search text in PDF files";
+    description = "A tool to search text in PDF files";
     homepage = http://pdfgrep.sourceforge.net/;
     license = stdenv.lib.licenses.free;
     maintainers = with stdenv.lib.maintainers; [qknight];
diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix
index eacd0316b464..61936e766c5e 100644
--- a/pkgs/tools/typesetting/tex/tex4ht/default.nix
+++ b/pkgs/tools/typesetting/tex/tex4ht/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://tug.org/tex4ht/";
-    description = "a system to convert (La)TeX documents to HTML and various other formats";
+    description = "A system to convert (La)TeX documents to HTML and various other formats";
     license = stdenv.lib.licenses.lppl12;
   };
 }
diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix
index 558d9102352b..29e1c45245f7 100644
--- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix
+++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix
@@ -17,7 +17,7 @@ rec {
   '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
 
   meta = {
-    description = "the moderncv class for TeXLive";
+    description = "The moderncv class for TeXLive";
     # Actually, arch-independent..
     hydraPlatforms = [];
   };
diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
index 189d418b0391..caa140d42c79 100644
--- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
+++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
@@ -17,7 +17,7 @@ rec {
   '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
 
   meta = {
-    description = "the moderntimeline extensions for moderncv";
+    description = "The moderntimeline extensions for moderncv";
     # Actually, arch-independent..
     hydraPlatforms = [];
   };
diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix
index 34b6226ff98d..c038ca7c1bbe 100644
--- a/pkgs/tools/virtualization/cloud-init/default.nix
+++ b/pkgs/tools/virtualization/cloud-init/default.nix
@@ -26,7 +26,7 @@ in pythonPackages.buildPythonApplication rec {
 
   meta = {
     homepage = http://cloudinit.readthedocs.org;
-    description = "provides configuration and customization of cloud instance";
+    description = "Provides configuration and customization of cloud instance";
     maintainers = [ lib.maintainers.madjar ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 0878a6adeb8b..1bf3b4c0e61b 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -395,7 +395,7 @@ let
     };
     packageRequires = [ company ghc-mod ];
     meta = {
-      description = "company-mode completion backend for haskell-mode via ghc-mod";
+      description = "Company-mode completion backend for haskell-mode via ghc-mod";
       license = gpl3Plus;
     };
   };
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 5f38fdf42aa7..e652bf2d5901 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -427,7 +427,7 @@ let
     };
 
     meta = with stdenv.lib; {
-      description = "vicious widgets for window managers";
+      description = "Vicious widgets for window managers";
       homepage    = http://git.sysphere.org/vicious/;
       license     = licenses.gpl2;
       maintainers = with maintainers; [ makefu ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a51930f3e386..cd7982baa503 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -597,7 +597,7 @@ in modules // {
 
     meta = {
       homepage = https://github.com/bitprophet/alabaster;
-      description = "a Sphinx theme";
+      description = "A Sphinx theme";
       license = licenses.bsd3;
     };
   };
@@ -887,7 +887,7 @@ in modules // {
     buildInputs = with self; [ pytest ];
 
     meta = {
-      description = "namespace control and lazy-import mechanism";
+      description = "Namespace control and lazy-import mechanism";
       homepage = "http://bitbucket.org/hpk42/apipkg";
       license = licenses.mit;
     };
@@ -971,7 +971,7 @@ in modules // {
     };
 
     meta = {
-      description = "reference implementation of PEP 3156";
+      description = "Reference implementation of PEP 3156";
       homepage = http://www.python.org/dev/peps/pep-3156;
       license = licenses.free;
     };
@@ -3813,7 +3813,7 @@ in modules // {
       sha256 = "4a14c67d520fda9d42b0da6134638578caae1d374b9bb462d8de00587dba764c";
     };
     meta = {
-      description = "plugin core for use by pytest-cov, nose-cov and nose2-cov";
+      description = "Plugin core for use by pytest-cov, nose-cov and nose2-cov";
     };
     propagatedBuildInputs = with self; [ self.coverage ];
   };
@@ -4606,7 +4606,7 @@ in modules // {
    buildInputs = with self; [ covCore pytest ];
 
     meta = {
-      description = "plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing";
+      description = "Plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing";
       homepage = https://github.com/schlamar/pytest-cov;
       license = licenses.mit;
     };
@@ -4694,7 +4694,7 @@ in modules // {
     TINYCSS_SKIP_SPEEDUPS_TESTS = optional isPyPy true;
 
     meta = {
-      description = "complete yet simple CSS parser for Python";
+      description = "Complete yet simple CSS parser for Python";
       license = licenses.bsd3;
       homepage = http://pythonhosted.org/tinycss/;
     };
@@ -5315,7 +5315,7 @@ in modules // {
     '';
 
     meta = {
-      description = "integrates an Android device into a desktop";
+      description = "Integrates an Android device into a desktop";
       homepage = https://github.com/screenfreeze/deskcon-desktop;
       license = licenses.gpl3;
     };
@@ -5838,7 +5838,7 @@ in modules // {
 
     meta = {
       homepage = "http://python-eve.org/";
-      description = "open source Python REST API framework designed for human beings";
+      description = "Open source Python REST API framework designed for human beings";
       license = licenses.bsd3;
     };
   };
@@ -5932,7 +5932,7 @@ in modules // {
     doCheck = !isPy3k;  # failures..
 
     meta = {
-      description = "rapid multi-Python deployment";
+      description = "Rapid multi-Python deployment";
       license = licenses.gpl2;
     };
   };
@@ -6559,7 +6559,7 @@ in modules // {
     doCheck = false;
 
     meta = {
-      description = "python humanize utilities";
+      description = "Python humanize utilities";
       homepage = https://github.com/jmoiron/humanize;
       license = licenses.mit;
       maintainers = with maintainers; [ matthiasbeyer ];
@@ -6665,7 +6665,7 @@ in modules // {
     };
 
     meta = {
-      description = "helpers to pass trusted data to untrusted environments and back";
+      description = "Helpers to pass trusted data to untrusted environments and back";
       homepage = "https://pypi.python.org/pypi/itsdangerous/";
     };
   };
@@ -6707,7 +6707,7 @@ in modules // {
     doCheck = false;
 
     meta = {
-      description = "tools for i3 users and developers";
+      description = "Tools for i3 users and developers";
       homepage =  "https://github.com/ziberna/i3-py";
       license = licenses.gpl3;
       platforms = platforms.linux;
@@ -7109,7 +7109,7 @@ in modules // {
     };
 
     meta = {
-      description = "dependencies for mwlib markup";
+      description = "Dependencies for mwlib markup";
       homepage = "http://pediapress.com/code/";
       license = licenses.bsd3;
     };
@@ -7132,7 +7132,7 @@ in modules // {
       ];
 
     meta = {
-      description = "generate pdfs from mediawiki markup";
+      description = "Generate pdfs from mediawiki markup";
       homepage = "http://pediapress.com/code/";
       license = licenses.bsd3;
     };
@@ -7223,7 +7223,7 @@ in modules // {
     JPEG_DIR="${pkgs.libjpeg.dev}";
 
     meta = {
-      description = "interface to netCDF library (versions 3 and 4)";
+      description = "Interface to netCDF library (versions 3 and 4)";
       homepage = https://pypi.python.org/pypi/netCDF4;
       license = licenses.free;  # Mix of license (all MIT* like)
     };
@@ -10478,7 +10478,7 @@ in modules // {
     buildInputs = with self; [ pkgs.setuptools ] ++ (optional isPy26 argparse);
 
     meta = {
-      description = "automatically generated zsh completion function for Python's option parser modules";
+      description = "Automatically generated zsh completion function for Python's option parser modules";
       license = "BSD";
     };
   };
@@ -14221,7 +14221,7 @@ in modules // {
 
     meta = {
       homepage = "https://github.com/simplegeo/python-oauth2";
-      description = "library for OAuth version 1.0";
+      description = "Library for OAuth version 1.0";
       license = licenses.mit;
       maintainers = with maintainers; [ garbas ];
       platforms = platforms.linux;
@@ -14286,7 +14286,7 @@ in modules // {
       [ pyptlib argparse twisted pycrypto pyyaml ];
 
     meta = {
-      description = "a pluggable transport proxy";
+      description = "A pluggable transport proxy";
       homepage = https://www.torproject.org/projects/obfsproxy;
       repositories.git = https://git.torproject.org/pluggable-transports/obfsproxy.git;
       maintainers = with maintainers; [ phreedom thoughtpolice ];
@@ -18929,7 +18929,7 @@ in modules // {
     meta = {
       homepage = "https://github.com/asweigart/pyperclip";
       license = licenses.bsdOriginal;
-      description = "cross-platform clipboard module";
+      description = "Cross-platform clipboard module";
     };
   };
 
@@ -19501,7 +19501,7 @@ in modules // {
     buildInputs = with self; [ ];
 
     meta = {
-      description = "job queue server";
+      description = "Job queue server";
       homepage = "https://github.com/pediapress/qserve";
       license = licenses.bsd3;
     };
@@ -19698,7 +19698,7 @@ in modules // {
     doCheck = false;
 
     meta = with stdenv.lib; {
-      description = "readme";
+      description = "Readme";
       homepage = "https://github.com/pypa/readme";
     };
   };
@@ -20041,7 +20041,7 @@ in modules // {
     };
 
     meta = {
-      description = "python refactoring library";
+      description = "Python refactoring library";
       homepage = http://rope.sf.net;
       maintainers = with maintainers; [ goibhniu ];
       license = licenses.gpl2;
@@ -20060,7 +20060,7 @@ in modules // {
     propagatedBuildInputs = with self; [ ropemode ];
 
      meta = {
-       description = "a plugin for performing python refactorings in emacs";
+       description = "A plugin for performing python refactorings in emacs";
        homepage = http://rope.sf.net/ropemacs.html;
        maintainers = with maintainers; [ goibhniu ];
        license = licenses.gpl2;
@@ -20079,7 +20079,7 @@ in modules // {
     propagatedBuildInputs = with self; [ rope ];
 
      meta = {
-       description = "a plugin for performing python refactorings in emacs";
+       description = "A plugin for performing python refactorings in emacs";
        homepage = http://rope.sf.net;
        maintainers = with maintainers; [ goibhniu ];
        license = licenses.gpl2;
@@ -20205,7 +20205,7 @@ in modules // {
     };
 
     meta = {
-      description = "common routines for ruamel packages";
+      description = "Common routines for ruamel packages";
       homepage = https://bitbucket.org/ruamel/base;
       license = licenses.mit;
     };
@@ -20222,7 +20222,7 @@ in modules // {
     };
 
     meta = {
-      description = "a version of dict that keeps keys in insertion resp. sorted order";
+      description = "A version of dict that keeps keys in insertion resp. sorted order";
       homepage = https://bitbucket.org/ruamel/ordereddict;
       license = licenses.mit;
     };
@@ -20523,7 +20523,7 @@ in modules // {
     doCheck = false;
 
     meta = {
-      description = "statisitical data visualization";
+      description = "Statisitical data visualization";
       homepage = "http://stanford.edu/~mwaskom/software/seaborn/";
       license     = "BSD";
       maintainers = with maintainers; [ fridh ];
@@ -20630,7 +20630,7 @@ in modules // {
     propagatedBuildInputs = with self; [ twisted ];
 
     meta = {
-      description = "setuptools plug-in that helps run unit tests built with the \"Trial\" framework (from Twisted)";
+      description = "Setuptools plug-in that helps run unit tests built with the \"Trial\" framework (from Twisted)";
 
       homepage = http://allmydata.org/trac/setuptools_trial;
 
@@ -21095,7 +21095,7 @@ in modules // {
     buildInputs = with self; [ ];
 
     meta = {
-      description = "parse english textual date descriptions";
+      description = "Parse english textual date descriptions";
       homepage = "https://github.com/pediapress/timelib/";
       license = licenses.zlib;
     };
@@ -22380,7 +22380,7 @@ in modules // {
     propagatedBuildInputs = with self; [ testtools ];
 
     meta = {
-      description = "a pyunit extension for dependency injection";
+      description = "A pyunit extension for dependency injection";
       homepage = https://pypi.python.org/pypi/testscenarios;
       license = licenses.asl20;
     };
@@ -22700,7 +22700,7 @@ in modules // {
     propagatedBuildInputs = with self; [ numpy ];
 
     meta = {
-      description = "explicitly typed attributes for Python";
+      description = "Explicitly typed attributes for Python";
       homepage = http://pypi.python.org/pypi/traits;
       license = "BSD";
     };
@@ -23236,7 +23236,7 @@ in modules // {
     };
 
     meta = {
-      description = "python wrapper for Xvfb, Xephyr and Xvnc";
+      description = "Python wrapper for Xvfb, Xephyr and Xvnc";
       homepage = "https://github.com/ponty/pyvirtualdisplay";
       license = licenses.bsdOriginal;
       maintainers = with maintainers; [ layus ];
@@ -23261,7 +23261,7 @@ in modules // {
     doCheck = false;
 
     meta = {
-      description = "a tool to create isolated Python environments";
+      description = "A tool to create isolated Python environments";
       homepage = http://www.virtualenv.org;
       license = licenses.mit;
       maintainers = with maintainers; [ goibhniu ];
@@ -23995,7 +23995,7 @@ in modules // {
     patches = [ ../development/python-modules/btrees-py35.patch ];
 
     meta = {
-      description = "scalable persistent components";
+      description = "Scalable persistent components";
       homepage = http://packages.python.org/BTrees;
     };
   };
@@ -24012,7 +24012,7 @@ in modules // {
     };
 
     meta = {
-      description = "automatic persistence for Python objects";
+      description = "Automatic persistence for Python objects";
       homepage = http://www.zope.org/Products/ZODB;
     };
   };
@@ -24570,7 +24570,7 @@ in modules // {
 
     meta = {
       homepage = http://liw.fi/cmdtest/;
-      description = "black box tests Unix command line tools";
+      description = "Black box tests Unix command line tools";
     };
   };
 
@@ -25549,7 +25549,7 @@ in modules // {
     };
 
     meta = {
-      description = "implements a lazy string for python useful for use with gettext";
+      description = "Implements a lazy string for python useful for use with gettext";
       homepage = https://github.com/mitsuhiko/speaklater;
       license = "bsd";
       maintainers = with maintainers; [ matejc ];
@@ -27042,7 +27042,7 @@ in modules // {
 
     meta = {
       homepage = http://github.com/bepasty/bepasty-server;
-      description = "binary pastebin server";
+      description = "Binary pastebin server";
       license = licenses.mit;
       maintainers = [ maintainers.makefu ];
     };
@@ -27099,7 +27099,7 @@ in modules // {
     };
     meta = {
       homepage = http://bitbucket.org/thomaswaldmann/xstatic;
-      description = "base packaged static files for python";
+      description = "Base packaged static files for python";
       license = licenses.mit;
       maintainers = [ maintainers.makefu ];
     };
@@ -27114,7 +27114,7 @@ in modules // {
     };
     meta = {
       homepage = https://github.com/bitprophet/alabaster;
-      description = "convert xlsx to csv";
+      description = "Convert xlsx to csv";
       license = licenses.bsd3;
       maintainers = with maintainers; [ jb55 ];
     };
@@ -27413,7 +27413,7 @@ in modules // {
     };
 
     meta = {
-      description = "console colouring for python";
+      description = "Console colouring for python";
       homepage = "https://pypi.python.org/pypi/python-termstyle/0.1.10";
       license = licenses.bsdOriginal;
     };
@@ -27432,7 +27432,7 @@ in modules // {
     buildInputs = with self; [ mock ];
 
     meta = {
-      description = "python test runner";
+      description = "Python test runner";
       homepage = "https://github.com/CleanCut/green";
       licence = licenses.mit;
     };
-- 
cgit 1.4.1


From aa9a04883e34f6a7b89846e87654577d5b218f46 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Thu, 23 Jun 2016 09:25:10 +0200
Subject: Revert "Merge branch 'staging'" due to glibc

The main output started to retain dependency on bootstrap-tools; see
https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096

This reverts commit c05d8295988697adbb920a7b4a999ae3670c5504, reversing
changes made to f073df60d60444c30c49cb26d6b187a4100b41fe.
---
 nixos/lib/testing.nix                              |  8 +--
 pkgs/applications/graphics/leocad/default.nix      |  1 -
 pkgs/applications/graphics/photivo/default.nix     | 12 ++---
 pkgs/applications/misc/cli-visualizer/default.nix  |  4 --
 pkgs/applications/misc/termite/default.nix         |  2 -
 .../science/robotics/qgroundcontrol/default.nix    |  5 --
 .../video/simplescreenrecorder/default.nix         |  4 --
 .../virtualization/virtualbox/default.nix          |  9 +---
 pkgs/build-support/cc-wrapper/default.nix          |  1 -
 pkgs/build-support/gcc-cross-wrapper/builder.sh    |  1 -
 pkgs/build-support/gcc-cross-wrapper/default.nix   |  4 +-
 pkgs/build-support/setup-hooks/make-wrapper.sh     |  2 +-
 pkgs/build-support/trivial-builders.nix            |  1 -
 .../stylesheets/xslt/docbook-xsl/default.nix       |  6 +--
 .../kde-5/plasma-5.6/plasma-desktop/default.nix    |  3 --
 pkgs/development/compilers/gcc/4.5/default.nix     | 38 +++++---------
 pkgs/development/compilers/gcc/4.6/builder.sh      |  4 +-
 pkgs/development/compilers/gcc/4.6/default.nix     | 34 ++++---------
 pkgs/development/compilers/gcc/4.8/default.nix     | 36 ++++----------
 pkgs/development/compilers/gcc/4.9/default.nix     | 36 ++++----------
 pkgs/development/compilers/gcc/5/default.nix       | 41 +++++----------
 pkgs/development/compilers/gcc/6/default.nix       | 35 ++++---------
 pkgs/development/compilers/gcc/builder.sh          | 17 ++++---
 pkgs/development/libraries/botan/generic.nix       |  2 -
 pkgs/development/libraries/botan/unstable.nix      |  1 -
 pkgs/development/libraries/gettext/default.nix     |  2 +-
 pkgs/development/libraries/glibc/builder.sh        | 58 ++++++++++++++++++++++
 pkgs/development/libraries/glibc/common.nix        |  1 -
 pkgs/development/libraries/glibc/default.nix       | 57 +--------------------
 .../development/libraries/glibc/fix_warnings.patch | 36 --------------
 pkgs/development/libraries/kerberos/krb5.nix       |  2 -
 .../libraries/kerberos/path_char_fix.patch         | 38 --------------
 pkgs/development/libraries/libelf/default.nix      |  6 +--
 .../development/libraries/libxkbcommon/default.nix |  9 ++--
 pkgs/development/libraries/xgboost/default.nix     |  2 -
 pkgs/development/python-modules/generic/wrap.sh    | 13 ++---
 pkgs/development/tools/analysis/rr/default.nix     |  3 +-
 pkgs/development/tools/misc/hydra/default.nix      |  8 +--
 pkgs/games/cataclysm-dda/default.nix               |  3 --
 pkgs/games/dwarf-fortress/dfhack/default.nix       |  1 -
 pkgs/games/dwarf-fortress/unfuck.nix               |  2 -
 pkgs/games/openspades/default.nix                  |  6 +--
 pkgs/games/openspades/git.nix                      |  2 -
 pkgs/games/the-butterfly-effect/default.nix        |  3 --
 pkgs/misc/emulators/higan/default.nix              |  1 -
 pkgs/misc/emulators/pcsx2/default.nix              |  4 --
 pkgs/os-specific/linux/sysdig/default.nix          |  3 --
 pkgs/servers/nosql/arangodb/default.nix            | 13 +++--
 pkgs/stdenv/generic/setup.sh                       |  4 --
 pkgs/stdenv/linux/make-bootstrap-tools-cross.nix   | 38 +++++++-------
 pkgs/tools/typesetting/xmlto/default.nix           |  9 ++--
 51 files changed, 200 insertions(+), 431 deletions(-)
 create mode 100644 pkgs/development/libraries/glibc/builder.sh
 delete mode 100644 pkgs/development/libraries/glibc/fix_warnings.patch
 delete mode 100644 pkgs/development/libraries/kerberos/path_char_fix.patch

(limited to 'pkgs/misc')

diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index 5f463c092846..f7159634e4f1 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -113,14 +113,14 @@ rec {
             --add-flags "$vms" \
             ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \
             --run "testScript=\"\$(cat $out/test-script)\"" \
-            --set testScript '$testScript' \
-            --set VLANS '${toString vlans}'
+            --set testScript '"$testScript"' \
+            --set VLANS '"${toString vlans}"'
           ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms
           wrapProgram $out/bin/nixos-run-vms \
             --add-flags "$vms" \
             ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \
-            --set tests 'startAll; joinAll;' \
-            --set VLANS '${toString vlans}' \
+            --set tests '"startAll; joinAll;"' \
+            --set VLANS '"${toString vlans}"' \
             ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"}
         ''; # "
 
diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix
index 96384765bd03..884dc1158534 100644
--- a/pkgs/applications/graphics/leocad/default.nix
+++ b/pkgs/applications/graphics/leocad/default.nix
@@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
   buildInputs = [ qt4 qmake4Hook zlib ];
 
   postPatch = ''
-    sed '1i#include <cmath>' -i common/camera.cpp
     substituteInPlace common/camera.cpp --replace "isnan(" "std::isnan("
     export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out"
   '';
diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix
index d84363df899e..12816ba96af4 100644
--- a/pkgs/applications/graphics/photivo/default.nix
+++ b/pkgs/applications/graphics/photivo/default.nix
@@ -10,19 +10,15 @@ stdenv.mkDerivation rec {
     sha256 = "0f6y18k7db2ci6xn664zcwm1g1k04sdv7gg1yd5jk41bndjb7z8h";
   };
 
-  postPatch = '' # kinda icky
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ];
+  patchPhase = '' # kinda icky
     sed -e '/("@INSTALL@")/d' \
         -e s,@INSTALL@,$out/share/photivo, \
         -i Sources/ptSettings.cpp
-    sed '1i#include <math.h>' -i Sources/filters/ptFilter_StdCurve.cpp
   '';
 
-  nativeBuildInputs = [ cmake pkgconfig ];
-
-  buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ];
-
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
       platforms = platforms.linux;
       maintainers = [ maintainers.mornfall ];
diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix
index 1c7fd62f8ecc..6b9856a996ac 100644
--- a/pkgs/applications/misc/cli-visualizer/default.nix
+++ b/pkgs/applications/misc/cli-visualizer/default.nix
@@ -10,10 +10,6 @@ stdenv.mkDerivation rec {
     sha256 = "16768gyi85mkizfn874q2q9xf32knw08z27si3k5bk99492dxwzw";
   };
 
-  postPatch = ''
-    sed '1i#include <cmath>' -i src/Transformer/SpectrumCircleTransformer.cpp
-  '';
-
   buildInputs = [ fftw ncurses libpulseaudio ];
 
   buildFlags = [ "ENABLE_PULSE=1" ];
diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index 33c42e3dc1dd..33bc29f871c7 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/misc/termite/default.nix
@@ -13,8 +13,6 @@ let
       sha256 = "1cw4yw7n9m2si8b7zcfyz9pyihncabxm5g39v1mxslfajxgwzmd8";
     };
 
-    postPatch = "sed '1i#include <math.h>' -i termite.cc";
-
     makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ];
 
     buildInputs = [ pkgconfig vte gtk3 ncurses ];
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index 81f5accd4780..1e33a1be8567 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -27,11 +27,6 @@ stdenv.mkDerivation rec {
  ] ++ qtInputs;
 
   patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ];
-  postPatch = ''
-    sed '1i#include <cmath>' -i src/Vehicle/Vehicle.cc \
-      -i src/comm/{QGCFlightGearLink,QGCJSBSimLink}.cc \
-      -i src/{uas/UAS,ui/QGCDataPlot2D}.cc
-  '';
 
   preConfigure = ''
     mkdir build
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index 3ea04a39393b..a5fb122cf897 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -11,15 +11,11 @@ stdenv.mkDerivation rec {
     sha256 = "1d89ncspjd8c4mckf0nb6y3hrxpv4rjpbj868pznhvfmdgr5nvql";
   };
 
-  postPatch = "sed '1i#include <random>' -i src/Benchmark.cpp";
-
   buildInputs = [
     alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa pkgconfig
     libpulseaudio qt4
   ];
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     description = "A screen recorder for Linux";
     homepage = http://www.maartenbaert.be/simplescreenrecorder;
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index ebdac411b113..df7b555e0487 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -97,14 +97,7 @@ in stdenv.mkDerivation {
     set +x
   '';
 
-  patches = optional enableHardening ./hardened.patch
-    ++ [
-      (fetchurl rec {
-        name = "fix-detect-gcc-5.4.patch";
-        url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=827193;filename=${name};msg=5";
-        sha256 = "0y6v5dc6fqj9iv27cl8q2g87v1kxg19129mpas4vjg7g0529v4g9";
-      })
-    ];
+  patches = optional enableHardening ./hardened.patch;
 
   postPatch = ''
     sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index a37c806905fd..da114fdb347f 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -96,7 +96,6 @@ stdenv.mkDerivation {
       echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags
 
       echo "${libc_lib}" > $out/nix-support/orig-libc
-      echo "${libc_dev}" > $out/nix-support/orig-libc-dev
     ''
 
     + (if nativeTools then ''
diff --git a/pkgs/build-support/gcc-cross-wrapper/builder.sh b/pkgs/build-support/gcc-cross-wrapper/builder.sh
index 9396ace84f11..c6bc2a7c8bf9 100644
--- a/pkgs/build-support/gcc-cross-wrapper/builder.sh
+++ b/pkgs/build-support/gcc-cross-wrapper/builder.sh
@@ -111,7 +111,6 @@ chmod +x "$out/bin/$crossConfig-ld"
 # Glibc.
 test -n "$gcc" && echo $gcc > $out/nix-support/orig-cc
 test -n "$libc" && echo $libc > $out/nix-support/orig-libc
-test -n "$libc_dev" && echo $libc_dev > $out/nix-support/orig-libc-dev
 
 doSubstitute "$addFlags" "$out/nix-support/add-flags"
 
diff --git a/pkgs/build-support/gcc-cross-wrapper/default.nix b/pkgs/build-support/gcc-cross-wrapper/default.nix
index 505d80a6b2ac..d3494b83a87b 100644
--- a/pkgs/build-support/gcc-cross-wrapper/default.nix
+++ b/pkgs/build-support/gcc-cross-wrapper/default.nix
@@ -44,9 +44,7 @@ stdenv.mkDerivation {
   ldWrapper = ./ld-wrapper.sh;
   utils = ./utils.sh;
   addFlags = ./add-flags;
-  inherit nativeTools nativeLibc nativePrefix gcc binutils;
-  libc = if libc ? out then libc.out else libc;
-  libc_dev = if libc ? dev then libc.dev else libc;
+  inherit nativeTools nativeLibc nativePrefix gcc libc binutils;
   crossConfig = if cross != null then cross.config else null;
   osxMinVersion = cross.osxMinVersion or null;
   gccLibs = if gcc != null then gccLibs else null;
diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index d922db5ccf58..7d0f88abb855 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -16,7 +16,7 @@ makeWrapper() {
             varName=${params[$((n + 1))]}
             value=${params[$((n + 2))]}
             n=$((n + 2))
-            echo "export $varName=\"$value\"" >> $wrapper
+            echo "export $varName=$value" >> $wrapper
         fi
 
         if test "$p" = "--unset"; then
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 18e49105ae78..73f4d7783c43 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -8,7 +8,6 @@ rec {
   runCommand = name: env: buildCommand:
     stdenv.mkDerivation ({
       inherit name buildCommand;
-      passAsFile = [ "buildCommand" ];
     } // env);
 
 
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
index a955f5cf8a48..77cd666b8c6d 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
@@ -3,7 +3,7 @@
 let
 
   common = { pname, sha256 }: stdenv.mkDerivation rec {
-    name = "${pname}-1.79.1";
+    name = "${pname}-1.78.1";
 
     src = fetchurl {
       url = "mirror://sourceforge/docbook/${name}.tar.bz2";
@@ -35,12 +35,12 @@ in {
 
   docbook_xsl = common {
     pname = "docbook-xsl";
-    sha256 = "0s59lihif2fr7rznckxr2kfyrvkirv76r1zvidp9b5mj28p4apvj";
+    sha256 = "0rxl013ncmz1n6ymk2idvx3hix9pdabk8xn01cpcv32wmfb753y9";
   };
 
   docbook_xsl_ns = common {
     pname = "docbook-xsl-ns";
-    sha256 = "170ggf5dgjar65kkn5n33kvjr3pdinpj66nnxfx8b2avw0k91jin";
+    sha256 = "1x3sc0axk9z3i6n0jhlsmzlmb723a4sjgslm9g12by6phirdx3ng";
   };
 
 }
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
index 2a1d95806c10..618e7387e62c 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
@@ -34,9 +34,6 @@ plasmaPackage rec {
     })
     ./0003-tzdir.patch
   ];
-  postPatch = ''
-    sed '1i#include <cmath>' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
-  '';
   NIX_CFLAGS_COMPILE = [ "-I${xorgserver.dev}/include/xorg" ];
   cmakeFlags = [
     "-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg"
diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index 69ff590a6314..b1eedf7707df 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -179,11 +179,11 @@ stdenv.mkDerivation ({
            sed -i "${gnu_h}" \
                -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g'
 
-           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..."
+           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..."
            sed -i "${gnu_h}" \
-               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g'
+               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g'
            sed -i gcc/config/t-gnu \
-               -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc.dev}/include|g'
+               -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc}/include|g'
         ''
     else if cross != null || stdenv.cc.libc != null then
       # On NixOS, use the right path to the dynamic linker instead of
@@ -197,7 +197,7 @@ stdenv.mkDerivation ({
              grep -q LIBC_DYNAMIC_LINKER "$header" || continue
              echo "  fixing \`$header'..."
              sed -i "$header" \
-                 -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g'
+                 -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc}\3"|g'
            done
         ''
     else null;
@@ -205,10 +205,10 @@ stdenv.mkDerivation ({
   inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic
     libcCross crossMingw;
 
-  nativeBuildInputs = [ texinfo which gettext ]
+  nativeBuildInputs = [ texinfo which ]
     ++ optional (perl != null) perl;
     
-  buildInputs = [ gmp mpfr libmpc libelf ]
+  buildInputs = [ gmp mpfr libmpc libelf gettext ]
     ++ (optional (ppl != null) ppl)
     ++ (optional (cloogppl != null) cloogppl)
     ++ (optional (zlib != null) zlib)
@@ -284,7 +284,6 @@ stdenv.mkDerivation ({
       ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""}
       --with-gmp=${gmp.crossDrv}
       --with-mpfr=${mpfr.crossDrv}
-      --with-mpc=${libmpc.crossDrv}
       --disable-libstdcxx-pch
       --without-included-gettext
       --with-system-zlib
@@ -347,28 +346,15 @@ stdenv.mkDerivation ({
                                           ++ optional (libpthread != null) libpthread)));
 
   EXTRA_TARGET_CFLAGS =
-    if cross != null && libcCross != null then [
-        "-idirafter ${libcCross.dev}/include"
-      ]
-      ++ optionals (! crossStageStatic) [
-        "-B${libcCross.out}/lib"
-      ]
+    if cross != null && libcCross != null
+    then "-idirafter ${libcCross}/include"
     else null;
 
   EXTRA_TARGET_LDFLAGS =
-    if cross != null && libcCross != null then [
-        "-Wl,-L${libcCross.out}/lib"
-      ]
-      ++ (if crossStageStatic then [
-        "-B${libcCross.out}/lib"
-      ] else [
-        "-Wl,-rpath,${libcCross.out}/lib"
-        "-Wl,-rpath-link,${libcCross.out}/lib"
-      ])
-      ++ optionals (libpthreadCross != null) [
-        "-L${libpthreadCross}/lib"
-        "-Wl,${libpthreadCross.TARGET_LDFLAGS}"
-      ]
+    if cross != null && libcCross != null
+    then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" +
+         (optionalString (libpthreadCross != null)
+           " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}")
     else null;
 
   passthru = { inherit langC langCC langAda langFortran langVhdl
diff --git a/pkgs/development/compilers/gcc/4.6/builder.sh b/pkgs/development/compilers/gcc/4.6/builder.sh
index 6087bb30cfb2..af36ec33b70a 100644
--- a/pkgs/development/compilers/gcc/4.6/builder.sh
+++ b/pkgs/development/compilers/gcc/4.6/builder.sh
@@ -209,9 +209,7 @@ postInstall() {
     # Move runtime libraries to $lib.
     mkdir -p $lib/lib
     ln -s lib $lib/lib64
-    moveToOutput "lib/lib*.so"        "$lib"
-    moveToOutput "lib/lib*.so.*[0-9]" "$lib"
-    moveToOutput "lib/*.la"           "$lib"
+    mv -v $out/lib/lib*.so $out/lib/lib*.so.*[0-9] $out/lib/*.la $lib/lib/
     for i in $lib/lib/*.la; do
         substituteInPlace $i --replace $out $lib
     done
diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix
index 330f8a7cf8e7..7003f4335c8a 100644
--- a/pkgs/development/compilers/gcc/4.6/default.nix
+++ b/pkgs/development/compilers/gcc/4.6/default.nix
@@ -229,11 +229,11 @@ stdenv.mkDerivation ({
            sed -i "${gnu_h}" \
                -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g'
 
-           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..."
+           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..."
            sed -i "${gnu_h}" \
-               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g'
+               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g'
            sed -i gcc/config/t-gnu \
-               -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc.dev}/include|g'
+               -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc}/include|g'
         ''
     else if cross != null || stdenv.cc.libc != null then
       # On NixOS, use the right path to the dynamic linker instead of
@@ -247,7 +247,7 @@ stdenv.mkDerivation ({
              grep -q LIBC_DYNAMIC_LINKER "$header" || continue
              echo "  fixing \`$header'..."
              sed -i "$header" \
-                 -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g'
+                 -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc}\3"|g'
            done
         ''
     else null;
@@ -357,7 +357,6 @@ stdenv.mkDerivation ({
       ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""}
       --with-gmp=${gmp.crossDrv}
       --with-mpfr=${mpfr.crossDrv}
-      --with-mpc=${libmpc.crossDrv}
       --disable-libstdcxx-pch
       --without-included-gettext
       --with-system-zlib
@@ -422,28 +421,15 @@ stdenv.mkDerivation ({
                                           ++ optional (libpthread != null) libpthread)));
 
   EXTRA_TARGET_CFLAGS =
-    if cross != null && libcCross != null then [
-        "-idirafter ${libcCross.dev}/include"
-      ]
-      ++ optionals (! crossStageStatic) [
-        "-B${libcCross.out}/lib"
-      ]
+    if cross != null && libcCross != null
+    then "-idirafter ${libcCross}/include"
     else null;
 
   EXTRA_TARGET_LDFLAGS =
-    if cross != null && libcCross != null then [
-        "-Wl,-L${libcCross.out}/lib"
-      ]
-      ++ (if crossStageStatic then [
-        "-B${libcCross.out}/lib"
-      ] else [
-        "-Wl,-rpath,${libcCross.out}/lib"
-        "-Wl,-rpath-link,${libcCross.out}/lib"
-      ])
-      ++ optionals (libpthreadCross != null) [
-        "-L${libpthreadCross}/lib"
-        "-Wl,${libpthreadCross.TARGET_LDFLAGS}"
-      ]
+    if cross != null && libcCross != null
+    then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" +
+         (optionalString (libpthreadCross != null)
+           " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}")
     else null;
 
   passthru = { inherit langC langCC langAda langFortran langVhdl
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 32a43a24efd5..6810b52574c6 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -164,8 +164,8 @@ let version = "4.8.5";
           " --disable-libatomic " +  # libatomic requires libc
           " --disable-decimal-float" # libdecnumber requires libc
           else
-          (if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot"
-           else                " --with-headers=${libcCross.dev}/include") +
+          (if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot"
+           else                " --with-headers=${libcCross}/include") +
           # Ensure that -print-prog-name is able to find the correct programs.
           (stdenv.lib.optionalString (crossMingw || crossDarwin) (
             " --with-as=${binutilsCross}/bin/${cross.config}-as" +
@@ -255,9 +255,9 @@ stdenv.mkDerivation ({
            sed -i "${gnu_h}" \
                -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g'
 
-           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..."
+           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..."
            sed -i "${gnu_h}" \
-               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g'
+               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g'
         ''
     else if cross != null || stdenv.cc.libc != null then
       # On NixOS, use the right path to the dynamic linker instead of
@@ -271,7 +271,7 @@ stdenv.mkDerivation ({
              grep -q LIBC_DYNAMIC_LINKER "$header" || continue
              echo "  fixing \`$header'..."
              sed -i "$header" \
-                 -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g'
+                 -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc}\3"|g'
            done
         ''
     else null;
@@ -415,7 +415,6 @@ stdenv.mkDerivation ({
       ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""}
       --with-gmp=${gmp.crossDrv}
       --with-mpfr=${mpfr.crossDrv}
-      --with-mpc=${libmpc.crossDrv}
       --disable-libstdcxx-pch
       --without-included-gettext
       --with-system-zlib
@@ -483,28 +482,15 @@ stdenv.mkDerivation ({
                                           ++ optional (libpthread != null) libpthread)));
 
   EXTRA_TARGET_CFLAGS =
-    if cross != null && libcCross != null then [
-        "-idirafter ${libcCross.dev}/include"
-      ]
-      ++ optionals (! crossStageStatic) [
-        "-B${libcCross.out}/lib"
-      ]
+    if cross != null && libcCross != null
+    then "-idirafter ${libcCross}/include"
     else null;
 
   EXTRA_TARGET_LDFLAGS =
-    if cross != null && libcCross != null then [
-        "-Wl,-L${libcCross.out}/lib"
-      ]
-      ++ (if crossStageStatic then [
-        "-B${libcCross.out}/lib"
-      ] else [
-        "-Wl,-rpath,${libcCross.out}/lib"
-        "-Wl,-rpath-link,${libcCross.out}/lib"
-      ])
-      ++ optionals (libpthreadCross != null) [
-        "-L${libpthreadCross}/lib"
-        "-Wl,${libpthreadCross.TARGET_LDFLAGS}"
-      ]
+    if cross != null && libcCross != null
+    then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" +
+         (optionalString (libpthreadCross != null)
+           " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}")
     else null;
 
   passthru =
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 6a9078fefcef..195a7b03eed4 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -166,8 +166,8 @@ let version = "4.9.3";
           " --disable-libatomic " +  # libatomic requires libc
           " --disable-decimal-float" # libdecnumber requires libc
           else
-          (if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot"
-           else                " --with-headers=${libcCross.dev}/include") +
+          (if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot"
+           else                " --with-headers=${libcCross}/include") +
           # Ensure that -print-prog-name is able to find the correct programs.
           (stdenv.lib.optionalString (crossMingw || crossDarwin) (
             " --with-as=${binutilsCross}/bin/${cross.config}-as" +
@@ -258,9 +258,9 @@ stdenv.mkDerivation ({
            sed -i "${gnu_h}" \
                -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g'
 
-           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..."
+           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..."
            sed -i "${gnu_h}" \
-               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g'
+               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g'
         ''
     else if cross != null || stdenv.cc.libc != null then
       # On NixOS, use the right path to the dynamic linker instead of
@@ -274,7 +274,7 @@ stdenv.mkDerivation ({
              grep -q LIBC_DYNAMIC_LINKER "$header" || continue
              echo "  fixing \`$header'..."
              sed -i "$header" \
-                 -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g'
+                 -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc}\3"|g'
            done
         ''
     else null;
@@ -422,7 +422,6 @@ stdenv.mkDerivation ({
       ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""}
       --with-gmp=${gmp.crossDrv}
       --with-mpfr=${mpfr.crossDrv}
-      --with-mpc=${libmpc.crossDrv}
       --disable-libstdcxx-pch
       --without-included-gettext
       --with-system-zlib
@@ -490,28 +489,15 @@ stdenv.mkDerivation ({
                                           ++ optional (libpthread != null) libpthread)));
 
   EXTRA_TARGET_CFLAGS =
-    if cross != null && libcCross != null then [
-        "-idirafter ${libcCross.dev}/include"
-      ]
-      ++ optionals (! crossStageStatic) [
-        "-B${libcCross.out}/lib"
-      ]
+    if cross != null && libcCross != null
+    then "-idirafter ${libcCross}/include"
     else null;
 
   EXTRA_TARGET_LDFLAGS =
-    if cross != null && libcCross != null then [
-        "-Wl,-L${libcCross.out}/lib"
-      ]
-      ++ (if crossStageStatic then [
-        "-B${libcCross.out}/lib"
-      ] else [
-        "-Wl,-rpath,${libcCross.out}/lib"
-        "-Wl,-rpath-link,${libcCross.out}/lib"
-      ])
-      ++ optionals (libpthreadCross != null) [
-        "-L${libpthreadCross}/lib"
-        "-Wl,${libpthreadCross.TARGET_LDFLAGS}"
-      ]
+    if cross != null && libcCross != null
+    then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" +
+         (optionalString (libpthreadCross != null)
+           " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}")
     else null;
 
   passthru =
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 9ab725e2da88..9e0220ffc728 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -58,8 +58,7 @@ assert langGo -> langCC;
 with stdenv.lib;
 with builtins;
 
-let version = "5.4.0";
-    sha256 = "0fihlcy5hnksdxk0sn6bvgnyq8gfrgs8m794b1jxwd1dxinzg3b0";
+let version = "5.3.0";
 
     # Whether building a cross-compiler for GNU/Hurd.
     crossGNU = cross != null && cross.config == "i586-pc-gnu";
@@ -166,8 +165,8 @@ let version = "5.4.0";
           " --disable-libatomic " +  # libatomic requires libc
           " --disable-decimal-float" # libdecnumber requires libc
           else
-          (if crossDarwin then " --with-sysroot=${getLib libcCross}/share/sysroot"
-           else                " --with-headers=${getDev libcCross}/include") +
+          (if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot"
+           else                " --with-headers=${libcCross}/include") +
           # Ensure that -print-prog-name is able to find the correct programs.
           (stdenv.lib.optionalString (crossMingw || crossDarwin) (
             " --with-as=${binutilsCross}/bin/${cross.config}-as" +
@@ -213,7 +212,7 @@ stdenv.mkDerivation ({
 
   src = fetchurl {
     url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
-    inherit sha256;
+    sha256 = "1ny4smkp5bzs3cp8ss7pl6lk8yss0d9m4av1mvdp72r1x695akxq";
   };
 
   inherit patches;
@@ -257,9 +256,9 @@ stdenv.mkDerivation ({
            sed -i "${gnu_h}" \
                -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g'
 
-           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..."
+           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..."
            sed -i "${gnu_h}" \
-               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g'
+               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g'
         ''
     else if cross != null || stdenv.cc.libc != null then
       # On NixOS, use the right path to the dynamic linker instead of
@@ -273,7 +272,7 @@ stdenv.mkDerivation ({
              grep -q LIBC_DYNAMIC_LINKER "$header" || continue
              echo "  fixing \`$header'..."
              sed -i "$header" \
-                 -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g'
+                 -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc}\3"|g'
            done
         ''
     else null;
@@ -416,7 +415,6 @@ stdenv.mkDerivation ({
       ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""}
       --with-gmp=${gmp.crossDrv}
       --with-mpfr=${mpfr.crossDrv}
-      --with-mpc=${libmpc.crossDrv}
       --disable-libstdcxx-pch
       --without-included-gettext
       --with-system-zlib
@@ -484,28 +482,15 @@ stdenv.mkDerivation ({
                                           ++ optional (libpthread != null) libpthread)));
 
   EXTRA_TARGET_CFLAGS =
-    if cross != null && libcCross != null then [
-        "-idirafter ${getDev libcCross}/include"
-      ]
-      ++ optionals (! crossStageStatic) [
-        "-B${libcCross.out}/lib"
-      ]
+    if cross != null && libcCross != null
+    then "-idirafter ${libcCross}/include"
     else null;
 
   EXTRA_TARGET_LDFLAGS =
-    if cross != null && libcCross != null then [
-        "-Wl,-L${libcCross.out}/lib"
-      ]
-      ++ (if crossStageStatic then [
-        "-B${libcCross.out}/lib"
-      ] else [
-        "-Wl,-rpath,${libcCross.out}/lib"
-        "-Wl,-rpath-link,${libcCross.out}/lib"
-      ])
-      ++ optionals (libpthreadCross != null) [
-        "-L${libpthreadCross}/lib"
-        "-Wl,${libpthreadCross.TARGET_LDFLAGS}"
-      ]
+    if cross != null && libcCross != null
+    then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" +
+         (optionalString (libpthreadCross != null)
+           " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}")
     else null;
 
   passthru =
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index d281488fd505..6ca0f2f59f44 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -165,8 +165,8 @@ let version = "6.1.0";
           " --disable-libatomic " +  # libatomic requires libc
           " --disable-decimal-float" # libdecnumber requires libc
           else
-          (if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot"
-           else                " --with-headers=${libcCross.dev}/include") +
+          (if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot"
+           else                " --with-headers=${libcCross}/include") +
           # Ensure that -print-prog-name is able to find the correct programs.
           (stdenv.lib.optionalString (crossMingw || crossDarwin) (
             " --with-as=${binutilsCross}/bin/${cross.config}-as" +
@@ -256,9 +256,9 @@ stdenv.mkDerivation ({
            sed -i "${gnu_h}" \
                -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g'
 
-           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..."
+           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..."
            sed -i "${gnu_h}" \
-               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g'
+               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g'
         ''
     else if cross != null || stdenv.cc.libc != null then
       # On NixOS, use the right path to the dynamic linker instead of
@@ -272,7 +272,7 @@ stdenv.mkDerivation ({
              grep -q LIBC_DYNAMIC_LINKER "$header" || continue
              echo "  fixing \`$header'..."
              sed -i "$header" \
-                 -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g'
+                 -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc}\3"|g'
            done
         ''
     else null;
@@ -482,28 +482,15 @@ stdenv.mkDerivation ({
                                           ++ optional (libpthread != null) libpthread)));
 
   EXTRA_TARGET_CFLAGS =
-    if cross != null && libcCross != null then [
-        "-idirafter ${libcCross.dev}/include"
-      ]
-      ++ optionals (! crossStageStatic) [
-        "-B${libcCross.out}/lib"
-      ]
+    if cross != null && libcCross != null
+    then "-idirafter ${libcCross}/include"
     else null;
 
   EXTRA_TARGET_LDFLAGS =
-    if cross != null && libcCross != null then [
-        "-Wl,-L${libcCross.out}/lib"
-      ]
-      ++ (if crossStageStatic then [
-        "-B${libcCross.out}/lib"
-      ] else [
-        "-Wl,-rpath,${libcCross.out}/lib"
-        "-Wl,-rpath-link,${libcCross.out}/lib"
-      ])
-      ++ optionals (libpthreadCross != null) [
-        "-L${libpthreadCross}/lib"
-        "-Wl,${libpthreadCross.TARGET_LDFLAGS}"
-      ]
+    if cross != null && libcCross != null
+    then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" +
+         (optionalString (libpthreadCross != null)
+           " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}")
     else null;
 
   passthru =
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index 6b09cfd59edb..22107e72ef70 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -70,6 +70,10 @@ if test "$noSysDirs" = "1"; then
         # gcj in.
         unset LIBRARY_PATH
         unset CPATH
+        if test -z "$crossStageStatic"; then
+            EXTRA_TARGET_CFLAGS="-B${libcCross}/lib -idirafter ${libcCross}/include"
+            EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib -Wl,-rpath,${libcCross}/lib -Wl,-rpath-link,${libcCross}/lib"
+        fi
     else
         if test -z "$NIX_CC_CROSS"; then
             EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS"
@@ -86,16 +90,15 @@ if test "$noSysDirs" = "1"; then
             extraFlags="$(cat $NIX_CC_CROSS/nix-support/libc-cflags)"
             extraLDFlags="$(cat $NIX_CC_CROSS/nix-support/libc-ldflags) $(cat $NIX_CC_CROSS/nix-support/libc-ldflags-before)"
 
-            # The path to the Glibc binaries such as `crti.o'.
-            glibc_dir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)"
-            glibc_libdir="$glibc_dir/lib"
-            glibc_devdir="$(cat $NIX_CC_CROSS/nix-support/orig-libc-dev)"
-            configureFlags="$configureFlags --with-native-system-header-dir=$glibc_devdir/include"
-
             # Use *real* header files, otherwise a limits.h is generated
             # that does not include Glibc's limits.h (notably missing
             # SSIZE_MAX, which breaks the build).
-            NIX_FIXINC_DUMMY_CROSS="$glibc_devdir/include"
+            NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_CC_CROSS/nix-support/orig-libc)/include
+
+            # The path to the Glibc binaries such as `crti.o'.
+            glibc_dir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)"
+            glibc_libdir="$glibc_dir/lib"
+            configureFlags="$configureFlags --with-native-system-header-dir=$glibc_dir/include"
 
             extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags"
             extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags"
diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix
index 4a4ec5d9fe9c..823e50e32272 100644
--- a/pkgs/development/libraries/botan/generic.nix
+++ b/pkgs/development/libraries/botan/generic.nix
@@ -2,7 +2,6 @@
 # Passed by version specific builders
 , baseVersion, revision, sha256
 , extraConfigureFlags ? ""
-, postPatch ? null
 , ...
 }:
 
@@ -18,7 +17,6 @@ stdenv.mkDerivation rec {
     ];
     inherit sha256;
   };
-  inherit postPatch;
 
   buildInputs = [ python bzip2 zlib gmp openssl boost ];
 
diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix
index d952b50aeb8e..dd185f21035d 100644
--- a/pkgs/development/libraries/botan/unstable.nix
+++ b/pkgs/development/libraries/botan/unstable.nix
@@ -5,5 +5,4 @@ callPackage ./generic.nix (args // {
   revision = "29";
   sha256 = "157bp8716h17agrxyj7xpsj2i5sqhafj1nfx4gpzccx7y2kyq176";
   openssl = null;
-  postPatch = "sed '1i#include <cmath>' -i src/tests/test_bigint.cpp";
 })
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 63eb086b0fb1..78a8756b59b4 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     sed -i -e "s/\(am_libgettextlib_la_OBJECTS = \)error.lo/\\1/" gettext-tools/gnulib-lib/Makefile.in
   '';
 
-  nativeBuildInputs = [ xz xz.bin ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; # HACK, see #10874 (and 14664)
+  buildInputs = [ xz xz.bin libiconv ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/glibc/builder.sh b/pkgs/development/libraries/glibc/builder.sh
new file mode 100644
index 000000000000..85f27c7b3559
--- /dev/null
+++ b/pkgs/development/libraries/glibc/builder.sh
@@ -0,0 +1,58 @@
+# Glibc cannot have itself in its RPATH.
+export NIX_NO_SELF_RPATH=1
+
+source $stdenv/setup
+
+postConfigure() {
+    # Hack: get rid of the `-static' flag set by the bootstrap stdenv.
+    # This has to be done *after* `configure' because it builds some
+    # test binaries.
+    export NIX_CFLAGS_LINK=
+    export NIX_LDFLAGS_BEFORE=
+
+    export NIX_DONT_SET_RPATH=1
+    unset CFLAGS
+
+    # Apparently --bindir is not respected.
+    makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin")
+}
+
+postInstall() {
+    if test -n "$installLocales"; then
+        make -j${NIX_BUILD_CORES:-1} -l${NIX_BUILD_CORES:-1} localedata/install-locales
+    fi
+
+    test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache
+
+    if test -n "$linuxHeaders"; then
+        # Include the Linux kernel headers in Glibc, except the `scsi'
+        # subdirectory, which Glibc provides itself.
+        (cd $dev/include && \
+         ln -sv $(ls -d $linuxHeaders/include/* | grep -v 'scsi$') .)
+    fi
+
+    # Fix for NIXOS-54 (ldd not working on x86_64).  Make a symlink
+    # "lib64" to "lib".
+    if test -n "$is64bit"; then
+        ln -s lib $out/lib64
+    fi
+
+    # Get rid of more unnecessary stuff.
+    rm -rf $out/var $out/sbin/sln
+
+    for i in $out/lib/*.a; do
+        strip -S "$i"
+    done
+    # Put libraries for static linking in a separate output.  Note
+    # that libc_nonshared.a and libpthread_nonshared.a are required
+    # for dynamically-linked applications.
+    mkdir -p $static/lib
+    mv $out/lib/*.a $static/lib
+    mv $static/lib/lib*_nonshared.a $out/lib
+
+    # Work around a Nix bug: hard links across outputs cause a build failure.
+    cp $bin/bin/getconf $bin/bin/getconf_
+    mv $bin/bin/getconf_ $bin/bin/getconf
+}
+
+genericBuild
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index e90fdc4ad7bd..a189edb9832d 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -54,7 +54,6 @@ stdenv.mkDerivation ({
       ./glob-simplify-interface.patch
       ./cve-2016-1234.patch
       ./cve-2016-3706.patch
-      ./fix_warnings.patch
     ];
 
   postPatch =
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index 0ea6b4b938b2..80fc2ce1e93d 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -17,21 +17,7 @@ in
     inherit lib stdenv fetchurl linuxHeaders installLocales
       profilingLibraries gccCross withGd gd libpng;
 
-    NIX_NO_SELF_RPATH = true;
-
-    postConfigure = ''
-      # Hack: get rid of the `-static' flag set by the bootstrap stdenv.
-      # This has to be done *after* `configure' because it builds some
-      # test binaries.
-      export NIX_CFLAGS_LINK=
-      export NIX_LDFLAGS_BEFORE=
-
-      export NIX_DONT_SET_RPATH=1
-      unset CFLAGS
-
-      # Apparently --bindir is not respected.
-      makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin")
-    '';
+    builder = ./builder.sh;
 
     # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for
     # any program we run, because the gcc will have been placed at a new
@@ -40,7 +26,7 @@ in
     # Building from a proper gcc staying in the path where it was installed,
     # libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without
     # any special hack.
-    preInstall = ''
+    preInstall = if cross != null then "" else ''
       if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then
           mkdir -p $out/lib
           cp ${stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1
@@ -49,41 +35,6 @@ in
       fi
     '';
 
-    postInstall = ''
-      if test -n "$installLocales"; then
-          make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales
-      fi
-
-      test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache
-
-      if test -n "$linuxHeaders"; then
-          # Include the Linux kernel headers in Glibc, except the `scsi'
-          # subdirectory, which Glibc provides itself.
-          (cd $dev/include && \
-           ln -sv $(ls -d $linuxHeaders/include/* | grep -v scsi\$) .)
-      fi
-
-      # Fix for NIXOS-54 (ldd not working on x86_64).  Make a symlink
-      # "lib64" to "lib".
-      if test -n "$is64bit"; then
-          ln -s lib $out/lib64
-      fi
-
-      # Get rid of more unnecessary stuff.
-      rm -rf $out/var $out/sbin/sln
-
-      # Put libraries for static linking in a separate output.  Note
-      # that libc_nonshared.a and libpthread_nonshared.a are required
-      # for dynamically-linked applications.
-      mkdir -p $static/lib
-      mv $out/lib/*.a $static/lib
-      mv $static/lib/lib*_nonshared.a $out/lib
-
-      # Work around a Nix bug: hard links across outputs cause a build failure.
-      cp $bin/bin/getconf $bin/bin/getconf_
-      mv $bin/bin/getconf_ $bin/bin/getconf
-    '';
-
     separateDebugInfo = true;
 
     meta.description = "The GNU C Library";
@@ -111,10 +62,6 @@ in
         dontStrip=1
       '';
 
-      preInstall = null; # clobber the native hook
-
-      separateDebugInfo = false; # this is currently broken for crossDrv
-
       # To avoid a dependency on the build system 'bash'.
       preFixup = ''
         rm $bin/bin/{ldd,tzselect,catchsegv,xtrace}
diff --git a/pkgs/development/libraries/glibc/fix_warnings.patch b/pkgs/development/libraries/glibc/fix_warnings.patch
deleted file mode 100644
index fd75c18c84ec..000000000000
--- a/pkgs/development/libraries/glibc/fix_warnings.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/stdlib/setenv.c	2016-05-30 11:09:14.487180254 +0000
-+++ b/stdlib/setenv.c	2016-05-30 11:08:25.560390748 +0000
-@@ -277,6 +277,7 @@
- 
-   ep = __environ;
-   if (ep != NULL)
-+    {
-     while (*ep != NULL)
-       if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
- 	{
-@@ -290,6 +291,7 @@
- 	}
-       else
- 	++ep;
-+    }
- 
-   UNLOCK;
- 
---- a/nis/nis_call.c	2016-05-30 08:05:59.359855696 -0700
-+++ b/nis/nis_call.c	2016-05-30 08:05:55.679873221 -0700
-@@ -680,6 +680,7 @@
-   /* Choose which entry should be evicted from the cache.  */
-   loc = &nis_server_cache[0];
-   if (*loc != NULL)
-+    {
-     for (i = 1; i < 16; ++i)
-       if (nis_server_cache[i] == NULL)
- 	{
-@@ -690,6 +691,7 @@
- 	       || ((*loc)->uses == nis_server_cache[i]->uses
- 		   && (*loc)->expires > nis_server_cache[i]->expires))
- 	loc = &nis_server_cache[i];
-+    }
-   old = *loc;
-   *loc = new;
- 
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 78644200e0b1..332ca526b6ba 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
   buildInputs = [ openssl ]
     ++ optionals (!libOnly) [ openldap libedit ];
 
-  patches = [ ./path_char_fix.patch ];
-
   preConfigure = "cd ./src";
 
   buildPhase = optionalString libOnly ''
diff --git a/pkgs/development/libraries/kerberos/path_char_fix.patch b/pkgs/development/libraries/kerberos/path_char_fix.patch
deleted file mode 100644
index 2a6dc4c11c37..000000000000
--- a/pkgs/development/libraries/kerberos/path_char_fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-See https://github.com/krb5/krb5/pull/467
-diff --git a/src/include/Makefile.in b/src/include/Makefile.in
-index 4bb11e4..cb4b44b 100644
---- a/src/include/Makefile.in
-+++ b/src/include/Makefile.in
-@@ -57,19 +57,19 @@ SBINDIR = @sbindir@
- LIBDIR  = @libdir@
- SYSCONFCONF = @SYSCONFCONF@
- 
--PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \
--		  -e "s+@PREFIX+$(INSTALL_PREFIX)+" \
--		  -e "s+@EXEC_PREFIX+$(INSTALL_EXEC_PREFIX)+" \
--		  -e "s+@BINDIR+$(BINDIR)+" \
--		  -e "s+@LIBDIR+$(LIBDIR)+" \
--		  -e "s+@SBINDIR+$(SBINDIR)+" \
--		  -e "s+@MODULEDIR+$(MODULE_DIR)+" \
--		  -e "s+@GSSMODULEDIR+$(GSS_MODULE_DIR)+" \
--		  -e 's+@LOCALSTATEDIR+$(LOCALSTATEDIR)+' \
--		  -e 's+@RUNSTATEDIR+$(RUNSTATEDIR)+' \
--		  -e 's+@SYSCONFDIR+$(SYSCONFDIR)+' \
--		  -e 's+@DYNOBJEXT+$(DYNOBJEXT)+' \
--		  -e 's+@SYSCONFCONF+$(SYSCONFCONF)+'
-+PROCESS_REPLACE = -e "s\"@KRB5RCTMPDIR\"$(KRB5RCTMPDIR)\"" \
-+		  -e "s\"@PREFIX\"$(INSTALL_PREFIX)\"" \
-+		  -e "s\"@EXEC_PREFIX\"$(INSTALL_EXEC_PREFIX)\"" \
-+		  -e "s\"@BINDIR\"$(BINDIR)\"" \
-+		  -e "s\"@LIBDIR\"$(LIBDIR)\"" \
-+		  -e "s\"@SBINDIR\"$(SBINDIR)\"" \
-+		  -e "s\"@MODULEDIR\"$(MODULE_DIR)\"" \
-+		  -e "s\"@GSSMODULEDIR\"$(GSS_MODULE_DIR)\"" \
-+		  -e "s\"@LOCALSTATEDIR\"$(LOCALSTATEDIR)\"" \
-+		  -e "s\"@RUNSTATEDIR\"$(RUNSTATEDIR)\"" \
-+		  -e "s\"@SYSCONFDIR\"$(SYSCONFDIR)\"" \
-+		  -e "s\"@DYNOBJEXT\"$(DYNOBJEXT)\"" \
-+		  -e "s\"@SYSCONFCONF\"$(SYSCONFCONF)\""
- 
- OSCONFSRC = $(srcdir)/osconf.hin
- 
diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix
index 12588617d4a1..623256bb6b7b 100644
--- a/pkgs/development/libraries/libelf/default.nix
+++ b/pkgs/development/libraries/libelf/default.nix
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
   };
 
   doCheck = true;
-
+  
   # For cross-compiling, native glibc is needed for the "gencat" program.
   crossAttrs = {
-    nativeBuildInputs = [ gettext glibc ];
+    nativeBuildInputs = [ glibc ];
   };
 
   # Libelf's custom NLS macros fail to determine the catalog file extension on
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   # FIXME: Eventually make Gettext a build input on all platforms.
   configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-nls";
 
-  nativeBuildInputs = [ gettext ];
+  buildInputs = [ gettext ];
 
   meta = {
     description = "ELF object file access library";
diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix
index 7087142a2aa9..7cfccfe05f74 100644
--- a/pkgs/development/libraries/libxkbcommon/default.nix
+++ b/pkgs/development/libraries/libxkbcommon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb, libX11 }:
+{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb }:
 
 stdenv.mkDerivation rec {
   name = "libxkbcommon-0.6.1";
@@ -12,10 +12,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig yacc flex xkeyboard_config libxcb ];
 
-  configureFlags = [
-    "--with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb"
-    "--with-x-locale-root=${libX11.out}/share/X11/locale"
-  ];
+  configureFlags = ''
+    --with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb
+  '';
 
   preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i 's/,--version-script=.*$//' Makefile
diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix
index 4ba366be56f0..e3c5d7573107 100644
--- a/pkgs/development/libraries/xgboost/default.nix
+++ b/pkgs/development/libraries/xgboost/default.nix
@@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
     sha256 = "1d7lnbwxwakclqqfjwyk9w3wd2clkihdr6ljs5z08ydiaspri093";
   };
 
-  postPatch = "sed '1i#include <cmath>' -i src/tree/param.h";
-
   enableParallelBuilding = true;
 
   installPhase = ''
diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh
index efbb1e737876..a67ea51f5a9b 100644
--- a/pkgs/development/python-modules/generic/wrap.sh
+++ b/pkgs/development/python-modules/generic/wrap.sh
@@ -46,15 +46,16 @@ wrapPythonProgramsIn() {
                 # wrapProgram creates the executable shell script described
                 # above. The script will set PYTHONPATH and PATH variables.!
                 # (see pkgs/build-support/setup-hooks/make-wrapper.sh)
-                local -a wrap_args=("$f"
-                                 --prefix PYTHONPATH ':' "$program_PYTHONPATH"
-                                 --prefix PATH ':' "$program_PATH:$dir/bin")
+                local wrap_args="$f \
+                                 --prefix PYTHONPATH ':' $program_PYTHONPATH \
+                                 --prefix PATH ':' $program_PATH:$dir/bin"
 
                 # Add any additional arguments provided by makeWrapperArgs
                 # argument to buildPythonPackage.
-                local -a user_args="($makeWrapperArgs)"
-                local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}")
-                wrapProgram "${wrapProgramArgs[@]}"
+                for arg in $makeWrapperArgs; do
+                    wrap_args="$wrap_args $arg"
+                done
+                wrapProgram $wrap_args
             fi
         fi
     done
diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix
index 84ab79879b41..926aaeb94ccc 100644
--- a/pkgs/development/tools/analysis/rr/default.nix
+++ b/pkgs/development/tools/analysis/rr/default.nix
@@ -11,9 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "03fl2wgbc1cilaw8hrhfqjsbpi05cid6k4cr3s2vmv5gx0dnrgy4";
   };
 
-  postPatch = ''
+  patchPhase = ''
     substituteInPlace src/Command.cc --replace '_BSD_SOURCE' '_DEFAULT_SOURCE'
-    sed '7i#include <math.h>' -i src/Scheduler.cc
     patchShebangs .
   '';
 
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index a4f1a96c6a4c..510a0679527e 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -3,7 +3,7 @@
 , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt
 , guile, perl, postgresql92, aws-sdk-cpp, nukeReferences, git, boehmgc
 , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
-, rpm, dpkg, cdrkit, fetchpatch }:
+, rpm, dpkg, cdrkit }:
 
 with stdenv;
 
@@ -70,12 +70,6 @@ in releaseTools.nixBuild rec {
     sha256 = "0ngipzm2i2vz5ygfd70hh82d027snpl85r8ncn1rxlkak0g8fxsl";
   };
 
-  patches = [(fetchpatch {
-    name = "cmath.diff";
-    url = https://github.com/vcunat/hydra/commit/3c6fca1ba299.diff; # https://github.com/NixOS/hydra/pull/337
-    sha256 = "02m9q304ay45s7xfkm2y7lppakrkx3hrq39mm6348isnbqmbarc0";
-  })];
-
   buildInputs =
     [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx
       gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix
index b46114ec62be..3956c994531e 100644
--- a/pkgs/games/cataclysm-dda/default.nix
+++ b/pkgs/games/cataclysm-dda/default.nix
@@ -21,9 +21,6 @@ stdenv.mkDerivation rec {
     sed -i Makefile \
       -e 's,-Werror,,g' \
       -e 's,\(DATA_PREFIX=$(PREFIX)/share/\)cataclysm-dda/,\1,g'
-
-    sed '1i#include <cmath>' \
-      -i src/{crafting,skill,weather_data,melee,vehicle,overmap,iuse_actor}.cpp
   '';
 
   makeFlags = "PREFIX=$(out) LUA=1 TILES=1 SOUND=1 RELEASE=1 USE_HOME_DIR=1";
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index 1ee0f829571d..3d3b1c4d9aa8 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -39,7 +39,6 @@ in stdenv.mkDerivation rec {
   };
 
   patches = [ ./use-system-libraries.patch ];
-  postPatch = "sed '1i#include <math.h>' -i plugins/3dveins.cpp";
 
   nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ];
   # we can't use native Lua; upstream uses private headers
diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index 5b2327c2ff54..1d6ea1196dab 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -13,8 +13,6 @@ stdenv.mkDerivation {
     sha256 = "12bqh3k4wsk1c0bz2zly8h0ilbsdmsbwr9cdjc6i7liwg9906g7i";
   };
 
-  postPatch = "sed '1i#include <math.h>' -i g_src/ttf_manager.cpp";
-
   cmakeFlags = [
     "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
     "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix
index 143fa21ce2e5..2203bb6337eb 100644
--- a/pkgs/games/openspades/default.nix
+++ b/pkgs/games/openspades/default.nix
@@ -16,11 +16,7 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace Sources/Client/Client_Input.cpp --replace "isnan(" "std::isnan("
     substituteInPlace Sources/Client/Corpse.cpp --replace "isnan(" "std::isnan("
-    substituteInPlace Sources/Draw/SWMapRenderer.cpp \
-      --replace "isnan(" "std::isnan(" --replace "isinf(" "std::isinf("
-    sed '1i#include <cmath>' -i Sources/Client/{Player,Client_Input,Corpse}.cpp \
-      -i Sources/Draw/SWMapRenderer.cpp
-    sed '1i#include <math.h>' -i Sources/Draw/SWFeatureLevel.h
+    substituteInPlace Sources/Draw/SWMapRenderer.cpp --replace "isnan(" "std::isnan(" --replace "isinf(" "std::isinf("
   '';
 
   nativeBuildInputs = 
diff --git a/pkgs/games/openspades/git.nix b/pkgs/games/openspades/git.nix
index 7d76573f7345..8212f160cda8 100644
--- a/pkgs/games/openspades/git.nix
+++ b/pkgs/games/openspades/git.nix
@@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
     sha256 = "0vyvmgim03q8pcmfa1i0njr4w1lpjq5g3b47f67v9b5c5jcjycwn";
   };
 
-  postPatch = "sed '1i#include <cmath>' -i Sources/Client/{,Client}Player.cpp";
-
   nativeBuildInputs = 
     with stdenv.lib;
     [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ]
diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix
index 68114bb75652..7cd54b1b65b3 100644
--- a/pkgs/games/the-butterfly-effect/default.nix
+++ b/pkgs/games/the-butterfly-effect/default.nix
@@ -10,13 +10,10 @@ stdenv.mkDerivation rec {
     sha256 = "1ag2cp346f9bz9qy6za6q54id44d2ypvkyhvnjha14qzzapwaysj";
   };
 
-  postPatch = "sed '1i#include <vector>' -i src/model/World.h";
-
   buildInputs = [
     qt5.qtbase qt5.qtsvg qt5.qttranslations box2d which cmake
     gettext
   ];
-  enableParallelBuilding = true;
 
   installPhase = ''
     make DESTDIR=.. install
diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix
index 77392913cb1a..1395e3ac3efe 100644
--- a/pkgs/misc/emulators/higan/default.nix
+++ b/pkgs/misc/emulators/higan/default.nix
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
   };
 
   patches = [ ./0001-change-flags.diff ];
-  postPatch = "sed '1i#include <cmath>' -i higan/fc/ppu/ppu.cpp";
 
   buildInputs =
   [ p7zip pkgconfig libX11 libXv udev mesa SDL libao openal libpulseaudio gtk gtksourceview ];
diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix
index 673e4c3ed087..1b95bca643c7 100644
--- a/pkgs/misc/emulators/pcsx2/default.nix
+++ b/pkgs/misc/emulators/pcsx2/default.nix
@@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
     sha256 = "0s7mxq2cgzwjfsq0vhpz6ljk7wr725nxg48128iyirf85585l691";
   };
 
-  postPatch = "sed '1i#include \"x86intrin.h\"' -i common/src/x86emitter/cpudetect.cpp";
-
   configurePhase = ''
     mkdir -p build
     cd build
@@ -52,8 +50,6 @@ stdenv.mkDerivation rec {
     soundtouch wxGTK30 zlib
   ];
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     description = "Playstation 2 emulator";
     longDescription= ''
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 82e088b76c20..8296ec62c5b2 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -18,9 +18,6 @@ stdenv.mkDerivation {
   src = fetchurl {
     inherit (s) url sha256;
   };
-  postPatch = ''
-    sed '1i#include <cmath>' -i userspace/libsinsp/{cursesspectro,filterchecks}.cpp
-  '';
 
   cmakeFlags = [
     "-DUSE_BUNDLED_DEPS=OFF"
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 8b8d1ba0ae16..ffcd507653a0 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -11,13 +11,6 @@ stdenv.mkDerivation rec {
     sha256 = "1v07fghf2jd2mvkfqhag0xblf6sxw7kx9kmhs2xpyrpns58lirvc";
   };
 
-  postPatch = ''
-    substituteInPlace 3rdParty/V8-3.31.74.1/build/gyp/gyp --replace /bin/bash ${bash}/bin/bash
-    substituteInPlace 3rdParty/etcd/build --replace /bin/bash ${bash}/bin/bash
-    sed '1i#include <cmath>' -i arangod/Aql/Functions.cpp \
-      -i lib/Basics/string-buffer.cpp
-  '';
-
   buildInputs = [
     openssl zlib python gyp go readline
   ];
@@ -26,6 +19,12 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow";
 
+
+  patchPhase = ''
+    substituteInPlace 3rdParty/V8-3.31.74.1/build/gyp/gyp --replace /bin/bash ${bash}/bin/bash
+    substituteInPlace 3rdParty/etcd/build --replace /bin/bash ${bash}/bin/bash
+    '';
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 5b50167d9b9f..85e74461d2a4 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -827,10 +827,6 @@ showPhaseHeader() {
 
 
 genericBuild() {
-    if [ -f "$buildCommandPath" ]; then
-        . "$buildCommandPath"
-        return
-    fi
     if [ -n "$buildCommand" ]; then
         eval "$buildCommand"
         return
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 16099dfb3d39..d6e024c62583 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -5,7 +5,7 @@ let buildFor = toolsArch: (
 let
   pkgsFun = import ../../..;
   pkgsNoParams = pkgsFun {};
-
+  
   sheevaplugCrossSystem = {
     crossSystem = rec {
       config = "armv5tel-unknown-linux-gnueabi";
@@ -18,10 +18,10 @@ let
       openssl.system = "linux-generic32";
     };
   };
-
+  
   raspberrypiCrossSystem = {
     crossSystem = rec {
-      config = "armv6l-unknown-linux-gnueabi";
+      config = "armv6l-unknown-linux-gnueabi";  
       bigEndian = false;
       arch = "arm";
       float = "hard";
@@ -33,10 +33,10 @@ let
       inherit (platform) gcc;
     };
   };
-
+  
   armv7l-hf-multiplatform-crossSystem = {
     crossSystem = rec {
-      config = "armv7l-unknown-linux-gnueabi";
+      config = "armv7l-unknown-linux-gnueabi";  
       bigEndian = false;
       arch = "arm";
       float = "hard";
@@ -48,7 +48,7 @@ let
       inherit (platform) gcc;
     };
   };
-
+  
   selectedCrossSystem =
     if toolsArch == "armv5tel" then sheevaplugCrossSystem else
     if toolsArch == "armv6l" then raspberrypiCrossSystem else
@@ -91,13 +91,13 @@ rec {
   coreutilsMinimal = (pkgs.coreutils.override (args: {
     aclSupport = false;
   })).crossDrv;
-
+  
   curlMinimal = (pkgs.curl.override {
     zlibSupport = false;
     sslSupport = false;
     scpSupport = false;
   }).crossDrv;
-
+  
   busyboxMinimal = (pkgs.busybox.override {
     # TBD: uClibc is broken.
     # useUclibc = true;
@@ -113,10 +113,10 @@ rec {
       CONFIG_UNXZ y
     '';
   }).crossDrv;
-
+  
   inherit pkgs;
 
-  build =
+  build = 
 
     stdenv.mkDerivation {
       name = "build";
@@ -126,7 +126,7 @@ rec {
       crossConfig = stdenv.cross.config;
 
       buildCommand = ''
-	      set -x
+	set -x
         mkdir -p $out/bin $out/lib $out/libexec
 
         # Copy what we need of Glibc.
@@ -142,20 +142,20 @@ rec {
         cp -d ${glibc.out}/lib/libnss*.so* $out/lib
         cp -d ${glibc.out}/lib/libresolv*.so* $out/lib
         cp -d ${glibc.out}/lib/crt?.o $out/lib
-
+        
         cp -rL ${glibc.dev}/include $out
         chmod -R u+w $out/include
-
+        
         # Hopefully we won't need these.
         rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video
         find $out/include -name .install -exec rm {} \;
         find $out/include -name ..install.cmd -exec rm {} \;
         mv $out/include $out/include-glibc
-
+        
         # Copy coreutils, bash, etc.
         cp ${coreutilsMinimal}/bin/* $out/bin
         (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)
-
+        
         cp ${bash}/bin/bash $out/bin
         cp ${findutils}/bin/find $out/bin
         cp ${findutils}/bin/xargs $out/bin
@@ -174,7 +174,7 @@ rec {
         cp -d ${curlMinimal}/lib/libcurl* $out/lib
 
         cp -d ${gnugrep.pcre.crossDrv}/lib/libpcre*.so* $out/lib # needed by grep
-
+        
         # Copy what we need of GCC.
         cp -d ${gcc}/bin/gcc $out/bin
         cp -d ${gcc}/bin/cpp $out/bin
@@ -203,12 +203,12 @@ rec {
         cp -d ${libmpc}/lib/libmpc*.so* $out/lib
         cp -d ${zlib.out}/lib/libz.so* $out/lib
         cp -d ${libelf}/lib/libelf.so* $out/lib
-
+        
         # TBD: Why are these needed for cross but not native tools?
         cp -d ${cloogppl}/lib/libcloog*.so* $out/lib
         cp -d ${cloog}/lib/libcloog*.so* $out/lib
         cp -d ${isl}/lib/libisl*.so* $out/lib
-
+        
         # Copy binutils.
         for i in as ld ar ranlib nm strip readelf objdump; do
           cp ${binutils}/bin/$i $out/bin
@@ -216,7 +216,7 @@ rec {
         cp -d ${binutils.out}/lib/lib*.so* $out/lib
 
         chmod -R u+w $out
-
+        
         # Strip executables even further.
         for i in $out/bin/* $out/libexec/gcc/*/*/*; do
             if test -x $i -a ! -L $i; then
diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix
index 37bc1831d5b1..f99c14720760 100644
--- a/pkgs/tools/typesetting/xmlto/default.nix
+++ b/pkgs/tools/typesetting/xmlto/default.nix
@@ -1,12 +1,12 @@
 { fetchurl, stdenv, flex, libxml2, libxslt
-, docbook_xml_dtd_45, docbook_xsl, w3m
+, docbook_xml_dtd_42, docbook_xsl, w3m
 , bash, getopt, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "xmlto-0.0.28";
+  name = "xmlto-0.0.26";
   src = fetchurl {
     url = "http://fedorahosted.org/releases/x/m/xmlto/${name}.tar.bz2";
-    sha256 = "0xhj8b2pwp4vhl9y16v3dpxpsakkflfamr191mprzsspg4xdyc0i";
+    sha256 = "1v5mahfg5k9lh3anykl482xnrgxn36zlmqsgwahw29xwncprpd7g";
   };
 
   patchPhase = ''
@@ -20,8 +20,7 @@ stdenv.mkDerivation rec {
 
   # `libxml2' provides `xmllint', needed at build-time and run-time.
   # `libxslt' provides `xsltproc', used by `xmlto' at run-time.
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ libxml2 libxslt docbook_xml_dtd_45 docbook_xsl getopt ];
+  buildInputs = [ libxml2 libxslt docbook_xml_dtd_42 docbook_xsl getopt makeWrapper ];
 
   postInstall = ''
     wrapProgram "$out/bin/xmlto" \
-- 
cgit 1.4.1


From 5bff6fef557590d2287853db8a1d25870c0b9dc4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 23 Jun 2016 13:26:57 +0300
Subject: wine: restore old features

---
 pkgs/misc/emulators/wine/default.nix | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index deeff3c73437..260c02e4d1b6 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -10,26 +10,26 @@
   wineRelease ? "stable",
   wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"),
   libtxc_dxtn_Name ? "libtxc_dxtn_s2tc",
-  pngSupport ? false,
-  jpegSupport ? false,
+  pngSupport ? true,
+  jpegSupport ? true,
   tiffSupport ? false,
-  gettextSupport ? false,
-  fontconfigSupport ? false,
-  alsaSupport ? false,
+  gettextSupport ? true,
+  fontconfigSupport ? true,
+  alsaSupport ? true,
   gtkSupport ? false,
-  openglSupport ? false,
-  tlsSupport ? false,
+  openglSupport ? true,
+  tlsSupport ? true,
   gstreamerSupport ? false,
-  cupsSupport ? false,
-  colorManagementSupport ? false,
-  dbusSupport ? false,
-  mpg123Support ? false,
-  openalSupport ? false,
+  cupsSupport ? true,
+  colorManagementSupport ? true,
+  dbusSupport ? true,
+  mpg123Support ? true,
+  openalSupport ? true,
   openclSupport ? false,
-  cairoSupport ? false,
+  cairoSupport ? true,
   odbcSupport ? false,
   netapiSupport ? false,
-  cursesSupport ? false,
+  cursesSupport ? true,
   vaSupport ? false,
   pcapSupport ? false,
   v4lSupport ? false,
@@ -37,9 +37,9 @@
   gsmSupport ? false,
   gphoto2Support ? false,
   ldapSupport ? false,
-  pulseaudioSupport ? false,
-  xineramaSupport ? false,
-  xmlSupport ? false }:
+  pulseaudioSupport ? true,
+  xineramaSupport ? true,
+  xmlSupport ? true }:
 
 let wine-build = build: release:
       lib.getAttr build (callPackage ./packages.nix {
-- 
cgit 1.4.1


From 9e8592d6b9531347845eff12f35666335646ce29 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 23 Jun 2016 13:55:27 +0300
Subject: wine: set default features in all-packages

I haven't noticed that we actually _do_ set some flags already
in all-packages, just not all the old ones. Use that way instead.
---
 pkgs/misc/emulators/wine/default.nix | 34 +++++++++++++++++-----------------
 pkgs/top-level/all-packages.nix      | 34 ++++++++++++----------------------
 2 files changed, 29 insertions(+), 39 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 260c02e4d1b6..deeff3c73437 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -10,26 +10,26 @@
   wineRelease ? "stable",
   wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"),
   libtxc_dxtn_Name ? "libtxc_dxtn_s2tc",
-  pngSupport ? true,
-  jpegSupport ? true,
+  pngSupport ? false,
+  jpegSupport ? false,
   tiffSupport ? false,
-  gettextSupport ? true,
-  fontconfigSupport ? true,
-  alsaSupport ? true,
+  gettextSupport ? false,
+  fontconfigSupport ? false,
+  alsaSupport ? false,
   gtkSupport ? false,
-  openglSupport ? true,
-  tlsSupport ? true,
+  openglSupport ? false,
+  tlsSupport ? false,
   gstreamerSupport ? false,
-  cupsSupport ? true,
-  colorManagementSupport ? true,
-  dbusSupport ? true,
-  mpg123Support ? true,
-  openalSupport ? true,
+  cupsSupport ? false,
+  colorManagementSupport ? false,
+  dbusSupport ? false,
+  mpg123Support ? false,
+  openalSupport ? false,
   openclSupport ? false,
-  cairoSupport ? true,
+  cairoSupport ? false,
   odbcSupport ? false,
   netapiSupport ? false,
-  cursesSupport ? true,
+  cursesSupport ? false,
   vaSupport ? false,
   pcapSupport ? false,
   v4lSupport ? false,
@@ -37,9 +37,9 @@
   gsmSupport ? false,
   gphoto2Support ? false,
   ldapSupport ? false,
-  pulseaudioSupport ? true,
-  xineramaSupport ? true,
-  xmlSupport ? true }:
+  pulseaudioSupport ? false,
+  xineramaSupport ? false,
+  xmlSupport ? false }:
 
 let wine-build = build: release:
       lib.getAttr build (callPackage ./packages.nix {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 066c9d2c39eb..c3d061b375ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16999,10 +16999,11 @@ in
 
   webfs = callPackage ../servers/http/webfs { };
 
-  wine = callPackage ../misc/emulators/wine {
+  wineMinimal = callPackage ../misc/emulators/wine {
     wineRelease = config.wine.release or "stable";
     wineBuild = config.wine.build or "wine32";
-    pulseaudioSupport = config.pulseaudio or stdenv.isLinux;
+  };
+  wine = lowPrio (self.wineMinimal.override {
     pngSupport = true;
     jpegSupport = true;
     tiffSupport = true;
@@ -17011,30 +17012,21 @@ in
     alsaSupport = true;
     openglSupport = true;
     tlsSupport = true;
-    cursesSupport = true;
-  };
-  wineMinimal = lowPrio (self.wine.override {
-    pulseaudioSupport = false;
-    pngSupport = false;
-    jpegSupport = false;
-    tiffSupport = false;
-    gettextSupport = false;
-    fontconfigSupport = false;
-    alsaSupport = false;
-    openglSupport = false;
-    tlsSupport = false;
-    cursesSupport = false;
-  });
-  wineFull = lowPrio (self.wine.override {
-    gtkSupport = true;
-    gstreamerSupport = true;
     cupsSupport = true;
     colorManagementSupport = true;
     dbusSupport = true;
     mpg123Support = true;
     openalSupport = true;
-    openclSupport = true;
     cairoSupport = true;
+    cursesSupport = true;
+    pulseaudioSupport = config.pulseaudio or stdenv.isLinux;
+    xineramaSupport = true;
+    xmlSupport = true;
+  });
+  wineFull = lowPrio (self.wine.override {
+    gtkSupport = true;
+    gstreamerSupport = true;
+    openclSupport = true;
     odbcSupport = true;
     netapiSupport = true;
     vaSupport = true;
@@ -17045,8 +17037,6 @@ in
     gphoto2Support = true;
     ldapSupport = true;
     pulseaudioSupport = true;
-    xineramaSupport = true;
-    xmlSupport = true;
   });
   wineStable = self.wine.override { wineRelease = "stable"; };
   wineUnstable = lowPrio (self.wine.override { wineRelease = "unstable"; });
-- 
cgit 1.4.1


From 5ee7f081e300a573b356848d3270dbf3aae2de89 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 24 Jun 2016 00:34:05 +0300
Subject: wine: fix gstreamer support

---
 pkgs/misc/emulators/wine/base.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index f5b64f1517f6..0d3fca6e1c88 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   ++ lib.optional alsaSupport            pkgs.alsaLib
   ++ lib.optional pulseaudioSupport      pkgs.libpulseaudio
   ++ lib.optional xineramaSupport        pkgs.xorg.libXinerama
-  ++ lib.optional gstreamerSupport       pkgs.gst_plugins_base
+  ++ lib.optionals gstreamerSupport      (with pkgs.gst_all; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ])
   ++ lib.optionals gtkSupport    [ pkgs.gtk3 pkgs.gnome.glib ]
   ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.opencl-icd ]
   ++ lib.optionals xmlSupport    [ pkgs.libxml2 pkgs.libxslt ]
@@ -88,6 +88,10 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
     ${lib.strings.concatStringsSep "\n"
           ((map (links "share/wine/gecko") geckos)
         ++ (map (links "share/wine/mono")  monos))}
+  '' + lib.optionalString supportFlags.gstreamerSupport ''
+    wrapProgram "$out/bin/wine" \
+      --argv0 "" \
+      --prefix GST_PLUGIN_SYSTEM_PATH ":" "$GST_PLUGIN_SYSTEM_PATH"
   '';
   
   enableParallelBuilding = true;
-- 
cgit 1.4.1


From 8399068b80de149b0e20c0eed489869bcbf2a341 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 24 Jun 2016 00:58:07 +0300
Subject: winetricks: 20160219 -> 20160622

---
 pkgs/misc/emulators/wine/sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 0c4690bffef8..c86928c586e8 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -55,8 +55,8 @@ in rec {
   };
 
   winetricks = fetchFromGitHub rec {
-    version = "20160219";
-    sha256 = "1wqsbdh2qa5xxswilniki9wzbhlmkl6jqmryjd9f5smirr7ryy2r";
+    version = "20160622";
+    sha256 = "0xh7mc5xby0zxx2g3q1ky18s20y6s7wp3vzvgxydwzhhwf32189q";
     owner = "Winetricks";
     repo = "winetricks";
     rev = version;
-- 
cgit 1.4.1


From 6c252964fccf68b0e00bbb7da92a939e30cf23b7 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sat, 25 Jun 2016 12:19:01 -0300
Subject: higan: v098 -> v099

---
 pkgs/misc/emulators/higan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix
index 1395e3ac3efe..b5707213530a 100644
--- a/pkgs/misc/emulators/higan/default.nix
+++ b/pkgs/misc/emulators/higan/default.nix
@@ -11,12 +11,12 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "higan-${version}";
-  version = "098";
+  version = "099";
   sourceName = "higan_v${version}-source";
 
   src = fetchurl {
     urls = [ "http://download.byuu.org/${sourceName}.7z" ];
-    sha256 = "0qphvjfv17dbmzgb4pny2q6ln0lsgzyhalq6qyqxc3qwm4fzdjv1";
+    sha256 = "11lfsas1ym3xwb1rc27z1skvb4m176swix9dih4rvnlqxkqz4qhw";
     curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick...
   };
 
-- 
cgit 1.4.1


From 8f53cfbd59a6da9c60b49890f80da8232c923253 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sun, 26 Jun 2016 09:55:29 +0300
Subject: wine: 1.9.11 -> 1.9.13

---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index c86928c586e8..e0df1cf63bed 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -30,9 +30,9 @@ in rec {
   };
 
   unstable = fetchurl rec {
-    version = "1.9.11";
+    version = "1.9.13";
     url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
-    sha256 = "15mbrnx4zqsdsxz7rwkb1pp58bcyfqnm8f2fh7cbbdgwh117k3vj";
+    sha256 = "1nf06xgnda7y5ngnf8v14zaa0lnxzi1hxx7pf3jz2a0zswcq0rwv";
     inherit (stable) mono;
     gecko32 = fetchurl rec {
       version = "2.44";
@@ -48,7 +48,7 @@ in rec {
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "0q990d26wsik16w1yya2z8nwxnhnaiiy85igdnan1ib2b00z861m";
+    sha256 = "0iw14dwl91i5nd6wfr5i2vvii2w6j0sh95syc46z6yjgvxd14waq";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";
-- 
cgit 1.4.1


From 17e8032adb9b6ad8558594a19f6d13461d275b45 Mon Sep 17 00:00:00 2001
From: pngwjpgh <pngwjpgh@users.noreply.github.com>
Date: Fri, 1 Jul 2016 00:29:56 +0200
Subject: samsung-UnifiedLinuxDriver: fix multi-output cups (#16421)

---
 pkgs/misc/cups/drivers/samsung/4.00.39/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
index 27d21f862852..0569eabe8f14 100644
--- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
@@ -15,7 +15,9 @@
 
 # Do not bump lightly! Visit <http://www.bchemnet.com/suldr/supported.html>
 # to see what will break when upgrading. Consider a new versioned attribute.
-stdenv.mkDerivation rec {
+let
+  cups' = cups.out;
+in stdenv.mkDerivation rec {
   name = "samsung-UnifiedLinuxDriver-${version}";
   version = "4.00.39";
 
@@ -24,9 +26,10 @@ stdenv.mkDerivation rec {
     sha256 = "144b4xggbzjfq7ga5nza7nra2cf6qn63z5ls7ba1jybkx1vm369k";
   };
 
-  buildInputs = [ cups gcc ghostscript glibc patchelf ];
+  buildInputs = [ cups' gcc ghostscript glibc patchelf ];
 
-  inherit cups gcc ghostscript glibc;
+  inherit gcc ghostscript glibc;
+  cups = cups';
 
   builder = ./builder.sh;
 
-- 
cgit 1.4.1


From 962e365444cfa545b8e0a991d777d4b03c9b6efe Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Fri, 1 Jul 2016 14:30:54 +0300
Subject: wineStable: 1.8.2 -> 1.8.3

---
 pkgs/misc/emulators/wine/sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index e0df1cf63bed..d124e296df90 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -6,9 +6,9 @@ let fetchurl = args@{url, sha256, ...}:
 in rec {
 
   stable = fetchurl rec {
-    version = "1.8.2";
+    version = "1.8.3";
     url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
-    sha256 = "0vsswlnaa9ndg1pais63c39xks519r9fhz0yq3q8fphly2nlyqji";
+    sha256 = "0v3sq5zzj3z5pw1aicn7i03pgf41cr9fr0vg1sazwfxrmbvwvknp";
 
     ## see http://wiki.winehq.org/Gecko
     gecko32 = fetchurl rec {
-- 
cgit 1.4.1


From c4ce1eece0bbed97fd4ad9e6c41c613f0469384e Mon Sep 17 00:00:00 2001
From: José Romildo Malaquias <malaquias@gmail.com>
Date: Sat, 2 Jul 2016 09:24:55 -0300
Subject: zuki-themes: init at 2016-07-01

---
 pkgs/misc/themes/zuki/default.nix | 40 +++++++++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/misc/themes/zuki/default.nix

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/themes/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix
new file mode 100644
index 000000000000..73bc677854a1
--- /dev/null
+++ b/pkgs/misc/themes/zuki/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, gnome3, gdk_pixbuf, gtk_engines, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  name = "zuki-themes-${version}";
+  version = "${gnome3.version}.${date}";
+  date = {
+    "3.18" = "2016-06-21";
+    "3.20" = "2016-07-01";
+  }."${gnome3.version}";
+
+  src = fetchFromGitHub {
+    owner = "lassekongo83";
+    repo = "zuki-themes";
+    rev = {
+      "3.18" = "5c83a847ad8fab0fe0b82ed2a7db429655ac9c10";
+      "3.20" = "dda1726ac7b556df2ef9696e530f8c2eaa0aed37";
+    }."${gnome3.version}";
+    sha256 = {
+      "3.18" = "1x9zrx5dqq8kivhqj5kjwhy4vwr899pri6jvwxbff5hibvyc7ipy";
+      "3.20" = "0p7db8a2ni494vwp3b7av7d214fnynf6gr976qma6h9x4ck3phiz";
+    }."${gnome3.version}";
+  };
+
+  buildInputs = [ gdk_pixbuf gtk_engines gtk-engine-murrine ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    install -dm 755 $out/share/themes
+    cp -va Zuki* $out/share/themes/
+  '';
+
+  meta = {
+    description = "A selection of themes for GTK3, gnome-shell and more";
+    homepage = "https://github.com/lassekongo83/zuki-themes";
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e92927e9efee..d83c0a3cd238 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17241,4 +17241,6 @@ in
   sequelpro = callPackage ../applications/misc/sequelpro {};
 
   maphosts = callPackage ../tools/networking/maphosts {};
+
+  zuki-themes = callPackage ../misc/themes/zuki { };
 }
-- 
cgit 1.4.1


From 1268f0753f32256250aa65133c3a19b49cf508da Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 18 Apr 2016 19:57:08 +0300
Subject: U-Boot: Build for the Beaglebone Black

---
 pkgs/misc/uboot/default.nix     | 6 ++++++
 pkgs/top-level/all-packages.nix | 1 +
 2 files changed, 7 insertions(+)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 605208a757b4..9a30fedfd541 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -68,6 +68,12 @@ in rec {
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
+  ubootBeagleboneBlack = buildUBoot rec {
+    defconfig = "am335x_boneblack_defconfig";
+    targetPlatforms = ["armv7l-linux"];
+    filesToInstall = ["MLO" "u-boot.img"];
+  };
+
   ubootJetsonTK1 = buildUBoot rec {
     defconfig = "jetson-tk1_defconfig";
     targetPlatforms = ["armv7l-linux"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1aa34d165a2..fd12c6409266 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11401,6 +11401,7 @@ in
     buildUBoot
     ubootTools
     ubootBananaPi
+    ubootBeagleboneBlack
     ubootJetsonTK1
     ubootPcduino3Nano
     ubootRaspberryPi
-- 
cgit 1.4.1


From 428b51dd2ff7042099125fd6cd3060e8b090dbaa Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 23 Apr 2016 14:43:59 +0300
Subject: U-Boot: 2016.01 -> 2016.05

Amongst many minor things, the USB keyboard becomes operative on the
Raspberry Pi. Yay!
---
 pkgs/misc/uboot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 9a30fedfd541..a2b27c67dce0 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -10,13 +10,13 @@ let
            stdenv.mkDerivation (rec {
 
     name = "uboot-${defconfig}-${version}";
-    version = "2016.01";
+    version = "2016.05";
 
     nativeBuildInputs = [ bc dtc ];
 
     src = fetchurl {
       url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
-      sha256 = "1md5jpq5n9jh08s7sdkjrvg2q7kpzwa7yrpgl9581ncrjfx2yyg5";
+      sha256 = "0wdivib8kbm17qr6r7n7wyzg5vnwpagvwk5m0z80rbssc5sj5l47";
     };
 
     configurePhase = ''
-- 
cgit 1.4.1


From 4108e0324e498395e9baa1af27985e9e986116ce Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 23 Apr 2016 14:44:19 +0300
Subject: U-Boot: Build for the Raspberry Pi 2 & 3

---
 pkgs/misc/uboot/default.nix     | 12 ++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 14 insertions(+)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index a2b27c67dce0..1deb90e2f842 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -92,6 +92,18 @@ in rec {
     filesToInstall = ["u-boot.bin"];
   };
 
+  ubootRaspberryPi2 = buildUBoot rec {
+    defconfig = "rpi_2_defconfig";
+    targetPlatforms = ["armv7l-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
+  ubootRaspberryPi3 = buildUBoot rec {
+    defconfig = "rpi_3_32b_defconfig";
+    targetPlatforms = ["armv7l-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
   # Intended only for QEMU's vexpress-a9 emulation target!
   ubootVersatileExpressCA9 = buildUBoot rec {
     defconfig = "vexpress_ca9x4_defconfig";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd12c6409266..1630f37a5c18 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11405,6 +11405,8 @@ in
     ubootJetsonTK1
     ubootPcduino3Nano
     ubootRaspberryPi
+    ubootRaspberryPi2
+    ubootRaspberryPi3
     ubootVersatileExpressCA9
     ubootWandboard
     ;
-- 
cgit 1.4.1


From 18572e23590f7407be60926e6d98d1a3580571c1 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 2 Jun 2016 19:51:38 +0300
Subject: U-Boot: Drop Versatile build

I had broken this at some point and the patch conflicts quite often.
Hopefully soon the Raspberry Pi 2 emulation in QEMU can be used instead.
---
 pkgs/misc/uboot/default.nix                        |  8 ---
 .../uboot/vexpress-Use-config_distro_bootcmd.patch | 82 ----------------------
 pkgs/top-level/all-packages.nix                    |  1 -
 3 files changed, 91 deletions(-)
 delete mode 100644 pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 1deb90e2f842..2cf9cbb1ab80 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -104,14 +104,6 @@ in rec {
     filesToInstall = ["u-boot.bin"];
   };
 
-  # Intended only for QEMU's vexpress-a9 emulation target!
-  ubootVersatileExpressCA9 = buildUBoot rec {
-    defconfig = "vexpress_ca9x4_defconfig";
-    targetPlatforms = ["armv7l-linux"];
-    filesToInstall = ["u-boot"];
-    patches = [ ./vexpress-Use-config_distro_bootcmd.patch ];
-  };
-
   ubootWandboard = buildUBoot rec {
     defconfig = "wandboard_defconfig";
     targetPlatforms = ["armv7l-linux"];
diff --git a/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch b/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch
deleted file mode 100644
index 218132c7758e..000000000000
--- a/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 98f62c27fe481dc2d444d70265268d2369d8a998 Mon Sep 17 00:00:00 2001
-From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
-Date: Mon, 8 Jun 2015 22:29:23 +0300
-Subject: [PATCH] vexpress: Use config_distro_bootcmd
-
-Also had to hack cli_readline.c, as one codepath in
-cli_readline_into_buffer doesn't respect the timeout.
----
- common/cli_readline.c             | 12 +++++++++++-
- configs/vexpress_ca9x4_defconfig  |  2 --
- include/configs/vexpress_common.h |  2 +-
- 3 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/common/cli_readline.c b/common/cli_readline.c
-index c1476e4..5063a0a 100644
---- a/common/cli_readline.c
-+++ b/common/cli_readline.c
-@@ -517,6 +517,7 @@ int cli_readline_into_buffer(const char *const prompt, char *buffer,
- 	int	plen = 0;			/* prompt length	*/
- 	int	col;				/* output column cnt	*/
- 	char	c;
-+	int first = 1;
- 
- 	/* print prompt */
- 	if (prompt) {
-@@ -528,7 +529,16 @@ int cli_readline_into_buffer(const char *const prompt, char *buffer,
- 	for (;;) {
- 		if (bootretry_tstc_timeout())
- 			return -2;	/* timed out */
--		WATCHDOG_RESET();	/* Trigger watchdog, if needed */
-+		if (first && timeout) {
-+			uint64_t etime = endtick(timeout);
-+
-+			while (!tstc()) {	/* while no incoming data */
-+				if (get_ticks() >= etime)
-+					return -2;	/* timed out */
-+				WATCHDOG_RESET();
-+			}
-+			first = 0;
-+		}
- 
- #ifdef CONFIG_SHOW_ACTIVITY
- 		while (!tstc()) {
-diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig
-index 2947fc1..9a5123d 100644
---- a/configs/vexpress_ca9x4_defconfig
-+++ b/configs/vexpress_ca9x4_defconfig
-@@ -5,11 +5,9 @@ CONFIG_TARGET_VEXPRESS_CA9X4=y
- # CONFIG_CMD_IMLS is not set
- # CONFIG_CMD_XIMG is not set
- # CONFIG_CMD_EDITENV is not set
--# CONFIG_CMD_ENV_EXISTS is not set
- # CONFIG_CMD_LOADB is not set
- # CONFIG_CMD_LOADS is not set
- # CONFIG_CMD_FPGA is not set
--# CONFIG_CMD_ECHO is not set
- # CONFIG_CMD_ITEST is not set
- # CONFIG_CMD_SETEXPR is not set
- # CONFIG_CMD_NFS is not set
-diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
-index 98f6ae9..062532a 100644
---- a/include/configs/vexpress_common.h
-+++ b/include/configs/vexpress_common.h
-@@ -185,7 +185,6 @@
- 					 CONFIG_SYS_INIT_RAM_SIZE - \
- 					 GENERATED_GBL_DATA_SIZE)
- #define CONFIG_SYS_INIT_SP_ADDR		CONFIG_SYS_GBL_DATA_OFFSET
--#define CONFIG_CMD_ECHO
- 
- #include <config_distro_defaults.h>
- 
-@@ -225,6 +224,7 @@
- #define CONFIG_EXTRA_ENV_SETTINGS \
- 		CONFIG_PLATFORM_ENV_SETTINGS \
-                 BOOTENV \
-+		"fdtfile=vexpress-v2p-ca9.dtb\0" \
- 		"console=ttyAMA0,38400n8\0" \
- 		"dram=1024M\0" \
- 		"root=/dev/sda1 rw\0" \
--- 
-2.6.0
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1630f37a5c18..e809b5a2b215 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11407,7 +11407,6 @@ in
     ubootRaspberryPi
     ubootRaspberryPi2
     ubootRaspberryPi3
-    ubootVersatileExpressCA9
     ubootWandboard
     ;
 
-- 
cgit 1.4.1


From 7129ebbd5e107be149d4af09f3da90094ec50b14 Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Sun, 26 Jun 2016 20:05:54 -0700
Subject: dolphin-emu: 4.0.2 -> 5.0

---
 pkgs/misc/emulators/dolphin-emu/default.nix | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix
index 749573f474a2..bbd25f2b3ded 100644
--- a/pkgs/misc/emulators/dolphin-emu/default.nix
+++ b/pkgs/misc/emulators/dolphin-emu/default.nix
@@ -1,13 +1,17 @@
 { stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
-, gettext, libpthreadstubs, libXrandr, libXext, readline
-, openal, libXdmcp, portaudio, SDL, wxGTK30, fetchurl
+, gettext, libpthreadstubs, libXrandr, libXext, readline, openal
+, libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev
 , libpulseaudio ? null }:
 
 stdenv.mkDerivation rec {
-  name = "dolphin-emu-4.0.2";
-  src = fetchurl {
-    url = https://github.com/dolphin-emu/dolphin/archive/4.0.2.tar.gz;
-    sha256 = "0a8ikcxdify9d7lqz8fn2axk2hq4q1nvbcsi1b8vb9z0mdrhzw89";
+  name = "dolphin-emu-${version}";
+  version = "5.0";
+
+  src = fetchFromGitHub {
+    owner  = "dolphin-emu";
+    repo   = "dolphin";
+    rev    = version;
+    sha256 = "07mlfnh0hwvk6xarcg315x7z2j0qbg9g7cm040df9c8psiahc3g6";
   };
 
   cmakeFlags = ''
@@ -22,14 +26,15 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
                   gettext libpthreadstubs libXrandr libXext readline openal
-                  libXdmcp portaudio SDL wxGTK30 libpulseaudio ];
+                  libevdev libXdmcp portaudio libusb libpulseaudio ];
 
   meta = {
     homepage = http://dolphin-emu.org/;
     description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM";
     license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ MP2E ];
-    broken = true;
+    # x86_32 is an unsupported platform.
+    # Enable generic build if you really want a JIT-less binary.
+    platforms = [ "x86_64-linux" ];
   };
 }
-- 
cgit 1.4.1


From 7f4d52e27ec9ea9d06c3f992bfee96a9d7ae58d5 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 19 Jun 2016 20:27:36 +0200
Subject: Build libjack2 for supercollider with same GCC

Also remove trailing whitespace
---
 pkgs/development/interpreters/supercollider/default.nix | 14 ++++++++------
 pkgs/misc/jackaudio/default.nix                         |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index f44347c61b74..be85cd248154 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -3,10 +3,12 @@
 , libXt, qt, readline
 , useSCEL ? false, emacs
 }:
-  
-let optional = stdenv.lib.optional; in
 
-stdenv.mkDerivation rec {  
+let optional = stdenv.lib.optional;
+ljack2 = libjack2.override { gcc = gcc; };
+in
+
+stdenv.mkDerivation rec {
   name = "supercollider-3.6.6";
 
   meta = {
@@ -29,12 +31,12 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = ''
     -DSC_WII=OFF
-    -DSC_EL=${if useSCEL then "ON" else "OFF"} 
+    -DSC_EL=${if useSCEL then "ON" else "OFF"}
   '';
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  buildInputs = [ 
-    gcc libjack2 libsndfile fftw curl libXt qt readline ]
+  buildInputs = [
+    gcc ljack2 libsndfile fftw curl libXt qt readline ]
     ++ optional useSCEL emacs;
 }
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index b5748c0f8328..66be12fbc43f 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, python, makeWrapper
-, bash, libsamplerate, libsndfile, readline
+, bash, libsamplerate, libsndfile, readline, gcc
 
 # Optional Dependencies
 , dbus ? null, pythonDBus ? null, libffado ? null, alsaLib ? null
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig python makeWrapper ];
-  buildInputs = [
+  buildInputs = [ gcc
     python
 
     libsamplerate libsndfile readline
-- 
cgit 1.4.1


From 05bdc0c89f861aae1a7df5aaeb5de358daf79ec6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2016 11:30:36 +0200
Subject: Remove unnecessary references to gcc5

These cause an unnecessary rebuild of gcc.
---
 pkgs/applications/audio/i-score/default.nix              | 4 ++--
 pkgs/development/tools/build-managers/icmake/default.nix | 4 ++--
 pkgs/misc/emulators/dolphin-emu/master.nix               | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix
index 17fadfe8b1f0..97e8f5f1429b 100644
--- a/pkgs/applications/audio/i-score/default.nix
+++ b/pkgs/applications/audio/i-score/default.nix
@@ -3,7 +3,7 @@
   cln,
   cmake,
   fetchgit,
-  gcc5,
+  gcc,
   ginac,
   jamomacore,
   kde5,
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     cln
     cmake
     ginac
-    gcc5
+    gcc
     jamomacore
     kde5.kdnssd
     libsndfile
diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix
index e4bad4f500c8..8fd519073ccb 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gcc5 }:
+{ stdenv, fetchFromGitHub, gcc }:
 
 stdenv.mkDerivation rec {
   name = "icmake-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "icmake-${version}-src/icmake";
 
-  buildInputs = [ gcc5 ];
+  buildInputs = [ gcc ];
 
   preConfigure = ''
     patchShebangs ./
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 9743261c6b2b..4d8b8ac0eb60 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -1,4 +1,4 @@
-{ stdenv, gcc5, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
+{ stdenv, gcc, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
 , gettext, git, libpthreadstubs, libXrandr, libXext, readline
 , openal, libXdmcp, portaudio, fetchgit, libusb, libevdev
 , libpulseaudio ? null }:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ gcc5 pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
+  buildInputs = [ gcc pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
                   gettext libpthreadstubs libXrandr libXext readline openal
                   libevdev git libXdmcp portaudio libusb libpulseaudio ];
 
-- 
cgit 1.4.1


From dc5293d80b9c690dcb0c95d7174c16140f0fd089 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@daemon.hole.ru>
Date: Mon, 11 Jul 2016 18:57:16 +0300
Subject: wine: 1.9.13 -> 1.9.14 (#16862)

* Update wineUnstable: 1.9.13 -> 1.9.14
* Update staging: 1.9.13 -> 1.9.14
* Add myself as co-maintainer, because I am do regular updates.
---
 pkgs/misc/emulators/wine/base.nix    | 2 +-
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 0d3fca6e1c88..e35e319a57f0 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -102,6 +102,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
     homepage = "http://www.winehq.org/";
     license = "LGPL";
     description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
-    maintainers = [stdenv.lib.maintainers.raskin];
+    maintainers = with stdenv.lib.maintainers; [ avnik raskin ];
   };
 })
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index d124e296df90..9a437971e426 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -30,9 +30,9 @@ in rec {
   };
 
   unstable = fetchurl rec {
-    version = "1.9.13";
+    version = "1.9.14";
     url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
-    sha256 = "1nf06xgnda7y5ngnf8v14zaa0lnxzi1hxx7pf3jz2a0zswcq0rwv";
+    sha256 = "0b65j8lc2axyc7lpa5rjr7vbjz4y78gkd7hhmvhra78pmwf9dgkz";
     inherit (stable) mono;
     gecko32 = fetchurl rec {
       version = "2.44";
@@ -48,7 +48,7 @@ in rec {
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "0iw14dwl91i5nd6wfr5i2vvii2w6j0sh95syc46z6yjgvxd14waq";
+    sha256 = "0582ylrvl7racpb0il3wmbivb2d7lh6n3mymh19yw94qzgifwqrw";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";
-- 
cgit 1.4.1


From 963327aacb67322c8cc1ace863e7747823aa89e0 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Mon, 11 Jul 2016 22:49:16 +0200
Subject: vimPlugins: updating plugin and adding floobits plugin

---
 pkgs/misc/vim-plugins/default.nix      | 333 +++++++++++++++++----------------
 pkgs/misc/vim-plugins/vim-plugin-names |   3 +-
 pkgs/misc/vim-plugins/vim-utils.nix    |   2 +-
 3 files changed, 175 insertions(+), 163 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 8ded4ca98cbd..a34690853fcd 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -173,11 +173,11 @@ rec {
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2016-06-12";
+    name = "Syntastic-2016-07-08";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "d6b96c079be137c83009827b543a83aa113cc011";
-      sha256 = "1hb1vs0sqzpjbh4l2q1rfhh4mxvhn08pin3glba26p37639w9qqc";
+      rev = "87f3e80b443870ce821f82dd1b3dba5bd66b51b2";
+      sha256 = "09prhzp58470naj8ws2m1pjgj1h675jsiyc6vmfdjsqk6ly2ypg0";
     };
     dependencies = [];
 
@@ -217,22 +217,22 @@ rec {
   };
 
   The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2016-06-10";
+    name = "The_NERD_tree-2016-06-23";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
-      rev = "d280b15ba9388ab93f3401b26877a13fdb8ed816";
-      sha256 = "19mlvmlg1lccr2kkigbggv3jfl0bdc5r6lpa2jds1j20gxp9zhwi";
+      rev = "2e2b649232d6ae4d02d74793e5da0ee08480ad8d";
+      sha256 = "1rfm6w60bk168y1l9hjjxd4840j1jr1h0s77lsdjr9wxpxbw59ml";
     };
     dependencies = [];
 
   };
 
   UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "UltiSnips-2016-05-16";
+    name = "UltiSnips-2016-07-07";
     src = fetchgit {
       url = "git://github.com/SirVer/ultisnips";
-      rev = "1c6b4f75a006c4411d01a1234cabda3eb4aded1a";
-      sha256 = "0m9sfq9d9qvrx5valg0xz9bi0y2zi3790rg1qlnin4h1gbj5axjb";
+      rev = "e8c485eb3c7e2c4c3ddc62beb79011f026a3ca04";
+      sha256 = "03cdpz136ry6v7h0sddlyvgxwvp3bl1ir7451v3sd6q867ywvbs7";
     };
     dependencies = [];
 
@@ -250,11 +250,11 @@ rec {
   };
 
   WebAPI = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "WebAPI-2016-05-12";
+    name = "WebAPI-2016-07-06";
     src = fetchgit {
       url = "git://github.com/mattn/webapi-vim";
-      rev = "ca89bd5867e76b154d4eca325b5a9ad6509fccc5";
-      sha256 = "138rplbmvxicxjkkbvskck3b91rill53y22yrnnd9rj7zh9hj0zm";
+      rev = "e3fa93f29a3a0754204002775e140d8a9acfd7fd";
+      sha256 = "0z6s3cnipcww4q33d4dcp0p8jw29izghcrj75fxy6dmy1yw2fbcr";
     };
     dependencies = [];
 
@@ -288,11 +288,11 @@ rec {
   };
 
   ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-py-matcher-2016-01-13";
+    name = "ctrlp-py-matcher-2016-06-22";
     src = fetchgit {
       url = "git://github.com/FelikZ/ctrlp-py-matcher";
-      rev = "8a803267a741cff3d6147650745f83c8f2125578";
-      sha256 = "0d5a7cqjh58l8qgj92s06f2ia83w51g4cic61qxd6sykv9xqiz17";
+      rev = "fb831ff903d5622b39f400fc8ba80f9bbd225307";
+      sha256 = "0zamyhxn910q6yyja6ypc92pxr47n28yzb6h90x20z0q2wka5842";
     };
     dependencies = [];
 
@@ -321,33 +321,33 @@ rec {
   };
 
   fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2016-05-11";
+    name = "fugitive-2016-07-06";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "3439f999b138254e4bb56187fc91f91f545b4b12";
-      sha256 = "0b617wljhcbz6w789j72lp4riplcb6m3b2h8x84awp2rls6k130b";
+      rev = "c00ebd75ac23f4080c0d0bf9453b16304a3fb316";
+      sha256 = "0j8vy6n70m02k2iq4y4nbpc0jnzk1ag51qnnbxj7aad4hkn8hban";
     };
     dependencies = [];
 
   };
 
   ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ghcmod-2016-01-25";
+    name = "ghcmod-2016-06-19";
     src = fetchgit {
       url = "git://github.com/eagletmt/ghcmod-vim";
-      rev = "815616e8b7d64677d6092e95bc6a3e83d2e035d4";
-      sha256 = "00pl4zimbhcfpjg326qkjxr4s4d21kzl4j617382rvqbingrm8is";
+      rev = "1d192d13d68ab59f9f46497a0909bf24a7b7dfff";
+      sha256 = "0bzahgzagnf0a9zv86jhdf8nc3p0yfz9izv5n3lc8gc12cp47d0a";
     };
     dependencies = [];
 
   };
 
   vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-autoformat-2016-06-10";
+    name = "vim-autoformat-2016-07-08";
     src = fetchgit {
       url = "git://github.com/Chiel92/vim-autoformat";
-      rev = "9742ae2dfb46b26b9aed39491afe3d3ecb5eafd0";
-      sha256 = "0lagj6977vbjvzk01sf43hhmj1jh7d2sa478igjmkw8j3gwvxcmq";
+      rev = "06251ab31789b6c478358306ab0e476c7d03b0d5";
+      sha256 = "0q749lbz1zzajdwyyznyg7h4mf2sdd0sq77dr24szs4f937zy007";
     };
     dependencies = [];
 
@@ -365,22 +365,11 @@ rec {
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2016-06-11";
+    name = "deoplete-nvim-2016-07-10";
     src = fetchgit {
       url = "git://github.com/Shougo/deoplete.nvim";
-      rev = "eac8020ef6f740df9109fa557b46a488f98103f1";
-      sha256 = "0fsg9mr23qsqhvzjmj626nd873zqwyxzvr5b1i97l0g6zwq3q8i8";
-    };
-    dependencies = [];
-
-  };
-
-  deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-jedi-2016-06-5";
-    src = fetchgit {
-      url = "git://github.com/zchee/deoplete-jedi";
-      rev = "36aec0d7166f9e18e05b45468e161f01909d77ec";
-      sha256 = "0h8vn7r5fkwvbxhqx6xh95iq1klz9ppbax9l3rxlfkp3w67kkj2k";
+      rev = "8102bbb73f942b232b6bcc00b8699fbe3b3f370c";
+      sha256 = "083056maiscxyyln09659qv3c7kayps2vm697p459yyhfyir742f";
     };
     dependencies = [];
 
@@ -420,11 +409,11 @@ rec {
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2016-06-08";
+    name = "neomake-2016-07-11";
     src = fetchgit {
       url = "git://github.com/benekastah/neomake";
-      rev = "0de96a8a906d254ee3b5e6cd1e9838f1c1cc59c5";
-      sha256 = "1adq47ra0vf5kak7m65gyaxi1jkbdi7647bb73785j3sx5q41v0f";
+      rev = "14e894edc35d17b927e5540ceb6d101bbda9f51c";
+      sha256 = "1ccgfvvxsl213zlgf801yxwg51kpi5z37z175w4gh9cj8953mgxh";
     };
     dependencies = [];
 
@@ -442,55 +431,55 @@ rec {
   };
 
   vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-tmux-navigator-2016-06-03";
+    name = "vim-tmux-navigator-2016-07-07";
     src = fetchgit {
       url = "git://github.com/christoomey/vim-tmux-navigator";
-      rev = "57701ac650990010ea97b1b4d64779d0b60c769b";
-      sha256 = "0kl9as63h8bfkmqhq9myma6z7xvp30hiqcnxham4cvd6vhph3b7j";
+      rev = "d0123a8679cebec89ddd385756b25e4c812556b6";
+      sha256 = "1bk3saff0lxzl1zrv97klx8f4kqvr01ypv13vg5andc1ylk2nqqf";
     };
     dependencies = [];
 
   };
 
   spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "spacevim-2016-06-08";
+    name = "spacevim-2016-07-07";
     src = fetchgit {
       url = "git://github.com/ctjhoa/spacevim";
-      rev = "c8811a397249508432199786abbbd41429b6c90b";
-      sha256 = "0a41pjc6qd378y8sg2sp65k0s32ssn9pkk6yyss92k97rlx2bsjp";
+      rev = "714cc22f8c4544676a9cc2a4ac075b630ffa5b34";
+      sha256 = "0l66h05hridjihjp4g94zq3mrfjs4pywzlb5wh95yvcdix8kyzzm";
     };
     dependencies = [];
 
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-vim-2016-06-08";
+    name = "ctrlp-vim-2016-07-08";
     src = fetchgit {
       url = "git://github.com/ctrlpvim/ctrlp.vim";
-      rev = "cd99e43613202d56b2adfc8f9bd216734a9601fd";
-      sha256 = "0inlwdl27rsjq9jaa37w21kgbvf6v8351xzqz6y2f6s5ciwbhfm3";
+      rev = "b9fa920b4abbb54799927a3bc57869fdd556321a";
+      sha256 = "1h8cm9mihd3jngmb6x60hxyr0g3swg6xhq8jw36xskb1ygdvbxzp";
     };
     dependencies = [];
 
   };
 
   vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jade-2016-02-11";
+    name = "vim-jade-2016-06-28";
     src = fetchgit {
       url = "git://github.com/digitaltoad/vim-jade";
-      rev = "0a7ec2edaa3f7fbe353f8fd5bf06d3c043d70c81";
-      sha256 = "0qlwbywnx6sl2xacdialpmg1d2wmjkdsdklz97k8086glkairs10";
+      rev = "f3950a72ea92f2c372846e763dad1f1151a38fb1";
+      sha256 = "1wa7zf24szmwchk608s5ikv14jzch9nl8isrn9ji9sz2511w50wp";
     };
     dependencies = [];
 
   };
 
   neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-ghc-2016-05-07";
+    name = "neco-ghc-2016-07-01";
     src = fetchgit {
       url = "git://github.com/eagletmt/neco-ghc";
-      rev = "b91b30f145d4daaf7e50d083e377bd9fbfdc670b";
-      sha256 = "1fnxqqp4p7kxzs7svia33wikrzyav41qlncjpmbz6ss8jb9bk18b";
+      rev = "7f02a9c25fb272a87d2be092826e2cd3094c620d";
+      sha256 = "1fcfk45qb96h6y4zb3p0104iyqc85q1synn9ah56zp6hnkkyffbw";
     };
     dependencies = [];
 
@@ -530,11 +519,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2016-06-11";
+    name = "vim-go-2016-07-07";
     src = fetchgit {
       url = "git://github.com/fatih/vim-go";
-      rev = "6efcfb275c8f7779bfc0738da730dfab19f157fe";
-      sha256 = "14n7phv3b4s7fhz94ziafakd0wl6n4z3a12i5qq2hdavi98kd640";
+      rev = "ab01e7e5a6bf858c1f519a831a4db1d978b92298";
+      sha256 = "1g76hasdyncjds6yl38dkb5nwp6sb8aqzp9d7xxhwarlnnihj1la";
     };
     dependencies = [];
 
@@ -551,12 +540,23 @@ rec {
 
   };
 
+  floobits-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "floobits-neovim-2016-06-20";
+    src = fetchgit {
+      url = "git://github.com/floobits/floobits-neovim";
+      rev = "cd9247f2ddeab1f9da247d495127b1a836415783";
+      sha256 = "12r0xmb5fl6gj47dr8xwiw0pan4xdwjxjjnyi5smfy4sg29lzwl7";
+    };
+    dependencies = [];
+
+  };
+
   psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "psc-ide-vim-2016-04-26";
+    name = "psc-ide-vim-2016-07-06";
     src = fetchgit {
       url = "git://github.com/frigoeu/psc-ide-vim";
-      rev = "27c000f0f27c7a4d05f001320ddcf1ae15b22eb7";
-      sha256 = "1vgxf5kziv00mi346zw3b2dnxygxk0jyxg41y6w1j22yrp9id1k2";
+      rev = "8704b993fe7dced73aa871244fbf7cd2fbafb759";
+      sha256 = "1wvs5v59aai3q2lgavaav073gz609944j8xbck34xyyq2naqmhaq";
     };
     dependencies = [];
 
@@ -596,11 +596,11 @@ rec {
   };
 
   calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "calendar-vim-2016-05-19";
+    name = "calendar-vim-2016-07-06";
     src = fetchgit {
       url = "git://github.com/itchyny/calendar.vim";
-      rev = "f49bd337a4643bb58df0fa4df230d60bdfeef022";
-      sha256 = "06hzvcpkgz51jl6zj67ycga5p9n1y6kk335d3cha24divp4ll1jb";
+      rev = "e5ecd6c6635b0b8c3bc11d3a28f48e0b224e1391";
+      sha256 = "0v611z5a24201194j592bpyid27cyfir66xr0pss71yk35wk9agy";
     };
     dependencies = [];
 
@@ -651,11 +651,11 @@ rec {
   };
 
   vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-orgmode-2016-05-15";
+    name = "vim-orgmode-2016-07-08";
     src = fetchgit {
       url = "git://github.com/jceb/vim-orgmode";
-      rev = "e0d56a6e93798b7a503bb4ab86fec016cd74d466";
-      sha256 = "0704wli8n1x4v40mdfj0icjarr52iqvw2byzsvyzb420wpf1nqpb";
+      rev = "54057d58888ad29672cd0cd782be5fc8b1a3a709";
+      sha256 = "134dsnfpkzq9gd3d8b9pvy7c5yvy9yxjyvidg927ha1lpilf4kp9";
     };
     dependencies = [];
 
@@ -728,33 +728,33 @@ rec {
   };
 
   fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fzf-vim-2016-06-14";
+    name = "fzf-vim-2016-07-02";
     src = fetchgit {
       url = "git://github.com/junegunn/fzf.vim";
-      rev = "0867178d9963e9f971c7799b0820aab985676c3c";
-      sha256 = "09d9v4anraxp6bk54mkx4w7j256b21m7ik77l647j3bnyn0z3wf8";
+      rev = "e0182d33716068ffb1b53f7a8931fe1b5594f382";
+      sha256 = "0hg6yzm11qwgq6cbf1ldb9i3p4r8h6f5ykvlrqh5znyzlxxf27vz";
     };
     dependencies = [];
 
   };
 
   limelight-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "limelight-vim-2016-05-17";
+    name = "limelight-vim-2016-06-24";
     src = fetchgit {
       url = "git://github.com/junegunn/limelight.vim";
-      rev = "e93c8013bb66d4b6622e24e0e3a97e71a032d9ec";
-      sha256 = "1xq3fa44fz3dfl52y0ygm21pa8b121b5lsdflcvn0igvisdkzl6g";
+      rev = "106fb5749d227a0de72e36068ed72798c6fd48e6";
+      sha256 = "0fp4yp50n5v5zx3a7afh9wip4nwcfhmdgdzwpnl79jvild1z9fgh";
     };
     dependencies = [];
 
   };
 
   vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-peekaboo-2016-05-31";
+    name = "vim-peekaboo-2016-07-08";
     src = fetchgit {
       url = "git://github.com/junegunn/vim-peekaboo";
-      rev = "35ee385d451d06c93177d6bb268dcefd19b091da";
-      sha256 = "1ix03w0rcn5l8ljszhsn53gsqmpsk12qv1s6imd5nhdf66njhlks";
+      rev = "13e44380895b4a0e52a710a7056ad40514ff5927";
+      sha256 = "12pa03dj4plc6za93skcrn3zhz2faw578a78038dwh3fd608rwyd";
     };
     dependencies = [];
 
@@ -794,11 +794,11 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2016-06-14";
+    name = "vimtex-2016-07-10";
     src = fetchgit {
       url = "git://github.com/lervag/vimtex";
-      rev = "1211d5725331a221329f8cd98756c8ef68556fd9";
-      sha256 = "0hjajg8ls2gl0jjrcb7m5qrvvzlm86jac8786fi56iql3r1yvlil";
+      rev = "c16bd147092bfe7ac63f39cd449f36e14e42e948";
+      sha256 = "18p7vmas0754r9n227v68wry285vr4y90v3kxcnn9hl60xxb3ba9";
     };
     dependencies = [];
 
@@ -831,11 +831,11 @@ rec {
   };
 
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2016-06-08";
+    name = "vim-startify-2016-07-01";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-startify";
-      rev = "dbaa0254249a5d9685ffc9513557bb811fad65b4";
-      sha256 = "1l65ah2k437rhp3rr81fgrwwr7vvipfrj5vlixx49zxgzy489wr4";
+      rev = "84a296eb5c36dc263ab67db3202e57fa783473b0";
+      sha256 = "0pv15n8mpzgkp7b0fqpjbv24yn8fswwryxi6lzavjhrbqzmv7mxw";
     };
     dependencies = [];
 
@@ -875,11 +875,11 @@ rec {
   };
 
   haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "haskell-vim-2016-05-17";
+    name = "haskell-vim-2016-07-06";
     src = fetchgit {
       url = "git://github.com/neovimhaskell/haskell-vim";
-      rev = "f73cdcdf72e9200420fc74491b6cd215512c3330";
-      sha256 = "1fgcfcslb6p84xcv1ighd8i4p4960vac7f7zpvl0d7bpp75ci07b";
+      rev = "a9ceb3d812488c1cee8a2b763cca0e4a48bfd14c";
+      sha256 = "022ckyc85i8f6r32z2grn41s9g4fg1a7fqprzbgs2kbi9k2igqni";
     };
     dependencies = [];
 
@@ -897,22 +897,22 @@ rec {
   };
 
   vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-watchdogs-2016-05-29";
+    name = "vim-watchdogs-2016-06-26";
     src = fetchgit {
       url = "git://github.com/osyo-manga/vim-watchdogs";
-      rev = "a1136db1d8806a03fc8ea81aa60e82d4cba57fb5";
-      sha256 = "1qk0wg11x6xwakqqbnx47ma5arsam55jqag0hxsf6is2yjqxb825";
+      rev = "7c89466b2b7fd9b87e0189e4ac66b84f2cfbc842";
+      sha256 = "09swjrfrqvciw7blqd1ssklxs09x0sd7ixphy07az7cxfmpdpi4r";
     };
     dependencies = [];
 
   };
 
   vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-racer-2016-05-31";
+    name = "vim-racer-2016-06-27";
     src = fetchgit {
       url = "git://github.com/racer-rust/vim-racer";
-      rev = "392e5818039a13f0cc3f819afcbb31291b1635a4";
-      sha256 = "0fs3zlsc1h4a58m0xlv11g5vzfvhjrinnmxh7xmgjnnd4njx8iax";
+      rev = "a72b26bb25cb65be29fd1912e9344eaa860fce5e";
+      sha256 = "01xg6mmnlx5l37rsb7w0dbgy36pd6zyq7gcigdbj0pgqd39w30fv";
     };
     dependencies = [];
 
@@ -930,66 +930,66 @@ rec {
   };
 
   rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rust-vim-2016-06-05";
+    name = "rust-vim-2016-06-21";
     src = fetchgit {
       url = "git://github.com/rust-lang/rust.vim";
-      rev = "e064f270e85e0cbb7bd643aeda3e7088378341f7";
-      sha256 = "04s3c1hwxcprvzn8wx39f9mg3rmgwvqvinqwbfm591pjpialvmpk";
+      rev = "5dd7ab99103c05a56e059b39ad9f63274d2ae72e";
+      sha256 = "0az35kfcpavz6sbh6mf0mmv7mp5zbnqmnljpmlm1srn6rr9rah2q";
     };
     dependencies = [];
 
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2016-06-07";
+    name = "neocomplete-vim-2016-06-26";
     src = fetchgit {
       url = "git://github.com/shougo/neocomplete.vim";
-      rev = "14698b37d10b8ae18a4850aa784fdd3130e4ba3e";
-      sha256 = "08bg6yafp68gh82afzzn9msb7adydihdvxyzigvjzr94bzv4n4ab";
+      rev = "71800331948b1bc3c3d79dbbf203a274cd5b6f56";
+      sha256 = "132bksxnj50yc2d8hx5sh4xbhzh0shidrvzlalb7gfhkanpg443w";
     };
     dependencies = [];
 
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2016-05-26";
+    name = "neosnippet-snippets-2016-06-26";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet-snippets";
-      rev = "dbce664a473e2344d2cc4e494fb5e408452646e2";
-      sha256 = "008brypf2jc9kl1gqyl1x2b1qx0bzvvfc0qqg0aniva2hwsda38k";
+      rev = "17219351bcbec3708295c72c8280471eed12b8fe";
+      sha256 = "08lrqsl9cqkx42llgv0mc54nsmdrv68bpzip2snr58klaj444nir";
     };
     dependencies = [];
 
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2016-06-11";
+    name = "neosnippet-vim-2016-07-10";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet.vim";
-      rev = "23eac4b080bb9788fbe61a0b93c7cf39e533f490";
-      sha256 = "01hbglhvgkfq78hxyh32afi4q47y6l3lm7yn4cz532cqd7ac78ij";
+      rev = "9492fbb7e9016243af3c1987b91f0bffcf4cc8e7";
+      sha256 = "0p2d762z0s9ayrc4kcqr7s1hmcghd04z818szqdn6v6rsr9lyln8";
     };
     dependencies = [];
 
   };
 
   unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "unite-vim-2016-06-11";
+    name = "unite-vim-2016-06-30";
     src = fetchgit {
       url = "git://github.com/shougo/unite.vim";
-      rev = "27a97d3eacd209c4f6e15c98e9217a4f6c438ac5";
-      sha256 = "14d87skqrsdb61nqpdch584hi0hpb5a0nqf35q5727pz6ckch32f";
+      rev = "faeff916c6af683990d3afe571047ebdb8bf2a4b";
+      sha256 = "1a29h4450z2g3599g8ln1l10h2lfwf7qr5j15hkrg7z23i5xgrj7";
     };
     dependencies = [];
 
   };
 
   vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimproc-vim-2016-06-11";
+    name = "vimproc-vim-2016-07-10";
     src = fetchgit {
       url = "git://github.com/shougo/vimproc.vim";
-      rev = "c2f6b82af60a4e7acde0e8dc4e6b6f5dc1cc8e1d";
-      sha256 = "1h79c0fskvalasji290qz89y1s9c1mic7h1p82p1im036jvmkf22";
+      rev = "b2255c66a3dc04fba1adbda3e380facff45fe6ec";
+      sha256 = "09fabq1j3grd8d8xz0y9i5y756mqzs9n7icvnlmi6hbjzkv1rkx6";
     };
     dependencies = [];
     buildInputs = [ which ];
@@ -1025,11 +1025,11 @@ rec {
   };
 
   vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-hardtime-2016-05-03";
+    name = "vim-hardtime-2016-07-05";
     src = fetchgit {
       url = "git://github.com/takac/vim-hardtime";
-      rev = "acf59c8df88e1445c145dfca626957d54a1310c3";
-      sha256 = "1q7lhj6ll3lycsxqj0ymm7pb6m1sdglgip7wkirjv357yxl7y7kr";
+      rev = "93ed99803df721648a9b93f0ccd4afe3d8d95a4e";
+      sha256 = "0as6kbdg2jqkxphxyv6ik6qxyp245hl52aqmx5gjd4vi3pryg0gl";
     };
     dependencies = [];
 
@@ -1058,11 +1058,11 @@ rec {
   };
 
   vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-quickrun-2016-06-09";
+    name = "vim-quickrun-2016-07-02";
     src = fetchgit {
       url = "git://github.com/thinca/vim-quickrun";
-      rev = "bb4daff0342ce3311b7f6c2fd3e2160f2be9e374";
-      sha256 = "11baxdcqr8854ijp0gkwwjl9navv8x1dv53p2isiq5vpqiq4n3mw";
+      rev = "5149ecd1502b7fc2583cb8799ac1a0c72c41f828";
+      sha256 = "1y32s42wgcq8qssm7yr578vvamvlb4kkdb1k5mhp0hmwskj2v7xp";
     };
     dependencies = [];
 
@@ -1113,11 +1113,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2016-06-13";
+    name = "youcompleteme-2016-07-11";
     src = fetchgit {
       url = "git://github.com/valloric/youcompleteme";
-      rev = "871387bd2a2ed9270ccc17ed63dde99c840deab5";
-      sha256 = "19ll1nh6nxl31zdajz9kdgw18mvsy4d630435z604rxik2rgbh3d";
+      rev = "c44489af16de6ae86294de7dd194bd6e53adaf1e";
+      sha256 = "1m8m6wyics1mlxcxzq83ql8l4vd16cfbhc418vmxflx3178ifr36";
     };
     dependencies = [];
     buildInputs = [
@@ -1153,22 +1153,22 @@ rec {
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-themes-2016-06-06";
+    name = "vim-airline-themes-2016-07-08";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline-themes";
-      rev = "796478723c01a275269b96f63ee5cd5b44a342f4";
-      sha256 = "1irvzv1sq12y2q6yjb26b89j5pxs5cia35dax093q6h88ywq709g";
+      rev = "aa95f935047323dbcbe2fed210bd3a0356a3c32b";
+      sha256 = "0mz1wb8bwcyd21wcvkdd58dbga78pdrcxnxwmvf0pi8ywix7aw01";
     };
     dependencies = [];
 
   };
 
   vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-2016-05-24";
+    name = "vim-pandoc-2016-07-11";
     src = fetchgit {
       url = "git://github.com/vim-pandoc/vim-pandoc";
-      rev = "cca2326046fd9bf44276e6d44f106c90d80eca25";
-      sha256 = "106dxdll11sj5vi34a0nq5kmfbp13g80ix26m6k9snxjx2y79y3s";
+      rev = "18461740f6915540e4833a71ab54a8205c9898b8";
+      sha256 = "00mawpl3wwj223g7bcmx4ghfysvxg9d3iqk1h8azykgccp6wg7p6";
     };
     dependencies = [];
 
@@ -1274,11 +1274,11 @@ rec {
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2016-06-13";
+    name = "vim-wakatime-2016-07-06";
     src = fetchgit {
       url = "git://github.com/wakatime/vim-wakatime";
-      rev = "cd074dcff51f12d1658902d4fe0d9f311ac94a2d";
-      sha256 = "0sq7n9w4nadc0psr74g7bmgv87bqlzsmyrr4iyalz108bdgxahav";
+      rev = "31b1a5d78244605fcab024edc20e6a0c059e449f";
+      sha256 = "0k5bnckv1882r9445p74a4iqys72imy23w87c1shq1gxps47cwms";
     };
     dependencies = [];
     buildInputs = [ python ];
@@ -1301,6 +1301,17 @@ rec {
     '';
   };
 
+  deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "deoplete-jedi-2016-07-10";
+    src = fetchgit {
+      url = "git://github.com/zchee/deoplete-jedi";
+      rev = "e7f0a94ea64b86d2b4946d30b6cedb38133d6603";
+      sha256 = "05j1lfqxagndglyh337b6v2l4zmpa9fwrkgr0g4kk1s6f0lmla2b";
+    };
+    dependencies = [];
+
+  };
+
   goyo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "goyo-2016-04-03";
     src = fetchgit {
@@ -1390,11 +1401,11 @@ rec {
   };
 
   snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "snipmate-2016-06-08";
+    name = "snipmate-2016-06-15";
     src = fetchgit {
       url = "git://github.com/garbas/vim-snipmate";
-      rev = "0c20e4136a298a73e21047d12cc5049595fb8445";
-      sha256 = "1x9skkywr5shrvb9bm3mjww6kmjmck7y8g0mn9yq8psqag9j3l21";
+      rev = "ee433e43c76c768c95ad6d9af67c4cd4b40f7eac";
+      sha256 = "0rfis0rck0rk69nfzkrj6fm00hhdj75mvp809nw8vr14ldj2bvs7";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
@@ -1423,11 +1434,11 @@ rec {
   };
 
   table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "table-mode-2016-05-08";
+    name = "table-mode-2016-07-11";
     src = fetchgit {
       url = "git://github.com/dhruvasagar/vim-table-mode";
-      rev = "b613e39bd08ecebdb9b18100dae518050f496048";
-      sha256 = "1bachhk21x507q8xp4a6a8lpsqs2miv97lnjjf6q9qh0crxhv3z8";
+      rev = "96236638a80fe73fa649824c9df25831a0042373";
+      sha256 = "1c5xnm63hqw0jycwakdljs0f3mp26rjvd4llijrznpr9z2cvki8f";
     };
     dependencies = [];
 
@@ -1455,11 +1466,11 @@ rec {
   };
 
   tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tlib-2016-04-06";
+    name = "tlib-2016-06-28";
     src = fetchgit {
       url = "git://github.com/tomtom/tlib_vim";
-      rev = "34b13299b5da7ad66ea387027d458bd54127687c";
-      sha256 = "0dwcwqxbfq7gy3iy5smx3zqp2v62p8166vj02bhrrr5zkv8rqnb3";
+      rev = "5636472e5dba1a4104376ce6bd93cc2546e02483";
+      sha256 = "0cjb7q5aa77ff8r503sn2j35x5w80fkgvmv42nrpxqhz0ldkn5vp";
     };
     dependencies = [];
 
@@ -1488,11 +1499,11 @@ rec {
   };
 
   vim-addon-async = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-async-2013-10-18";
+    name = "vim-addon-async-2016-06-15";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-async";
-      rev = "dadc96e188f1cdacbac62129eb29a1eacfed792c";
-      sha256 = "0b95l4ig8as82swhavsdica93bv5j55kvldfl7frkfp5zwcwi90f";
+      rev = "4fcdf0c8a0da8b9dc2d5ad25e2cf7692cfbc10f3";
+      sha256 = "1qa8ivh93ln30jbdwm9xg50yinvysvhricrkfjgg4v5nvk5sxj5n";
     };
     dependencies = ["vim-addon-signs"];
 
@@ -1686,22 +1697,22 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2016-06-07";
+    name = "vim-airline-2016-07-04";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline";
-      rev = "7b9b68f15dc50ef3c6382bd9df3a5e70c9ddcee9";
-      sha256 = "0k6imrfgp62qminwd7ilsq106dy49nwn2fsm88v546mwc9a2bccd";
+      rev = "4d0c4f6b1e3fee30873b0c9734fbe83f4d74b81c";
+      sha256 = "15fdd6i8p7w0xcj5b3zl8nqn7bx9wqg6s7pq9xj32ya7rg49f5bn";
     };
     dependencies = [];
 
   };
 
   vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-coffee-script-2015-04-20";
+    name = "vim-coffee-script-2016-06-29";
     src = fetchgit {
       url = "git://github.com/kchmck/vim-coffee-script";
-      rev = "32fe889b8cafd3a4921ef8e6485156453ff58c42";
-      sha256 = "1x2kk9jm3948avvz3ywakmhdr3x99qfa54fk1pfphny3mrfv4l65";
+      rev = "0f4bd9776cfd0fd2a394a4b1991630698e4fdc2d";
+      sha256 = "18n1xbs59s71zvavjcg7an8y5dhq6agrb2rc2j6y48y7na0kf8sf";
     };
     dependencies = [];
 
@@ -1730,11 +1741,11 @@ rec {
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2016-06-09";
+    name = "vim-gitgutter-2016-06-27";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "09b9144002e938844df74f48ac72c1e3118e7d39";
-      sha256 = "10yyzib9znhqz298h3f67n9hz1fvm5yk6958bisimf9bg9w9rn1v";
+      rev = "b5f23e986747a6f4b1dc1196d2a5bd3dc7c8c2b6";
+      sha256 = "0z3f4yamkv3fmqnrr00j86xwrrfv199fiabpjqnk583b5kcbn90j";
     };
     dependencies = [];
 
@@ -1774,33 +1785,33 @@ rec {
   };
 
   vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signature-2016-06-09";
+    name = "vim-signature-2016-07-09";
     src = fetchgit {
       url = "git://github.com/kshenoy/vim-signature";
-      rev = "782ed5284ddf6ef3695f8b3314facd8c6113c725";
-      sha256 = "1s6n6qdn3f89h4gi8nflz84y9l59rrfn43rgn257kxsq0df0kmx2";
+      rev = "e2fca5f3b0474e7174e08b32c89634ac6f53bfe2";
+      sha256 = "0ik68qzx0pqsvsla6y593cwab4iw3xy1sl8kb4kq89lhvv1wgxmg";
     };
     dependencies = [];
 
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2016-06-08";
+    name = "vim-signify-2016-06-19";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-signify";
-      rev = "cb975a8c6fbf08385eba8d0bbc1168ae53be460a";
-      sha256 = "00vi90zfkx94i0n0x4fjiz6bxfl2whxsclp8zxd4mivcqsw500jy";
+      rev = "76bde232d163c99a8e72b517d8ef770b0d79849e";
+      sha256 = "1yzq5ll7yx38872mpph976mn9yqyyypfif5vjhgvlk4l2an18qk6";
     };
     dependencies = [];
 
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2016-06-09";
+    name = "vim-snippets-2016-07-06";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "e840b91a4e86cda657519eba00766a29a614e1e2";
-      sha256 = "11pns71zpg9nh3mf2g24k194371jhkkv7b3in8r9av107ijky3sb";
+      rev = "d285c86221e917d13c6cbf89f347627ea9fe1796";
+      sha256 = "1dxzl2d9kxn7vhxpz0shd2qsn6mgvbj9gn9rym8j9v4wjn2zvqws";
     };
     dependencies = [];
 
@@ -1840,11 +1851,11 @@ rec {
   };
 
   vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vinegar-2016-01-30";
+    name = "vinegar-2016-06-30";
     src = fetchgit {
       url = "git://github.com/tpope/vim-vinegar";
-      rev = "75fc3824bc09053f22735d6726c5cfd614c15642";
-      sha256 = "19jl854wylmfdr9k4bfyffkz8bl4vpx1znnxzx0qj7cz2s3i9z0r";
+      rev = "bd7f7b7929260072864462c04dde3b9f4c5e0d23";
+      sha256 = "09shzlc9dagqlb5558nvm33b4bkk9cy34kp7zgnybphyy72wf31h";
     };
     dependencies = [];
 
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 7069a8021f35..b2a2a542bf5e 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -22,7 +22,6 @@
 "github:Chiel92/vim-autoformat"
 "github:LnL7/vim-nix"
 "github:Shougo/deoplete.nvim"
-"github:zchee/deoplete-jedi"
 "github:ajh17/Spacegray.vim"
 "github:alvan/vim-closetag"
 "github:ap/vim-css-color"
@@ -38,6 +37,7 @@
 "github:esneider/YUNOcommit.vim"
 "github:fatih/vim-go"
 "github:flazz/vim-colorschemes"
+"github:floobits/floobits-neovim"
 "github:frigoeu/psc-ide-vim"
 "github:google/vim-jsonnet"
 "github:hecal3/vim-leader-guide"
@@ -102,6 +102,7 @@
 "github:vim-scripts/wombat256.vim"
 "github:wakatime/vim-wakatime"
 "github:wincent/command-t"
+"github:zchee/deoplete-jedi"
 "goyo"
 "matchit.zip"
 "pathogen"
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index f39d7093c73b..acb5b4fcbe1e 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -330,7 +330,7 @@ rec {
   vimHelpTags = ''
   vimHelpTags(){
     if [ -d "$1/doc" ]; then
-      ${vim}/bin/vim -N -u NONE -i NONE -n -e -s -c "helptags $1/doc" +quit!
+      ${vim}/bin/vim -N -u NONE -i NONE -n -E -s -c "helptags $1/doc" +quit! || echo "docs to build failed"
     fi
   }
   '';
-- 
cgit 1.4.1


From bbd0a47950a2503eb448fc82b24f1d83325118c0 Mon Sep 17 00:00:00 2001
From: J Phani Mahesh <phanimahesh@gmail.com>
Date: Thu, 14 Jul 2016 17:26:19 +0530
Subject: vim-plugin:YouCompleteMe: propogatedBuildInputs ->
 propagatedBuildInputs

---
 pkgs/misc/vim-plugins/default.nix                               | 2 +-
 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index a34690853fcd..3134aa0eeba3 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1126,7 +1126,7 @@ rec {
       llvmPackages.llvm
     ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
 
-    propogatedBuildInputs = [
+    propagatedBuildInputs = [
       rustracerd
     ];
 
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
index a27b1f053a29..eb7f6bedf497 100644
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
@@ -4,7 +4,7 @@
       llvmPackages.llvm
     ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
 
-    propogatedBuildInputs = [
+    propagatedBuildInputs = [
       rustracerd
     ];
 
-- 
cgit 1.4.1