From c46d5ed3d749db02dbc9080b7aecfc3736b12cea Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Sat, 7 Dec 2013 23:03:16 +0100
Subject: Noting faac unfree. I think it is unfree, not LGPL.

---
 pkgs/development/libraries/faac/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix
index 8e79afb5f9ef..8bfaaf3ea497 100644
--- a/pkgs/development/libraries/faac/default.nix
+++ b/pkgs/development/libraries/faac/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Open source MPEG-4 and MPEG-2 AAC encoder";
     homepage = http://www.audiocoding.com/faac.html;
-    license = "LGPL";
+    # Incompatible with GPL. Some changes to the base code, included in faac,
+    # are under LGPL though.
+    license = "unfree";
   };
 }
-- 
cgit 1.4.1


From 4d33a94faefc69812fc4d9915ffa380a3a955247 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 8 Dec 2013 13:13:19 +0400
Subject: Passing giflib 4.1.x to OpenSceneGraph for now

---
 pkgs/development/libraries/giflib/4.1.nix | 10 ++++++++++
 pkgs/top-level/all-packages.nix           |  5 ++++-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/giflib/4.1.nix

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/giflib/4.1.nix b/pkgs/development/libraries/giflib/4.1.nix
new file mode 100644
index 000000000000..35d66b3647b4
--- /dev/null
+++ b/pkgs/development/libraries/giflib/4.1.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "giflib-4.1.6";
+  src = fetchurl {
+    url = mirror://sourceforge/giflib/giflib-4.1.6.tar.bz2;
+    sha256 = "1v9b7ywz7qg8hli0s9vv1b8q9xxb2xvqq2mg1zpr73xwqpcwxhg1";
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1950122904e..299029c95bd4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5095,6 +5095,7 @@ let
   libupnp = callPackage ../development/libraries/pupnp { };
 
   giflib = callPackage ../development/libraries/giflib { };
+  giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { };
 
   libungif = callPackage ../development/libraries/giflib/libungif.nix { };
 
@@ -5399,7 +5400,9 @@ let
 
   openjpeg = callPackage ../development/libraries/openjpeg { lcms = lcms2; };
 
-  openscenegraph = callPackage ../development/libraries/openscenegraph {};
+  openscenegraph = callPackage ../development/libraries/openscenegraph {
+    giflib = giflib_4_1;
+  };
 
   openssl = callPackage ../development/libraries/openssl {
     fetchurl = fetchurlBoot;
-- 
cgit 1.4.1


From c5005bfe11c52f109848c1c9cc34ff47bc9a6006 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 8 Dec 2013 12:04:02 +0200
Subject: KDE-4.10: Kopete: fix build against giflib5

---
 .../kde-4.10/kdenetwork/kopete-giflib5.patch       | 70 ++++++++++++++++++++++
 pkgs/desktops/kde-4.10/kdenetwork/kopete.nix       |  1 +
 2 files changed, 71 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.10/kdenetwork/kopete-giflib5.patch

(limited to 'pkgs')

diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete-giflib5.patch b/pkgs/desktops/kde-4.10/kdenetwork/kopete-giflib5.patch
new file mode 100644
index 000000000000..1755bdbce76d
--- /dev/null
+++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete-giflib5.patch
@@ -0,0 +1,70 @@
+Index: b/kopete/protocols/wlm/wlmchatsession.cpp
+===================================================================
+--- a/kopete/protocols/wlm/wlmchatsession.cpp
++++ b/kopete/protocols/wlm/wlmchatsession.cpp
+@@ -63,10 +63,14 @@
+ #include "wlmprotocol.h"
+ #include "wlmaccount.h"
+ #include "wlmchatsessioninkaction.h"
+ #ifdef HAVE_GIFLIB
+ #include <gif_lib.h>
++/* old giflib has no GIFLIB_MAJOR, define to avoid cpp warnings */
++#ifndef GIFLIB_MAJOR
++#define GIFLIB_MAJOR 4
++#endif
+ #endif
+ 
+ WlmChatSession::WlmChatSession (Kopete::Protocol * protocol,
+                                 const Kopete::Contact * user,
+                                 Kopete::ContactPtrList others,
+@@ -465,15 +469,19 @@ WlmChatSession::slotInviteContact (Kopet
+ static void
+ printGifErrorMessage()
+ {
+ #ifdef HAVE_GIFLIB
+ #ifdef HAVE_GIF_ERROR_STRING // giflib 4.2.0+
++#if GIFLIB_MAJOR >= 5
++        fprintf(stderr, "GIF-LIB error (exact reporting not implemented)\n");
++#else
+         const char * errorString = GifErrorString();
+         if (errorString)
+             fprintf(stderr, "GIF-LIB error: %s\n", errorString);
+         else
+             fprintf(stderr, "GIF-LIB undefined error: %d\n", GifError());
++#endif
+ #else // older giflib versions, libungif
+         PrintGifError();
+ #endif // HAVE_GIF_ERROR_STRING
+ #endif // HAVE_GIFLIB
+ }
+@@ -481,10 +489,14 @@ printGifErrorMessage()
+ /* stolen from kpaint write_to_gif() */
+ void
+ WlmChatSession::convertToGif( const QPixmap & ink, QString filename)
+ {
+ #ifdef HAVE_GIFLIB
++#if GIFLIB_MAJOR >= 5
++#define FreeMapObject  GifFreeMapObject
++#define MakeMapObject  GifMakeMapObject
++#endif
+     int i, status;
+     GifFileType *GifFile;
+     ColorMapObject *screenColourmap;
+     ColorMapObject *imageColourmap;
+     QImage img = ink.toImage().convertToFormat(QImage::Format_Indexed8);
+@@ -523,11 +535,15 @@ WlmChatSession::convertToGif( const QPix
+             screenColourmap->Colors[i].Green= 0;
+             screenColourmap->Colors[i].Blue= 0;
+         }
+     }
+ 
++#if GIFLIB_MAJOR >= 5
++    GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0, NULL);
++#else
+     GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0);
++#endif
+     if (!GifFile) {
+         FreeMapObject(imageColourmap);
+         FreeMapObject(screenColourmap);
+         return;
+     }
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix
index 7139c62981c6..b065ae610095 100644
--- a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix
+++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix
@@ -20,6 +20,7 @@ kde {
       cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake
       patch -p1 < ${./kopete-4.10.4-kopete-linphonemediaengine.patch}
       patch -p1 < ${./kopete-4.10.4-kopete-stun.patch}
+      patch -p1 < ${./kopete-giflib5.patch}
     '';
 
   cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];
-- 
cgit 1.4.1


From a0d8196f609b861c10d548f61c138a70dd9ac7a7 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 8 Dec 2013 12:36:46 +0200
Subject: Use old giflib for packages which lack new versions/compatibility
 patches for giflib5

---
 pkgs/top-level/all-packages.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 299029c95bd4..db76a4e55065 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2923,6 +2923,7 @@ let
 
     camlimages = callPackage ../development/ocaml-modules/camlimages {
       libpng = libpng12;
+      giflib = giflib_4_1;
     };
 
     ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
@@ -4329,6 +4330,7 @@ let
   glsurf = callPackage ../applications/science/math/glsurf {
     inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp;
     libpng = libpng12;
+    giflib = giflib_4_1;
   };
 
   gmime = callPackage ../development/libraries/gmime { };
@@ -7458,7 +7460,9 @@ let
 
   arora = callPackage ../applications/networking/browsers/arora { };
 
-  aseprite = callPackage ../applications/editors/aseprite { };
+  aseprite = callPackage ../applications/editors/aseprite {
+    giflib = giflib_4_1;
+  };
 
   audacious = callPackage ../applications/audio/audacious { };
 
@@ -10338,6 +10342,7 @@ let
 
   vice = callPackage ../misc/emulators/vice {
     libX11 = xlibs.libX11;
+    giflib = giflib_4_1;
   };
 
   viewnior = callPackage ../applications/graphics/viewnior { };
-- 
cgit 1.4.1


From 32cd0be64c22b43e49b2aa87358a0c939abe75e8 Mon Sep 17 00:00:00 2001
From: Domen Kožar <domen@dev.si>
Date: Sun, 8 Dec 2013 19:18:59 +0100
Subject: vlc: add mkv support

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

(limited to 'pkgs')

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index de6ad9021505..ea71fba4e8f3 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, xz, bzip2, perl, xlibs, libdvdnav, libbluray
 , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib
-, pkgconfig, dbus, fribidi, qt4, freefont_ttf
+, pkgconfig, dbus, fribidi, qt4, freefont_ttf, libebml, libmatroska
 , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp
 , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg
 , mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
       libkate libtiger libv4l samba liboggz libass libdvbpsi libva
       xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
-      libdc1394 libraw1394 libopus
+      libdc1394 libraw1394 libopus libebml libmatroska
     ];
 
   nativeBuildInputs = [ pkgconfig ];
-- 
cgit 1.4.1


From c1df906704397c2712bb9d1edffda6f97ee1323c Mon Sep 17 00:00:00 2001
From: Domen Kožar <domen@dev.si>
Date: Sun, 8 Dec 2013 19:19:11 +0100
Subject: vlc: specify meta.platforms

---
 pkgs/applications/video/vlc/default.nix | 3 ++-
 pkgs/top-level/release.nix              | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index ea71fba4e8f3..f6ebc241bac2 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -45,8 +45,9 @@ stdenv.mkDerivation rec {
       ${freefont_ttf}/share/fonts/truetype/FreeSerifBold.ttf
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Cross-platform media player and streaming server";
     homepage = http://www.videolan.org/vlc/;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index cc62eaec86d4..cccd1363864b 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -309,7 +309,6 @@ let
       vim = linux;
       vimHugeX = linux;
       VisualBoyAdvance = linux;
-      vlc = linux;
       vncrec = linux;
       vorbisTools = linux;
       vpnc = linux;
-- 
cgit 1.4.1


From 799062bcb624e65c39ec6c876d1ea45d4c66bfce Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 8 Dec 2013 19:49:40 +0100
Subject: Fixed sbt options

---
 pkgs/development/tools/build-managers/simple-build-tool/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/development/tools/build-managers/simple-build-tool/default.nix b/pkgs/development/tools/build-managers/simple-build-tool/default.nix
index 13a216799a2d..8f01486cfe72 100644
--- a/pkgs/development/tools/build-managers/simple-build-tool/default.nix
+++ b/pkgs/development/tools/build-managers/simple-build-tool/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     cat > $out/bin/sbt << EOF
     #!/bin/sh
     SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=384M"
-    ${jre}/bin/java $SBT_OPTS -jar ${src} "\$@"
+    ${jre}/bin/java \$SBT_OPTS -jar ${src} "\$@"
     EOF
     chmod +x $out/bin/sbt
   '';
-- 
cgit 1.4.1


From 0c5f72af587bad1b9b57b1b17e1f580cb1fea7c3 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Sun, 8 Dec 2013 21:52:24 +0000
Subject: spotify: fix finding libXdamage.so.1

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/applications/audio/spotify/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 615ee6a93cc9..874cc321f8be 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation {
       ln -s $out/spotify-client/spotify $out/bin/spotify
       patchelf \
         --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-        --set-rpath $out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc freetype glib pango cairo atk gdk_pixbuf gtk GConf cups sqlite]}:${stdenv.gcc.gcc}/lib64 \
+        --set-rpath $out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc freetype glib pango cairo atk gdk_pixbuf gtk GConf cups sqlite xlibs.libXdamage ]}:${stdenv.gcc.gcc}/lib64 \
         $out/spotify-client/spotify
 
       dpkg-deb -x ${qt4webkit} ./
@@ -78,7 +78,7 @@ stdenv.mkDerivation {
       mkdir -p $out/libexec/spotify
       gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC
 
-      wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng cups libgcrypt sqlite gst_plugins_base gstreamer]}:$out/lib"
+      wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng cups libgcrypt sqlite gst_plugins_base gstreamer xlibs.libXdamage ]}:$out/lib"
 
       # Desktop file
       mkdir -p "$out/share/applications/"
-- 
cgit 1.4.1


From b4f93af3c9d6288692ede341cfbf38debd80ee52 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 9 Dec 2013 01:15:16 +0100
Subject: Update git and related tools to latest releases.

Git     -> 1.8.5.1
stgit   -> 0.16
svn2git -> 2.2.2

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 .../version-management/git-and-tools/default.nix   |  2 +-
 .../git-and-tools/git/default.nix                  |  6 ++---
 .../git-and-tools/stgit/default.nix                |  6 ++---
 .../git-and-tools/svn2git/default.nix              | 28 +++++++++++++++-------
 4 files changed, 26 insertions(+), 16 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 9f7f26041ca6..ee1de54a4fb0 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -83,7 +83,7 @@ rec {
   };
 
   svn2git = import ./svn2git {
-    inherit stdenv fetchgit ruby makeWrapper;
+    inherit stdenv fetchurl ruby makeWrapper;
     git = gitSVN;
   };
 
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 050cfd1aabee..e364a8ea87bd 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -10,7 +10,7 @@
 
 let
 
-  version = "1.8.4.3";
+  version = "1.8.5.1";
 
   svn = subversionClient.override { perlBindings = true; };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
-    sha256 = "08fbdxh2cjd4hffm0nydwysh5zh6nrssbi9x01yy0n2y8rqzly0a";
+    sha256 = "0i7fz0b79f3algs68m15wg4bq99ayg1crpy66cqylxq3mzbw8n8m";
   };
 
   patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];
@@ -140,6 +140,6 @@ stdenv.mkDerivation {
     '';
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = with stdenv.lib.maintainers; [ simons the-kenny ];
   };
 }
diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
index a933ae84e603..6518f32ef7c6 100644
--- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, git }:
 
 let
-  name = "stgit-0.15";
+  name = "stgit-0.16";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "http://download.gna.org/stgit/${name}.tar.gz";
-    sha256 = "0kgq9x0i7riwcl1lmmm40z0jiz5agr1kqxm2byv1qsf0q1ny47v9";
+    sha256 = "0hla6401g2kicaakz4awk67yf8fhqbw1shn1p9ma5x6ca29s3w82";
   };
 
   buildInputs = [ python git ];
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     description = "StGit is a patch manager implemented on top of Git";
     license = "GPL";
 
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = with stdenv.lib.maintainers; [ simons the-kenny ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
index 6f5d36f6aa74..0053a1dfafbe 100644
--- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchgit, ruby, makeWrapper, git }:
+{ stdenv, fetchurl, ruby, makeWrapper, git }:
 
-stdenv.mkDerivation rec {
-  name = "svn2git-2.1.0-20111206";
+let
+  version = "2.2.2";
+in
+stdenv.mkDerivation {
+  name = "svn2git-${version}";
 
-  src = fetchgit {
-    url = https://github.com/nirvdrum/svn2git;
-    rev = "5cd8d4b509affb66eb2dad50d7298c52b3b0d848";
-    sha256 = "26aa17f68f605e958b623d803b4bd405e12d6c5d51056635873a2c59e4c7b9ca";
+  src = fetchurl {
+    url = "https://github.com/nirvdrum/svn2git/archive/v${version}.tar.gz";
+    sha256 = "14zinkpgybz15jvbfw0sb432w6f5w4sa5pdqycjwva8v8lxqn9mh";
   };
 
   buildInputs = [ ruby makeWrapper ];
@@ -17,14 +19,22 @@ stdenv.mkDerivation rec {
     ''
       mkdir -p $out
       cp -r lib $out/
-      
+
       mkdir -p $out/bin
       substituteInPlace bin/svn2git --replace '/usr/bin/env ruby' ${ruby}/bin/ruby
       cp bin/svn2git $out/bin/
       chmod +x $out/bin/svn2git
-      
+
       wrapProgram $out/bin/svn2git \
         --set RUBYLIB $out/lib \
         --prefix PATH : ${git}/bin
     '';
+
+  meta = {
+    homepage = https://github.com/nirvdrum/svn2git;
+    description = "Ruby tool for importing existing svn projects into git";
+    license = stdenv.lib.licenses.mit;
+
+    maintainers = [ stdenv.lib.maintainers.the-kenny ];
+  };
 }
-- 
cgit 1.4.1


From 7bd64d6c1f153afa3307430213c7d03fe8993f36 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 9 Dec 2013 00:16:42 +0000
Subject: anki: update from 2.0.12 to 2.0.18

---
 pkgs/games/anki/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 7437e2e2262c..d574f9c860f6 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -9,10 +9,10 @@ let
 in
 
 stdenv.mkDerivation rec {
-    name = "anki-2.0.12";
+    name = "anki-2.0.18";
     src = fetchurl {
       url = "http://ankisrs.net/download/mirror/${name}.tgz";
-      sha256 = "1pccws3rgfpyxdx5xph5x72c4a46is0alfz73icn9ppgjdizzipr";
+      sha256 = "1hpla3bgg7zh05f1dgycs5j4a01hnim66a8q2qzihf1r5zanr50j";
     };
 
     pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy py.pyaudio ]
@@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
         * even practicing guitar chords!
       '';
       license = "GPLv3";
+      maintainers = with stdenv.lib.maintainers; [ the-kenny ];
       platforms = stdenv.lib.platforms.mesaPlatforms;
     };
 }
-- 
cgit 1.4.1


From 5c59c84bcb2356d6f52f538383cbe51df81caf83 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 9 Dec 2013 00:20:57 +0000
Subject: audacity: update from 2.0.4 to 2.0.5

---
 pkgs/applications/audio/audacity/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 4a6797f9010b..890497b0c992 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -4,12 +4,12 @@
   }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.4";
+  version = "2.0.5";
   name = "audacity-${version}";
 
   src = fetchurl {
     url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.xz";
-    sha256 = "0pl92filykzs4g2pn7i02kdqgja326wjgafzw2vcgwn3dwrs4avp";
+    sha256 = "0y9bvc3a3zxsk31yg7bha029mzkjiw5i9m86kbyj7x8ps0fm91z2";
   };
 
   preConfigure = /* we prefer system-wide libs */ ''
@@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
     homepage = http://audacity.sourceforge.net;
     license = "GPLv2+";
     platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
   };
 }
-- 
cgit 1.4.1


From 2d6c240913a6dcf25605d286a4525902420df1f8 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 9 Dec 2013 00:34:35 +0000
Subject: winetricks: Update to rev 1078

And add some missing dependencies to the PATH of the script.
---
 pkgs/misc/emulators/wine/winetricks.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix
index 71cc2767f698..e3fe48ec8a3c 100644
--- a/pkgs/misc/emulators/wine/winetricks.nix
+++ b/pkgs/misc/emulators/wine/winetricks.nix
@@ -1,19 +1,20 @@
-{ stdenv, fetchsvn, wine, perl, which, coreutils, zenity, curl, cabextract, unzip, p7zip } :
+{ stdenv, fetchsvn, wine, perl, which, coreutils, zenity, curl
+, cabextract, unzip, p7zip, gnused, gnugrep, bash } :
 
 stdenv.mkDerivation rec {
-  rev = "939";
+  rev = "1078";
   name = "winetricks-${rev}";
 
   src = fetchsvn {
     url = "http://winetricks.googlecode.com/svn/trunk";
     inherit rev;
-    sha256 = "01v13qw4sxmfm09g9amqycnzy743gdrhvv23rjr9255dzlrj1s8f";
+    sha256 = "0ipvld0r5h6x2pgqkqa82q0w9flx6fn9aha8fd7axf5ji2gzmidm";
   };
 
   buildInputs = [ perl which ];
 
   pathAdd = stdenv.lib.concatStringsSep "/bin:" # coreutils is for sha1sum
-    [ wine perl which coreutils zenity curl cabextract unzip p7zip ]
+    [ wine perl which coreutils zenity curl cabextract unzip p7zip gnused gnugrep bash ]
     + "/bin";
 
   patch = ./winetricks.patch;
@@ -24,6 +25,7 @@ stdenv.mkDerivation rec {
     description = "A script to install DLLs needed to work around problems in Wine";
     license = "LGPLv2.1";
     homepage = http://code.google.com/p/winetricks/;
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
   };
 }
 
-- 
cgit 1.4.1


From c727c38b266df1c2748e58b84c41ec5dd27e84de Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 9 Dec 2013 00:34:00 +0000
Subject: rdiff_backup: update from 1.2.8 to 1.3.3

---
 pkgs/tools/backup/rdiff-backup/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix
index d52cbdebb677..d58815f6d6dd 100644
--- a/pkgs/tools/backup/rdiff-backup/default.nix
+++ b/pkgs/tools/backup/rdiff-backup/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, python, librsync, gnused }:
 
 stdenv.mkDerivation {
-  name = "rdiff-backup-1.2.8";
+  name = "rdiff-backup-1.3.3";
 
   src = fetchurl {
-    url = mirror://savannah/rdiff-backup/rdiff-backup-1.2.8.tar.gz;
-    sha256 = "1nwmmh816f96h0ff1jxk95ad38ilbhbdl5dgibx1d4cl81dsi48d";
+    url = mirror://savannah/rdiff-backup/rdiff-backup-1.3.3.tar.gz;
+    sha256 = "01hcwf5rgqi303fa4kdjkbpa7n8mvvh7h9gpgh2b23nz73k0q0zf";
   };
 
   phases = "unpackPhase installPhase";
@@ -15,11 +15,12 @@ stdenv.mkDerivation {
       "/import sys/ asys.path += [ \"$out/lib/python2.7/site-packages/\" ]"
   '';
 
-  buildInputs = [python librsync gnused ];
+  buildInputs = [ python librsync gnused ];
 
   meta = {
     description = "backup system trying to combine best a mirror and an incremental backup system";
     homepage = http://rdiff-backup.nongnu.org/;
     license = "GPL-2";
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
   };
 }
-- 
cgit 1.4.1


From d79177cc20ac21ace619f71f72b3269291202647 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 10:41:31 +0200
Subject: youtubeDL: update from 2013.10.23.2 to 2013.12.08.1

---
 pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 86ef76178081..bf9dc76bbc13 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2013.10.23.2";
+  version = "2013.12.08.1";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "d3f4c9e0da165395856e690314caa5eef4382bd994dd46f041a520bf9747c35d";
+    sha256 = "0sqdc0fbk6xlfd5d2iy4r9kr5inl0122zzri08zndpl4cbzawhaq";
   };
 
   buildInputs = [ python ];
-- 
cgit 1.4.1


From e523fdfc4750c519f2149bacc8690091cd5089d6 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 10:47:10 +0200
Subject: apacheHttpd: update from 2.2.25 to 2.2.26

---
 pkgs/servers/http/apache-httpd/2.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix
index c91d6bbf761a..f6b31177157c 100644
--- a/pkgs/servers/http/apache-httpd/2.2.nix
+++ b/pkgs/servers/http/apache-httpd/2.2.nix
@@ -12,12 +12,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 assert mpm == "prefork" || mpm == "worker" || mpm == "event";
 
 stdenv.mkDerivation rec {
-  version = "2.2.25";
+  version = "2.2.26";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha1 = "e34222d1a8de38825397a1c70949bcc5836a1236";
+    sha256 = "1dj29cl2bsk8ir8hxw0ajhbpbrrmsh8mwqfc1ipiqgv7slyqx45g";
   };
 
   buildInputs = [perl apr aprutil pcre] ++
-- 
cgit 1.4.1


From 7375a3f7dd1e40df2eb95c2a301094ff7de4609c Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 10:48:41 +0200
Subject: aprutil: update from 1.5.2 to 1.5.3

---
 pkgs/development/libraries/apr-util/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index 8e49d3984606..89c2c31ef7a9 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -9,11 +9,11 @@ assert bdbSupport -> db4 != null;
 assert ldapSupport -> openldap != null;
 
 stdenv.mkDerivation rec {
-  name = "apr-util-1.5.2";
+  name = "apr-util-1.5.3";
 
   src = fetchurl {
     url = "mirror://apache/apr/${name}.tar.bz2";
-    md5 = "89c1348aa79e898d7c34a6206311c9c2";
+    sha256 = "0s1rpqjy5xr03k9s4xrsm5wvhj5286vlkf6jvqayw99yy5sb3vbq";
   };
 
   configureFlags = ''
-- 
cgit 1.4.1


From 6996067dcf88fb83d097b44d02ed26f957f07a81 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 10:49:00 +0200
Subject: apacheHttpd_2_4: update from 2.4.6 to 2.4.7

---
 pkgs/servers/http/apache-httpd/2.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index 9e687e9c843a..2bbe9798de46 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -14,12 +14,12 @@ assert sslSupport -> aprutil.sslSupport && openssl != null;
 assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 
 stdenv.mkDerivation rec {
-  version = "2.4.6";
+  version = "2.4.7";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha1 = "16d8ec72535ded65d035122b0d944b0e64eaa2a2";
+    sha256 = "06z7ij0avr8f3rvp6ifk3dn8j73i17cn4avz4fp1as43061qsdk4";
   };
 
   buildInputs = [perl] ++
-- 
cgit 1.4.1


From a9ce83467e0b49d7c6c9d9e33b8195a0574a8cb4 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 10:58:16 +0200
Subject: springLobby: update from 0.176 to 0.180

---
 pkgs/games/spring/springlobby.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index ac4869f78380..f522eef8eb91 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "springlobby-${version}";
-  version = "0.176";
+  version = "0.180";
 
   src = fetchurl {
     url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
-    sha256 = "0a5pnd15rlvbkvnz2s0axy3i7m2jlrk91kjpwflnrcqlf42c2rk9";
+    sha256 = "0v2pwrwiwiggyl95rcyfj3pdlwsss5vcmnyzd40r9swb9gyi55na";
   };
 
   buildInputs = [
-- 
cgit 1.4.1


From d8f1146fdecfddcdbbb9f5ba3c2abf670933ac85 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 10:59:48 +0200
Subject: clamav: update from 0.97.8 to 0.98

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

(limited to 'pkgs')

diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 858320004b84..8315078c80f9 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib, bzip2, libiconv }:
 stdenv.mkDerivation rec {
   name = "clamav-${version}";
-  version = "0.97.8";
+  version = "0.98";
 
   src = fetchurl {
     url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz";
-    sha256 = "04pwm8a84silnvgimn2wi2wgwdzwpskybx72mp10ni1dd7yvswnq";
+    sha256 = "1dmkaa6sqynv4v74s9izq7m7kk8d78rvwyd123q4gva6gx9m0d0i";
   };
 
   buildInputs = [ zlib bzip2 libiconv ];
-- 
cgit 1.4.1


From 741b202d72d1928a090af909eba77504fba9574c Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 11:04:25 +0200
Subject: apparmor: update from 2.8.1 to 2.8.2

---
 pkgs/os-specific/linux/apparmor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index 858be431a91d..51fe768df834 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -5,11 +5,11 @@
 stdenv.mkDerivation rec {
 
   name = "apparmor-${version}";
-  version = "2.8.1";
+  version = "2.8.2";
 
   src = fetchurl {
     url = "http://launchpad.net/apparmor/2.8/${version}/+download/${name}.tar.gz";
-    sha256 = "1r0a5k14jbiik28m5gql0f3dbxl252jya7i120rrsbzqqnvw6nw7";
+    sha256 = "1fyjvfkvl0fc7agmz64ck8c965940xvcljrczq1z66sydivkybvl";
   };
 
   buildInputs = [
-- 
cgit 1.4.1


From 3da956c7ca89d68c39345c469772a001858d8f4f Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 11:13:26 +0200
Subject: amuleGui: update from 2.2.6 to 2.3.1

---
 pkgs/tools/networking/p2p/amule/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix
index 44384507a79d..039fca35ab3a 100644
--- a/pkgs/tools/networking/p2p/amule/default.nix
+++ b/pkgs/tools/networking/p2p/amule/default.nix
@@ -12,11 +12,11 @@ let
   edf = enabled: flag: if enabled then "--enable-" + flag else "--disable-" + flag;
 in 
 mkDerivation rec {
-  name = "aMule-2.2.6";
+  name = "aMule-2.3.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/amule/${name}.tar.bz2";
-    sha256 = "08l1931hcg1ia8yvhgx70hx64mknjnfn6l78m0ja44w13mgjpqvc";
+    sha256 = "17g6xh6k7rqy2sjp9l4m7h4in96cqwk5gfgg4fhlymzc6jfa3vfj";
   };
 
   buildInputs =
-- 
cgit 1.4.1


From d4a1ab3bc3f68cccaf73f6494829f6198c7a6f7d Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 11:18:17 +0200
Subject: libtorrent: update from 0.13.2 to 0.13.3

---
 pkgs/tools/networking/p2p/libtorrent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix
index fb0a889d3eeb..ea376fd2a7bd 100644
--- a/pkgs/tools/networking/p2p/libtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/libtorrent/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, openssl, libsigcxx }:
 
 let
-  version = "0.13.2";
+  version = "0.13.3";
 in
 stdenv.mkDerivation {
   name = "libtorrent-${version}";
 
   src = fetchurl {
     url = "http://libtorrent.rakshasa.no/downloads/libtorrent-${version}.tar.gz";
-    sha256 = "ed2f2dea16c29cac63fa2724f6658786d955f975861fa6811bcf1597ff8a5e4f";
+    sha256 = "0xsnyd1hnfvfq67y5s0ddhj2lhxmfms4djblaa0d1y5phdkpsc9l";
   };
 
   buildInputs = [ pkgconfig openssl libsigcxx ];
-- 
cgit 1.4.1


From a08f5c43148b372d2864b89d8210be5c4de7864f Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 11:30:43 +0200
Subject: verilog: update from 0.9.3 to 0.9.7

---
 pkgs/applications/science/electronics/verilog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix
index a4c803e2952c..883e332a2671 100644
--- a/pkgs/applications/science/electronics/verilog/default.nix
+++ b/pkgs/applications/science/electronics/verilog/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, gperf, flex, bison}:
 
 stdenv.mkDerivation rec {
-  name = "verilog-0.9.3";
+  name = "verilog-0.9.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/iverilog/${name}.tar.gz";
-    sha256 = "dd68c8ab874a93805d1e93fa76ee1e91fc0c7b20822ded3e57b6536cd8c0d1ba";
+    sha256 = "0m3liqw7kq24vn7k8wvi630ljz0awz23r3sd4rcklk7vgghp4pks";
   };
 
   buildInputs = [ gperf flex bison ];
-- 
cgit 1.4.1


From 8f4b7e21330e2b0a18c2aeaeb809d5fc4a5274c3 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 12:13:11 +0200
Subject: dosfstools: update from 3.0.21 to 3.0.24

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

(limited to 'pkgs')

diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index a98def328352..7511d75dd1a5 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dosfstools-3.0.21";
+  name = "dosfstools-3.0.24";
 
   src = fetchurl {
     url = "http://daniel-baumann.ch/files/software/dosfstools/${name}.tar.xz";
-    sha256 = "12c9ilcpknm7hg3czkc50azndd0yjdj4jjnvizhwqxy3g0gm2960";
+    sha256 = "1hblhb98wm9gm60y32psdqm5jprs4a6dqzrapzgb6bw7r3kvf88y";
   };
 
   makeFlags = "PREFIX=$(out)";
-- 
cgit 1.4.1


From 916af0f39c0495c3f651d1c43e543462d32bc89a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 12:41:49 +0100
Subject: stellarium: update to version 0.12.4

---
 pkgs/applications/science/astronomy/stellarium/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index 04c82b21e859..6b84143d0138 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -1,14 +1,11 @@
-{stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv}:
+{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv }:
 
-let
-  name = "stellarium-0.12.1";
-in
-stdenv.mkDerivation {
-  inherit name;
+stdenv.mkDerivation rec {
+  name = "stellarium-0.12.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/stellarium/${name}.tar.gz";
-    sha256 = "02qfp56mkg3bqggv3ndx8v6zfswg51gkczwiqy5c9y4rw28hazla";
+    sha256 = "11367hv9niyz9v47lf31vjsqkgc8da0vy2nhiyxgmk1i49p1pbhg";
   };
 
   buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ];
-- 
cgit 1.4.1


From aa58b5f571cd4e501f90181b9cf624fb96dd270c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 16:09:33 +0100
Subject: gnumake: clean up directory structure; no functional change

---
 .../tools/build-managers/gnumake-3.80/default.nix  |  10 --
 .../tools/build-managers/gnumake-3.80/log.patch    | 125 ---------------------
 .../tools/build-managers/gnumake/3.80/default.nix  |  10 ++
 .../tools/build-managers/gnumake/3.80/log.patch    | 125 +++++++++++++++++++++
 .../tools/build-managers/gnumake/3.81.nix          |  47 --------
 .../tools/build-managers/gnumake/3.81/default.nix  |  47 ++++++++
 .../build-managers/gnumake/3.81/impure-dirs.patch  |  34 ++++++
 .../build-managers/gnumake/3.81/log-3.81.patch     | 125 +++++++++++++++++++++
 .../gnumake/3.82/MAKEFLAGS-reexec.patch            |  14 +++
 .../gnumake/3.82/archives-many-objs.patch          |  48 ++++++++
 .../gnumake/3.82/construct-command-line.patch      |  71 ++++++++++++
 .../gnumake/3.82/copy-on-expand.patch              |  58 ++++++++++
 .../gnumake/3.82/darwin-library_search-dylib.patch |  17 +++
 .../tools/build-managers/gnumake/3.82/default.nix  |  63 +++++++++++
 .../build-managers/gnumake/3.82/glob-speedup.patch | 104 +++++++++++++++++
 .../build-managers/gnumake/3.82/impure-dirs.patch  |  34 ++++++
 .../gnumake/3.82/intermediate-parallel.patch       |  46 ++++++++
 .../tools/build-managers/gnumake/3.82/log.patch    | 125 +++++++++++++++++++++
 .../gnumake/3.82/long-command-line.patch           |  54 +++++++++
 .../gnumake/3.82/memory-corruption.patch           |  37 ++++++
 .../build-managers/gnumake/3.82/oneshell.patch     |  24 ++++
 .../gnumake/3.82/parallel-remake.patch             |  39 +++++++
 .../build-managers/gnumake/MAKEFLAGS-reexec.patch  |  14 ---
 .../gnumake/archives-many-objs.patch               |  48 --------
 .../gnumake/construct-command-line.patch           |  71 ------------
 .../build-managers/gnumake/copy-on-expand.patch    |  58 ----------
 .../gnumake/darwin-library_search-dylib.patch      |  17 ---
 .../tools/build-managers/gnumake/default.nix       |  63 -----------
 .../build-managers/gnumake/glob-speedup.patch      | 104 -----------------
 .../tools/build-managers/gnumake/impure-dirs.patch |  34 ------
 .../gnumake/intermediate-parallel.patch            |  46 --------
 .../tools/build-managers/gnumake/log-3.81.patch    | 125 ---------------------
 .../tools/build-managers/gnumake/log.patch         | 125 ---------------------
 .../build-managers/gnumake/long-command-line.patch |  54 ---------
 .../build-managers/gnumake/memory-corruption.patch |  37 ------
 .../tools/build-managers/gnumake/oneshell.patch    |  24 ----
 .../build-managers/gnumake/parallel-remake.patch   |  39 -------
 pkgs/top-level/all-packages.nix                    |   8 +-
 38 files changed, 1079 insertions(+), 1045 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/gnumake-3.80/default.nix
 delete mode 100644 pkgs/development/tools/build-managers/gnumake-3.80/log.patch
 create mode 100644 pkgs/development/tools/build-managers/gnumake/3.80/default.nix
 create mode 100644 pkgs/development/tools/build-managers/gnumake/3.80/log.patch
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/3.81.nix
 create mode 100644 pkgs/development/tools/build-managers/gnumake/3.81/default.nix
 create mode 100644 pkgs/development/tools/build-managers/gnumake/3.81/impure-dirs.patch
 create mode 100644 pkgs/development/tools/build-managers/gnumake/3.81/log-3.81.patch
 create mode 100644 pkgs/development/tools/build-managers/gnumake/3.82/MAKEFLAGS-reexec.patch
 create mode 100644 pkgs/development/tools/build-managers/gnumake/3.82/archives-many-objs.patch
 create mode 100644 pkgs/development/tools/build-managers/gnumake/3.82/construct-command-line.patch
 create mode 100644 pkgs/development/tools/build-managers/gnumake/3.82/copy-on-expand.patch
 create mode 100644 pkgs/development/tools/build-managers/gnumake/3.82/darwin-library_search-dylib.patch
 create mode 100644 pkgs/development/tools/build-managers/gnumake/3.82/default.nix
 create mode 100644 pkgs/development/tools/build-managers/gnumake/3.82/glob-speedup.patch
 create mode 100644 pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch
 create mode 100644 pkgs/development/tools/build-managers/gnumake/3.82/intermediate-parallel.patch
 create mode 100644 pkgs/development/tools/build-managers/gnumake/3.82/log.patch
 create mode 100644 pkgs/development/tools/build-managers/gnumake/3.82/long-command-line.patch
 create mode 100644 pkgs/development/tools/build-managers/gnumake/3.82/memory-corruption.patch
 create mode 100644 pkgs/development/tools/build-managers/gnumake/3.82/oneshell.patch
 create mode 100644 pkgs/development/tools/build-managers/gnumake/3.82/parallel-remake.patch
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/MAKEFLAGS-reexec.patch
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/archives-many-objs.patch
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/construct-command-line.patch
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/copy-on-expand.patch
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/darwin-library_search-dylib.patch
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/default.nix
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/glob-speedup.patch
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/impure-dirs.patch
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/intermediate-parallel.patch
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/log-3.81.patch
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/log.patch
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/long-command-line.patch
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/memory-corruption.patch
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/oneshell.patch
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/parallel-remake.patch

(limited to 'pkgs')

diff --git a/pkgs/development/tools/build-managers/gnumake-3.80/default.nix b/pkgs/development/tools/build-managers/gnumake-3.80/default.nix
deleted file mode 100644
index b0926a7f531c..000000000000
--- a/pkgs/development/tools/build-managers/gnumake-3.80/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "gnumake-3.80";
-  src = fetchurl {
-    url = http://tarballs.nixos.org/make-3.80.tar.bz2;
-    md5 = "0bbd1df101bc0294d440471e50feca71";
-  };
-  patches = [./log.patch];
-}
diff --git a/pkgs/development/tools/build-managers/gnumake-3.80/log.patch b/pkgs/development/tools/build-managers/gnumake-3.80/log.patch
deleted file mode 100644
index fa90acfe8de5..000000000000
--- a/pkgs/development/tools/build-managers/gnumake-3.80/log.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -rc make-3.80-orig/job.c make-3.80/job.c
-*** make-3.80-orig/job.c	2002-08-10 03:27:17.000000000 +0200
---- make-3.80/job.c	2004-04-02 17:38:04.000000000 +0200
-***************
-*** 987,993 ****
-       appear.  */
-  
-    message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag))
-! 	   ? "%s" : (char *) 0, p);
-  
-    /* Tell update_goal_chain that a command has been started on behalf of
-       this target.  It is important that this happens here and not in
---- 987,993 ----
-       appear.  */
-  
-    message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag))
-! 	   ? "\e[3s\e[a%s\e[b" : (char *) 0, p);
-  
-    /* Tell update_goal_chain that a command has been started on behalf of
-       this target.  It is important that this happens here and not in
-diff -rc make-3.80-orig/main.c make-3.80/main.c
-*** make-3.80-orig/main.c	2002-08-10 03:27:17.000000000 +0200
---- make-3.80/main.c	2004-04-02 17:42:50.000000000 +0200
-***************
-*** 254,259 ****
---- 254,263 ----
-     they appear out of date or not.  */
-  
-  int always_make_flag = 0;
-+ 
-+ int logNestingStdout = 0;
-+ int logNestingStderr = 0;
-+ 
-  
-  /* The usage output.  We write it this way to make life easier for the
-     translators, especially those trying to translate to right-to-left
-***************
-*** 827,832 ****
---- 831,845 ----
-  }
-  
-  
-+ static void closeNesting()
-+ {
-+   while (logNestingStdout--)
-+     printf("\e[q");
-+   while (logNestingStderr--)
-+     fprintf(stderr, "\e[q");
-+ }
-+ 
-+ 
-  #ifndef _AMIGA
-  int
-  main (argc, argv, envp)
-***************
-*** 854,859 ****
---- 867,874 ----
-    no_default_sh_exe = 1;
-  #endif
-  
-+   atexit(closeNesting);
-+ 
-    default_goal_file = 0;
-    reading_file = 0;
-  
-***************
-*** 2782,2787 ****
---- 2797,2808 ----
-  
-    /* Use entire sentences to give the translators a fighting chance.  */
-  
-+   if (entering)
-+     {
-+       printf("\e[p");
-+       logNestingStdout++;
-+     }
-+   
-    if (makelevel == 0)
-      if (starting_directory == 0)
-        if (entering)
-***************
-*** 2810,2813 ****
---- 2831,2840 ----
-        else
-          printf (_("%s[%u]: Leaving directory `%s'\n"),
-                  program, makelevel, starting_directory);
-+ 
-+   if (!entering)
-+     {
-+       printf("\e[q");
-+       logNestingStdout--;
-+     }
-  }
-diff -rc make-3.80-orig/make.h make-3.80/make.h
-*** make-3.80-orig/make.h	2002-09-11 18:55:44.000000000 +0200
---- make-3.80/make.h	2004-04-02 17:42:15.000000000 +0200
-***************
-*** 559,562 ****
---- 559,567 ----
-  extern int atomic_stat PARAMS ((const char *file, struct stat *buf));
-  extern struct dirent *atomic_readdir PARAMS ((DIR *dir));
-  
-+ 
-  #endif
-+ 
-+ 
-+ extern int logNestingStdout;
-+ extern int logNestingStderr;
-diff -rc make-3.80-orig/remake.c make-3.80/remake.c
-*** make-3.80-orig/remake.c	2002-08-08 02:11:19.000000000 +0200
---- make-3.80/remake.c	2004-04-04 23:10:19.000000000 +0200
-***************
-*** 1049,1055 ****
---- 1049,1059 ----
-        /* The normal case: start some commands.  */
-        if (!touch_flag || file->cmds->any_recurse)
-  	{
-+           fprintf(stderr, "\e[pbuilding %s\n", file->name);
-+           logNestingStderr++;
-  	  execute_file_commands (file);
-+           fprintf(stderr, "\e[q");
-+           logNestingStderr--;
-  	  return;
-  	}
-  
diff --git a/pkgs/development/tools/build-managers/gnumake/3.80/default.nix b/pkgs/development/tools/build-managers/gnumake/3.80/default.nix
new file mode 100644
index 000000000000..b0926a7f531c
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/3.80/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "gnumake-3.80";
+  src = fetchurl {
+    url = http://tarballs.nixos.org/make-3.80.tar.bz2;
+    md5 = "0bbd1df101bc0294d440471e50feca71";
+  };
+  patches = [./log.patch];
+}
diff --git a/pkgs/development/tools/build-managers/gnumake/3.80/log.patch b/pkgs/development/tools/build-managers/gnumake/3.80/log.patch
new file mode 100644
index 000000000000..fa90acfe8de5
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/3.80/log.patch
@@ -0,0 +1,125 @@
+diff -rc make-3.80-orig/job.c make-3.80/job.c
+*** make-3.80-orig/job.c	2002-08-10 03:27:17.000000000 +0200
+--- make-3.80/job.c	2004-04-02 17:38:04.000000000 +0200
+***************
+*** 987,993 ****
+       appear.  */
+  
+    message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag))
+! 	   ? "%s" : (char *) 0, p);
+  
+    /* Tell update_goal_chain that a command has been started on behalf of
+       this target.  It is important that this happens here and not in
+--- 987,993 ----
+       appear.  */
+  
+    message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag))
+! 	   ? "\e[3s\e[a%s\e[b" : (char *) 0, p);
+  
+    /* Tell update_goal_chain that a command has been started on behalf of
+       this target.  It is important that this happens here and not in
+diff -rc make-3.80-orig/main.c make-3.80/main.c
+*** make-3.80-orig/main.c	2002-08-10 03:27:17.000000000 +0200
+--- make-3.80/main.c	2004-04-02 17:42:50.000000000 +0200
+***************
+*** 254,259 ****
+--- 254,263 ----
+     they appear out of date or not.  */
+  
+  int always_make_flag = 0;
++ 
++ int logNestingStdout = 0;
++ int logNestingStderr = 0;
++ 
+  
+  /* The usage output.  We write it this way to make life easier for the
+     translators, especially those trying to translate to right-to-left
+***************
+*** 827,832 ****
+--- 831,845 ----
+  }
+  
+  
++ static void closeNesting()
++ {
++   while (logNestingStdout--)
++     printf("\e[q");
++   while (logNestingStderr--)
++     fprintf(stderr, "\e[q");
++ }
++ 
++ 
+  #ifndef _AMIGA
+  int
+  main (argc, argv, envp)
+***************
+*** 854,859 ****
+--- 867,874 ----
+    no_default_sh_exe = 1;
+  #endif
+  
++   atexit(closeNesting);
++ 
+    default_goal_file = 0;
+    reading_file = 0;
+  
+***************
+*** 2782,2787 ****
+--- 2797,2808 ----
+  
+    /* Use entire sentences to give the translators a fighting chance.  */
+  
++   if (entering)
++     {
++       printf("\e[p");
++       logNestingStdout++;
++     }
++   
+    if (makelevel == 0)
+      if (starting_directory == 0)
+        if (entering)
+***************
+*** 2810,2813 ****
+--- 2831,2840 ----
+        else
+          printf (_("%s[%u]: Leaving directory `%s'\n"),
+                  program, makelevel, starting_directory);
++ 
++   if (!entering)
++     {
++       printf("\e[q");
++       logNestingStdout--;
++     }
+  }
+diff -rc make-3.80-orig/make.h make-3.80/make.h
+*** make-3.80-orig/make.h	2002-09-11 18:55:44.000000000 +0200
+--- make-3.80/make.h	2004-04-02 17:42:15.000000000 +0200
+***************
+*** 559,562 ****
+--- 559,567 ----
+  extern int atomic_stat PARAMS ((const char *file, struct stat *buf));
+  extern struct dirent *atomic_readdir PARAMS ((DIR *dir));
+  
++ 
+  #endif
++ 
++ 
++ extern int logNestingStdout;
++ extern int logNestingStderr;
+diff -rc make-3.80-orig/remake.c make-3.80/remake.c
+*** make-3.80-orig/remake.c	2002-08-08 02:11:19.000000000 +0200
+--- make-3.80/remake.c	2004-04-04 23:10:19.000000000 +0200
+***************
+*** 1049,1055 ****
+--- 1049,1059 ----
+        /* The normal case: start some commands.  */
+        if (!touch_flag || file->cmds->any_recurse)
+  	{
++           fprintf(stderr, "\e[pbuilding %s\n", file->name);
++           logNestingStderr++;
+  	  execute_file_commands (file);
++           fprintf(stderr, "\e[q");
++           logNestingStderr--;
+  	  return;
+  	}
+  
diff --git a/pkgs/development/tools/build-managers/gnumake/3.81.nix b/pkgs/development/tools/build-managers/gnumake/3.81.nix
deleted file mode 100644
index 56d2326c916b..000000000000
--- a/pkgs/development/tools/build-managers/gnumake/3.81.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{stdenv, fetchurl}:
-
-let version = "3.81"; in
-stdenv.mkDerivation {
-  name = "gnumake-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnu/make/make-${version}.tar.bz2";
-    md5 = "354853e0b2da90c527e35aabb8d6f1e6";
-  };
-
-  doCheck = true;
-
-  patches =
-    [
-      # Provide nested log output for subsequent pretty-printing by
-      # nix-log2xml.
-      ./log-3.81.patch
-
-      # Purity: don't look for library dependencies (of the form
-      # `-lfoo') in /lib and /usr/lib.  It's a stupid feature anyway.
-      # Likewise, when searching for included Makefiles, don't look in
-      # /usr/include and friends.
-      ./impure-dirs.patch
-    ];
-  patchFlags = "-p0";
-
-  meta = {
-    description = "GNU Make, a program controlling the generation of non-source files from sources";
-
-    longDescription =
-      '' Make is a tool which controls the generation of executables and
-         other non-source files of a program from the program's source files.
-
-         Make gets its knowledge of how to build your program from a file
-         called the makefile, which lists each of the non-source files and
-         how to compute it from other files. When you write a program, you
-         should write a makefile for it, so that it is possible to use Make
-         to build and install the program.
-      '';
-
-    homepage = http://www.gnu.org/software/make/;
-
-    license = "GPLv2+";
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-  };
-}
diff --git a/pkgs/development/tools/build-managers/gnumake/3.81/default.nix b/pkgs/development/tools/build-managers/gnumake/3.81/default.nix
new file mode 100644
index 000000000000..56d2326c916b
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/3.81/default.nix
@@ -0,0 +1,47 @@
+{stdenv, fetchurl}:
+
+let version = "3.81"; in
+stdenv.mkDerivation {
+  name = "gnumake-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnu/make/make-${version}.tar.bz2";
+    md5 = "354853e0b2da90c527e35aabb8d6f1e6";
+  };
+
+  doCheck = true;
+
+  patches =
+    [
+      # Provide nested log output for subsequent pretty-printing by
+      # nix-log2xml.
+      ./log-3.81.patch
+
+      # Purity: don't look for library dependencies (of the form
+      # `-lfoo') in /lib and /usr/lib.  It's a stupid feature anyway.
+      # Likewise, when searching for included Makefiles, don't look in
+      # /usr/include and friends.
+      ./impure-dirs.patch
+    ];
+  patchFlags = "-p0";
+
+  meta = {
+    description = "GNU Make, a program controlling the generation of non-source files from sources";
+
+    longDescription =
+      '' Make is a tool which controls the generation of executables and
+         other non-source files of a program from the program's source files.
+
+         Make gets its knowledge of how to build your program from a file
+         called the makefile, which lists each of the non-source files and
+         how to compute it from other files. When you write a program, you
+         should write a makefile for it, so that it is possible to use Make
+         to build and install the program.
+      '';
+
+    homepage = http://www.gnu.org/software/make/;
+
+    license = "GPLv2+";
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}
diff --git a/pkgs/development/tools/build-managers/gnumake/3.81/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/3.81/impure-dirs.patch
new file mode 100644
index 000000000000..f6646f1d0126
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/3.81/impure-dirs.patch
@@ -0,0 +1,34 @@
+diff -rc read.c read.c
+*** read.c	2006-03-17 15:24:20.000000000 +0100
+--- read.c	2007-05-24 17:16:31.000000000 +0200
+***************
+*** 99,107 ****
+--- 99,109 ----
+  #endif
+      INCLUDEDIR,
+  #ifndef _AMIGA
++ #if 0    
+      "/usr/gnu/include",
+      "/usr/local/include",
+      "/usr/include",
++ #endif    
+  #endif
+      0
+    };
+diff -rc reremake.c
+*** remake.c	2006-03-20 03:36:37.000000000 +0100
+--- remake.c	2007-05-24 17:06:54.000000000 +0200
+***************
+*** 1452,1460 ****
+--- 1452,1462 ----
+    static char *dirs[] =
+      {
+  #ifndef _AMIGA
++ #if 0
+        "/lib",
+        "/usr/lib",
+  #endif
++ #endif
+  #if defined(WINDOWS32) && !defined(LIBDIR)
+  /*
+   * This is completely up to the user at product install time. Just define
diff --git a/pkgs/development/tools/build-managers/gnumake/3.81/log-3.81.patch b/pkgs/development/tools/build-managers/gnumake/3.81/log-3.81.patch
new file mode 100644
index 000000000000..b98d85a08265
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/3.81/log-3.81.patch
@@ -0,0 +1,125 @@
+diff -rc job.c job.c
+*** job.c	2006-03-20 04:03:04.000000000 +0100
+--- job.c	2009-01-19 19:37:28.000000000 +0100
+***************
+*** 1083,1089 ****
+       appear.  */
+  
+    message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag))
+! 	   ? "%s" : (char *) 0, p);
+  
+    /* Tell update_goal_chain that a command has been started on behalf of
+       this target.  It is important that this happens here and not in
+--- 1083,1089 ----
+       appear.  */
+  
+    message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag))
+!           ? (enable_nested_output ? "\e[3s\e[a%s\e[b" : "%s") : (char *) 0, p);
+  
+    /* Tell update_goal_chain that a command has been started on behalf of
+       this target.  It is important that this happens here and not in
+diff -rc main.c main.c
+*** main.c	2006-03-20 03:36:37.000000000 +0100
+--- main.c	2009-01-19 19:41:41.000000000 +0100
+***************
+*** 886,891 ****
+--- 886,900 ----
+  }
+  
+  
++ static void close_nesting()
++ {
++   while (stdout_nesting_level--)
++     printf("\e[q");
++   while (stderr_nesting_level--)
++     fprintf(stderr, "\e[q");
++ }
++ 
++ 
+  #ifdef _AMIGA
+  int
+  main (int argc, char **argv)
+***************
+*** 931,936 ****
+--- 940,950 ----
+    atexit (close_stdout);
+  #endif
+  
++   atexit(close_nesting);
++ 
++   if (getenv("NIX_INDENT_MAKE"))
++     enable_nested_output = 1;
++ 
+    /* Needed for OS/2 */
+    initialize_main(&argc, &argv);
+  
+***************
+*** 3095,3100 ****
+--- 3109,3120 ----
+  
+    /* Use entire sentences to give the translators a fighting chance.  */
+  
++   if (entering && enable_nested_output)
++     {
++       printf("\e[p");
++       stdout_nesting_level++;
++     }
++   
+    if (makelevel == 0)
+      if (starting_directory == 0)
+        if (entering)
+***************
+*** 3124,3129 ****
+--- 3144,3159 ----
+          printf (_("%s[%u]: Leaving directory `%s'\n"),
+                  program, makelevel, starting_directory);
+  
++   if (!entering && enable_nested_output)
++     {
++       printf("\e[q");
++       stdout_nesting_level--;
++     }
++  
+    /* Flush stdout to be sure this comes before any stderr output.  */
+    fflush (stdout);
+  }
++ 
++ int enable_nested_output = 0;
++ int stdout_nesting_level = 0;
++ int stderr_nesting_level = 0;
+diff -rc make.h
+*** make.h	2006-02-16 00:54:43.000000000 +0100
+--- make.h	2009-01-19 19:32:03.000000000 +0100
+***************
+*** 609,611 ****
+--- 609,614 ----
+  #define ENULLLOOP(_v,_c)   do{ errno = 0; \
+                                 while (((_v)=_c)==0 && errno==EINTR); }while(0)
+  
++ extern int enable_nested_output;
++ extern int stdout_nesting_level;
++ extern int stderr_nesting_level;
+diff -rc reremake.c
+*** remake.c	2006-03-20 03:36:37.000000000 +0100
+--- remake.c	2009-01-19 19:39:40.000000000 +0100
+***************
+*** 1120,1126 ****
+--- 1120,1137 ----
+        /* The normal case: start some commands.  */
+        if (!touch_flag || file->cmds->any_recurse)
+  	{
++           if (enable_nested_output) 
++             {
++               log_working_directory (1);
++               fprintf(stderr, "\e[pbuilding %s\n", file->name);
++               stderr_nesting_level++;
++             }
+  	  execute_file_commands (file);
++           if (enable_nested_output) 
++             {
++               fprintf(stderr, "\e[q");
++               stderr_nesting_level--;
++             }
+  	  return;
+  	}
+  
diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/MAKEFLAGS-reexec.patch b/pkgs/development/tools/build-managers/gnumake/3.82/MAKEFLAGS-reexec.patch
new file mode 100644
index 000000000000..a2f59657d4ca
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/MAKEFLAGS-reexec.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/331975
+https://savannah.gnu.org/bugs/?30723
+
+--- main.c	2010/07/19 07:10:53	1.243
++++ main.c	2010/08/10 07:35:34	1.244
+@@ -2093,7 +2093,7 @@
+             const char *pv = define_makeflags (1, 1);
+             char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
+             sprintf (p, "MAKEFLAGS=%s", pv);
+-            putenv (p);
++            putenv (allocated_variable_expand (p));
+           }
+ 
+ 	  if (ISDB (DB_BASIC))
diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/archives-many-objs.patch b/pkgs/development/tools/build-managers/gnumake/3.82/archives-many-objs.patch
new file mode 100644
index 000000000000..73c0381ced45
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/archives-many-objs.patch
@@ -0,0 +1,48 @@
+diff -u -p -r1.193 -r1.194
+--- read.c	13 Jul 2010 01:20:42 -0000	1.193
++++ read.c	14 Aug 2010 02:50:14 -0000	1.194
+@@ -3028,7 +3028,7 @@ parse_file_seq (char **stringp, unsigned
+             {
+               /* This looks like the first element in an open archive group.
+                  A valid group MUST have ')' as the last character.  */
+-              const char *e = p + nlen;
++              const char *e = p;
+               do
+                 {
+                   e = next_token (e);
+@@ -3084,19 +3084,19 @@ parse_file_seq (char **stringp, unsigned
+          Go to the next item in the string.  */
+       if (flags & PARSEFS_NOGLOB)
+         {
+-          NEWELT (concat (2, prefix, tp));
++          NEWELT (concat (2, prefix, tmpbuf));
+           continue;
+         }
+ 
+       /* If we get here we know we're doing glob expansion.
+          TP is a string in tmpbuf.  NLEN is no longer used.
+          We may need to do more work: after this NAME will be set.  */
+-      name = tp;
++      name = tmpbuf;
+ 
+       /* Expand tilde if applicable.  */
+-      if (tp[0] == '~')
++      if (tmpbuf[0] == '~')
+ 	{
+-	  tildep = tilde_expand (tp);
++	  tildep = tilde_expand (tmpbuf);
+ 	  if (tildep != 0)
+             name = tildep;
+ 	}
+@@ -3152,7 +3152,10 @@ parse_file_seq (char **stringp, unsigned
+             else
+               {
+                 /* We got a chain of items.  Attach them.  */
+-                (*newp)->next = found;
++                if (*newp)
++                  (*newp)->next = found;
++                else
++                  *newp = found;
+ 
+                 /* Find and set the new end.  Massage names if necessary.  */
+                 while (1)
diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/construct-command-line.patch b/pkgs/development/tools/build-managers/gnumake/3.82/construct-command-line.patch
new file mode 100644
index 000000000000..aa4a1afe3fd0
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/construct-command-line.patch
@@ -0,0 +1,71 @@
+https://savannah.gnu.org/bugs/?23922
+
+From 6f3684710a0f832533191f8657a57bc2fbba90ba Mon Sep 17 00:00:00 2001
+From: eliz <eliz>
+Date: Sat, 7 May 2011 08:29:13 +0000
+Subject: [PATCH]  job.c (construct_command_argv_internal): Don't assume
+ shellflags  is always non-NULL.  Escape-protect characters
+ special to the  shell when copying the value of SHELL into
+ new_line.  Fixes  Savannah bug #23922.
+
+---
+ ChangeLog |  7 +++++++
+ job.c     | 23 ++++++++++++++++-------
+ 2 files changed, 23 insertions(+), 7 deletions(-)
+
+diff --git job.c job.c
+index 67b402d..c2ce84d 100644
+--- job.c
++++ job.c
+@@ -2844,12 +2844,12 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
+ 
+     unsigned int shell_len = strlen (shell);
+     unsigned int line_len = strlen (line);
+-    unsigned int sflags_len = strlen (shellflags);
++    unsigned int sflags_len = shellflags ? strlen (shellflags) : 0;
+     char *command_ptr = NULL; /* used for batch_mode_shell mode */
+     char *new_line;
+ 
+ # ifdef __EMX__ /* is this necessary? */
+-    if (!unixy_shell)
++    if (!unixy_shell && shellflags)
+       shellflags[0] = '/'; /* "/c" */
+ # endif
+ 
+@@ -2911,19 +2911,28 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
+ 
+ 	new_argv = xmalloc (4 * sizeof (char *));
+ 	new_argv[0] = xstrdup(shell);
+-	new_argv[1] = xstrdup(shellflags);
++	new_argv[1] = xstrdup(shellflags ? shellflags : "");
+ 	new_argv[2] = line;
+ 	new_argv[3] = NULL;
+ 	return new_argv;
+       }
+ 
+-    new_line = alloca (shell_len + 1 + sflags_len + 1
++    new_line = alloca ((shell_len*2) + 1 + sflags_len + 1
+                              + (line_len*2) + 1);
+     ap = new_line;
+-    memcpy (ap, shell, shell_len);
+-    ap += shell_len;
++    /* Copy SHELL, escaping any characters special to the shell.  If
++       we don't escape them, construct_command_argv_internal will
++       recursively call itself ad nauseam, or until stack overflow,
++       whichever happens first.  */
++    for (p = shell; *p != '\0'; ++p)
++      {
++	if (strchr (sh_chars, *p) != 0)
++	  *(ap++) = '\\';
++	*(ap++) = *p;
++      }
+     *(ap++) = ' ';
+-    memcpy (ap, shellflags, sflags_len);
++    if (shellflags)
++      memcpy (ap, shellflags, sflags_len);
+     ap += sflags_len;
+     *(ap++) = ' ';
+     command_ptr = ap;
+-- 
+1.7.12
+
diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/copy-on-expand.patch b/pkgs/development/tools/build-managers/gnumake/3.82/copy-on-expand.patch
new file mode 100644
index 000000000000..3f202b4db96b
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/copy-on-expand.patch
@@ -0,0 +1,58 @@
+fix from upstream cvs
+
+----------------------------
+revision 1.58
+date: 2011-08-29 12:20:19 -0400;  author: psmith;  state: Exp;  lines: +7 -13;  commitid: MdH0jSxpuIy7mqxv;
+Save strings we're expanding in case an embedded eval causes them
+to be freed (if they're the value of a variable that's reset for example).
+See Savannah patch #7534
+
+Index: expand.c
+===================================================================
+RCS file: /sources/make/make/expand.c,v
+retrieving revision 1.57
+retrieving revision 1.58
+diff -u -p -r1.57 -r1.58
+--- expand.c	7 May 2011 20:03:49 -0000	1.57
++++ expand.c	29 Aug 2011 16:20:19 -0000	1.58
+@@ -197,7 +197,7 @@ variable_expand_string (char *line, cons
+ {
+   struct variable *v;
+   const char *p, *p1;
+-  char *abuf = NULL;
++  char *save;
+   char *o;
+   unsigned int line_offset;
+ 
+@@ -212,16 +212,11 @@ variable_expand_string (char *line, cons
+       return (variable_buffer);
+     }
+ 
+-  /* If we want a subset of the string, allocate a temporary buffer for it.
+-     Most of the functions we use here don't work with length limits.  */
+-  if (length > 0 && string[length] != '\0')
+-    {
+-      abuf = xmalloc(length+1);
+-      memcpy(abuf, string, length);
+-      abuf[length] = '\0';
+-      string = abuf;
+-    }
+-  p = string;
++  /* We need a copy of STRING: due to eval, it's possible that it will get
++     freed as we process it (it might be the value of a variable that's reset
++     for example).  Also having a nil-terminated string is handy.  */
++  save = length < 0 ? xstrdup (string) : xstrndup (string, length);
++  p = save;
+ 
+   while (1)
+     {
+@@ -411,8 +406,7 @@ variable_expand_string (char *line, cons
+       ++p;
+     }
+ 
+-  if (abuf)
+-    free (abuf);
++  free (save);
+ 
+   variable_buffer_output (o, "", 1);
+   return (variable_buffer + line_offset);
diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/darwin-library_search-dylib.patch b/pkgs/development/tools/build-managers/gnumake/3.82/darwin-library_search-dylib.patch
new file mode 100644
index 000000000000..de7e4f615212
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/darwin-library_search-dylib.patch
@@ -0,0 +1,17 @@
+Fixed default libpatttern on Darwin, imported from prefix overlay.
+Got merged upstream:
+https://savannah.gnu.org/bugs/?37197
+--- default.c.orig	2009-05-02 12:25:24 +0200
++++ default.c	2009-05-02 12:25:58 +0200
+@@ -509,7 +509,11 @@
+ #ifdef __MSDOS__
+     ".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a",
+ #else
++#ifdef __APPLE__
++    ".LIBPATTERNS", "lib%.dylib lib%.a",
++#else
+     ".LIBPATTERNS", "lib%.so lib%.a",
++#endif
+ #endif
+ #endif
+ 
diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix
new file mode 100644
index 000000000000..4f3c7defa488
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix
@@ -0,0 +1,63 @@
+{stdenv, fetchurl}:
+
+let version = "3.82"; in
+stdenv.mkDerivation {
+  name = "gnumake-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnu/make/make-${version}.tar.bz2";
+    sha256 = "0ri98385hsd7li6rh4l5afcq92v8l2lgiaz85wgcfh4w2wzsghg2";
+  };
+
+  /* On Darwin, there are 3 test failures that haven't been investigated
+     yet.  */
+  doCheck = !stdenv.isDarwin && !stdenv.isFreeBSD;
+
+  patches =
+    [
+      # Provide nested log output for subsequent pretty-printing by
+      # nix-log2xml.
+      ./log.patch
+
+      # Purity: don't look for library dependencies (of the form
+      # `-lfoo') in /lib and /usr/lib.  It's a stupid feature anyway.
+      # Likewise, when searching for included Makefiles, don't look in
+      # /usr/include and friends.
+      ./impure-dirs.patch
+
+      # a bunch of patches from Gentoo, mostly should be from upstream (unreleased)
+      ./archives-many-objs.patch
+      ./MAKEFLAGS-reexec.patch
+      ./memory-corruption.patch
+      ./glob-speedup.patch
+      ./copy-on-expand.patch
+      ./oneshell.patch
+      ./parallel-remake.patch
+      ./intermediate-parallel.patch
+      ./construct-command-line.patch
+      ./long-command-line.patch
+      ./darwin-library_search-dylib.patch
+    ];
+  patchFlags = "-p0";
+
+  meta = {
+    description = "GNU Make, a program controlling the generation of non-source files from sources";
+
+    longDescription =
+      '' Make is a tool which controls the generation of executables and
+         other non-source files of a program from the program's source files.
+
+         Make gets its knowledge of how to build your program from a file
+         called the makefile, which lists each of the non-source files and
+         how to compute it from other files. When you write a program, you
+         should write a makefile for it, so that it is possible to use Make
+         to build and install the program.
+      '';
+
+    homepage = http://www.gnu.org/software/make/;
+
+    license = "GPLv3+";
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/glob-speedup.patch b/pkgs/development/tools/build-managers/gnumake/3.82/glob-speedup.patch
new file mode 100644
index 000000000000..45971f33590b
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/glob-speedup.patch
@@ -0,0 +1,104 @@
+change from upstream to speed up by skipping unused globs
+https://bugs.gentoo.org/382845
+
+http://cvs.savannah.gnu.org/viewvc/make/read.c?root=make&r1=1.198&r2=1.200
+
+Revision 1.200
+Sat May 7 14:36:12 2011 UTC (4 months, 1 week ago) by psmith 
+Branch: MAIN 
+Changes since 1.199: +1 -1 lines 
+Inverted the boolean test from what I wanted it to be.  Added a
+regression test to make sure this continues to work.
+
+Revision 1.199
+Mon May 2 00:18:06 2011 UTC (4 months, 2 weeks ago) by psmith 
+Branch: MAIN 
+Changes since 1.198: +35 -25 lines 
+Avoid invoking glob() unless the filename has potential globbing
+characters in it, for performance improvements.
+
+--- read.c	2011/04/29 15:27:39	1.198
++++ read.c	2011/05/07 14:36:12	1.200
+@@ -2901,6 +2901,7 @@
+       const char *name;
+       const char **nlist = 0;
+       char *tildep = 0;
++      int globme = 1;
+ #ifndef NO_ARCHIVES
+       char *arname = 0;
+       char *memname = 0;
+@@ -3109,32 +3110,40 @@
+ 	}
+ #endif /* !NO_ARCHIVES */
+ 
+-      switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
+-	{
+-	case GLOB_NOSPACE:
+-	  fatal (NILF, _("virtual memory exhausted"));
+-
+-	case 0:
+-          /* Success.  */
+-          i = gl.gl_pathc;
+-          nlist = (const char **)gl.gl_pathv;
+-          break;
+-
+-        case GLOB_NOMATCH:
+-          /* If we want only existing items, skip this one.  */
+-          if (flags & PARSEFS_EXISTS)
+-            {
+-              i = 0;
+-              break;
+-            }
+-          /* FALLTHROUGH */
+-
+-	default:
+-          /* By default keep this name.  */
++      /* glob() is expensive: don't call it unless we need to.  */
++      if (!(flags & PARSEFS_EXISTS) && strpbrk (name, "?*[") == NULL)
++        {
++          globme = 0;
+           i = 1;
+           nlist = &name;
+-          break;
+-	}
++        }
++      else
++        switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
++          {
++          case GLOB_NOSPACE:
++            fatal (NILF, _("virtual memory exhausted"));
++
++          case 0:
++            /* Success.  */
++            i = gl.gl_pathc;
++            nlist = (const char **)gl.gl_pathv;
++            break;
++
++          case GLOB_NOMATCH:
++            /* If we want only existing items, skip this one.  */
++            if (flags & PARSEFS_EXISTS)
++              {
++                i = 0;
++                break;
++              }
++            /* FALLTHROUGH */
++
++          default:
++            /* By default keep this name.  */
++            i = 1;
++            nlist = &name;
++            break;
++          }
+ 
+       /* For each matched element, add it to the list.  */
+       while (i-- > 0)
+@@ -3174,7 +3183,8 @@
+ #endif /* !NO_ARCHIVES */
+           NEWELT (concat (2, prefix, nlist[i]));
+ 
+-      globfree (&gl);
++      if (globme)
++        globfree (&gl);
+ 
+ #ifndef NO_ARCHIVES
+       if (arname)
diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch
new file mode 100644
index 000000000000..f6646f1d0126
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch
@@ -0,0 +1,34 @@
+diff -rc read.c read.c
+*** read.c	2006-03-17 15:24:20.000000000 +0100
+--- read.c	2007-05-24 17:16:31.000000000 +0200
+***************
+*** 99,107 ****
+--- 99,109 ----
+  #endif
+      INCLUDEDIR,
+  #ifndef _AMIGA
++ #if 0    
+      "/usr/gnu/include",
+      "/usr/local/include",
+      "/usr/include",
++ #endif    
+  #endif
+      0
+    };
+diff -rc reremake.c
+*** remake.c	2006-03-20 03:36:37.000000000 +0100
+--- remake.c	2007-05-24 17:06:54.000000000 +0200
+***************
+*** 1452,1460 ****
+--- 1452,1462 ----
+    static char *dirs[] =
+      {
+  #ifndef _AMIGA
++ #if 0
+        "/lib",
+        "/usr/lib",
+  #endif
++ #endif
+  #if defined(WINDOWS32) && !defined(LIBDIR)
+  /*
+   * This is completely up to the user at product install time. Just define
diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/intermediate-parallel.patch b/pkgs/development/tools/build-managers/gnumake/3.82/intermediate-parallel.patch
new file mode 100644
index 000000000000..9bb7add0bde2
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/intermediate-parallel.patch
@@ -0,0 +1,46 @@
+diff --git remake.c remake.c
+index c0bf709..b1ddd23 100644
+--- remake.c
++++ remake.c
+@@ -612,6 +612,10 @@ update_file_1 (struct file *file, unsigned int depth)
+                 d->file->dontcare = file->dontcare;
+               }
+ 
++            /* We may have already considered this file, when we didn't know
++               we'd need to update it.  Force update_file() to consider it and
++               not prune it.  */
++            d->file->considered = !considered;
+ 
+ 	    dep_status |= update_file (d->file, depth);
+ 
+diff --git tests/scripts/features/parallelism tests/scripts/features/parallelism
+index d4250f0..76d24a7 100644
+--- tests/scripts/features/parallelism
++++ tests/scripts/features/parallelism
+@@ -214,6 +214,23 @@ rm main.x");
+     rmfiles(qw(foo.y foo.y.in main.bar));
+ }
+ 
++# Ensure intermediate/secondary files are not pruned incorrectly.
++# See Savannah bug #30653
++
++utouch(-15, 'file2');
++utouch(-10, 'file4');
++utouch(-5,  'file1');
++
++run_make_test(q!
++.INTERMEDIATE: file3
++file4: file3 ; @mv -f $< $@
++file3: file2 ; touch $@
++file2: file1 ; @touch $@
++!,
++              '--no-print-directory -j2', "touch file3");
++
++#rmfiles('file1', 'file2', 'file3', 'file4');
++
+ if ($all_tests) {
+     # Jobserver FD handling is messed up in some way.
+     # Savannah bug #28189
+-- 
+1.7.12
+
diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/log.patch b/pkgs/development/tools/build-managers/gnumake/3.82/log.patch
new file mode 100644
index 000000000000..e6197fd8e78f
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/log.patch
@@ -0,0 +1,125 @@
+diff -rc job.c job.c
+*** job.c	2006-03-20 04:03:04.000000000 +0100
+--- job.c	2009-01-19 19:37:28.000000000 +0100
+***************
+*** 1083,1089 ****
+       appear.  */
+  
+    message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag))
+! 	   ? "%s" : (char *) 0, p);
+  
+    /* Tell update_goal_chain that a command has been started on behalf of
+       this target.  It is important that this happens here and not in
+--- 1083,1089 ----
+       appear.  */
+  
+    message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag))
+!           ? (enable_nested_output ? "\e[3s\e[a%s\e[b" : "%s") : (char *) 0, p);
+  
+    /* Tell update_goal_chain that a command has been started on behalf of
+       this target.  It is important that this happens here and not in
+diff -rc main.c main.c
+*** main.c	2006-03-20 03:36:37.000000000 +0100
+--- main.c	2009-01-19 19:41:41.000000000 +0100
+***************
+*** 886,891 ****
+--- 886,900 ----
+  }
+  
+  
++ static void close_nesting()
++ {
++   while (stdout_nesting_level--)
++     printf("\e[q");
++   while (stderr_nesting_level--)
++     fprintf(stderr, "\e[q");
++ }
++ 
++ 
+  #ifdef _AMIGA
+  int
+  main (int argc, char **argv)
+***************
+*** 931,936 ****
+--- 940,950 ----
+    atexit (close_stdout);
+  #endif
+  
++   atexit(close_nesting);
++ 
++   if (getenv("NIX_INDENT_MAKE"))
++     enable_nested_output = 1;
++ 
+    /* Needed for OS/2 */
+    initialize_main(&argc, &argv);
+  
+***************
+*** 3095,3100 ****
+--- 3109,3120 ----
+  
+    /* Use entire sentences to give the translators a fighting chance.  */
+  
++   if (entering && enable_nested_output)
++     {
++       printf("\e[p");
++       stdout_nesting_level++;
++     }
++   
+    if (makelevel == 0)
+      if (starting_directory == 0)
+        if (entering)
+***************
+*** 3124,3129 ****
+--- 3144,3159 ----
+          printf (_("%s[%u]: Leaving directory `%s'\n"),
+                  program, makelevel, starting_directory);
+  
++   if (!entering && enable_nested_output)
++     {
++       printf("\e[q");
++       stdout_nesting_level--;
++     }
++  
+    /* Flush stdout to be sure this comes before any stderr output.  */
+    fflush (stdout);
+  }
++ 
++ int enable_nested_output = 0;
++ int stdout_nesting_level = 0;
++ int stderr_nesting_level = 0;
+diff -rc make.h
+*** make.h	2006-02-16 00:54:43.000000000 +0100
+--- make.h	2009-01-19 19:32:03.000000000 +0100
+***************
+*** 609,611 ****
+--- 609,614 ----
+  
+  #define ENULLLOOP(_v,_c)   do { errno = 0; (_v) = _c; } \
+                             while((_v)==0 && errno==EINTR)
++ extern int enable_nested_output;
++ extern int stdout_nesting_level;
++ extern int stderr_nesting_level;
+diff -rc reremake.c
+*** remake.c	2006-03-20 03:36:37.000000000 +0100
+--- remake.c	2009-01-19 19:39:40.000000000 +0100
+***************
+*** 1120,1126 ****
+--- 1120,1137 ----
+        /* The normal case: start some commands.  */
+        if (!touch_flag || file->cmds->any_recurse)
+  	{
++           if (enable_nested_output) 
++             {
++               log_working_directory (1);
++               fprintf(stderr, "\e[pbuilding %s\n", file->name);
++               stderr_nesting_level++;
++             }
+  	  execute_file_commands (file);
++           if (enable_nested_output) 
++             {
++               fprintf(stderr, "\e[q");
++               stderr_nesting_level--;
++             }
+  	  return;
+  	}
+  
diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/long-command-line.patch b/pkgs/development/tools/build-managers/gnumake/3.82/long-command-line.patch
new file mode 100644
index 000000000000..39ea05843bfd
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/long-command-line.patch
@@ -0,0 +1,54 @@
+https://savannah.gnu.org/bugs/?36451
+
+From a95796de3a491d8acfc8ea94c217b90531161786 Mon Sep 17 00:00:00 2001
+From: psmith <psmith>
+Date: Sun, 9 Sep 2012 23:25:07 +0000
+Subject: [PATCH] Keep the command line on the heap to avoid stack overflow.
+ Fixes Savannah bug #36451.
+
+---
+ ChangeLog |  3 +++
+ job.c     | 13 +++++++++----
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git job.c job.c
+index 754576b..f7b7d51 100644
+--- job.c
++++ job.c
+@@ -2984,8 +2984,8 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
+ 	return new_argv;
+       }
+ 
+-    new_line = alloca ((shell_len*2) + 1 + sflags_len + 1
+-                             + (line_len*2) + 1);
++    new_line = xmalloc ((shell_len*2) + 1 + sflags_len + 1
++                        + (line_len*2) + 1);
+     ap = new_line;
+     /* Copy SHELL, escaping any characters special to the shell.  If
+        we don't escape them, construct_command_argv_internal will
+@@ -3052,8 +3052,11 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
+ 	*ap++ = *p;
+       }
+     if (ap == new_line + shell_len + sflags_len + 2)
+-      /* Line was empty.  */
+-      return 0;
++      {
++        /* Line was empty.  */
++        free (new_line);
++        return 0;
++      }
+     *ap = '\0';
+ 
+ #ifdef WINDOWS32
+@@ -3194,6 +3197,8 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
+       fatal (NILF, _("%s (line %d) Bad shell context (!unixy && !batch_mode_shell)\n"),
+             __FILE__, __LINE__);
+ #endif
++
++    free (new_line);
+   }
+ #endif	/* ! AMIGA */
+ 
+-- 
+1.7.12
+
diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/memory-corruption.patch b/pkgs/development/tools/build-managers/gnumake/3.82/memory-corruption.patch
new file mode 100644
index 000000000000..b28c07353ec2
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/memory-corruption.patch
@@ -0,0 +1,37 @@
+--- function.c	2011/04/18 01:25:20	1.121
++++ function.c	2011/05/02 12:35:01	1.122
+@@ -706,7 +706,7 @@
+   const char *word_iterator = argv[0];
+   char buf[20];
+ 
+-  while (find_next_token (&word_iterator, (unsigned int *) 0) != 0)
++  while (find_next_token (&word_iterator, NULL) != 0)
+     ++i;
+ 
+   sprintf (buf, "%d", i);
+@@ -1133,21 +1133,14 @@
+ 
+   /* Find the maximum number of words we'll have.  */
+   t = argv[0];
+-  wordi = 1;
+-  while (*t != '\0')
++  wordi = 0;
++  while ((p = find_next_token (&t, NULL)) != 0)
+     {
+-      char c = *(t++);
+-
+-      if (! isspace ((unsigned char)c))
+-        continue;
+-
++      ++t;
+       ++wordi;
+-
+-      while (isspace ((unsigned char)*t))
+-        ++t;
+     }
+ 
+-  words = xmalloc (wordi * sizeof (char *));
++  words = xmalloc ((wordi == 0 ? 1 : wordi) * sizeof (char *));
+ 
+   /* Now assign pointers to each string in the array.  */
+   t = argv[0];
diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/oneshell.patch b/pkgs/development/tools/build-managers/gnumake/3.82/oneshell.patch
new file mode 100644
index 000000000000..fbade127ce61
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/oneshell.patch
@@ -0,0 +1,24 @@
+fix from upstream cvs
+
+----------------------------
+revision 1.245
+date: 2010-08-13 22:50:14 -0400;  author: psmith;  state: Exp;  lines: +1 -1;  commitid: 4UaslPqQHZTs5wKu;
+- Add oneshell to $(.FEATURES) (forgot that!)
+
+Index: main.c
+===================================================================
+RCS file: /sources/make/make/main.c,v
+retrieving revision 1.244
+retrieving revision 1.245
+diff -u -p -r1.244 -r1.245
+--- main.c	10 Aug 2010 07:35:34 -0000	1.244
++++ main.c	14 Aug 2010 02:50:14 -0000	1.245
+@@ -1138,7 +1138,7 @@ main (int argc, char **argv, char **envp
+      a macro and some compilers (MSVC) don't like conditionals in macros.  */
+   {
+     const char *features = "target-specific order-only second-expansion"
+-                           " else-if shortest-stem undefine"
++                           " else-if shortest-stem undefine oneshell"
+ #ifndef NO_ARCHIVES
+                            " archives"
+ #endif
diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/parallel-remake.patch b/pkgs/development/tools/build-managers/gnumake/3.82/parallel-remake.patch
new file mode 100644
index 000000000000..a19fe7b7d629
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/parallel-remake.patch
@@ -0,0 +1,39 @@
+fix from upstream cvs
+
+----------------------------
+revision 1.247
+date: 2011-09-18 19:39:26 -0400;  author: psmith;  state: Exp;  lines: +5 -3;  commitid: 07NxO4T5PiWC82Av;
+When we re-exec the master makefile in a jobserver environment, ensure
+that MAKEFLAGS is set properly so the re-exec'd make runs in parallel.
+See Savannah bug #33873.
+
+Index: main.c
+===================================================================
+RCS file: /sources/make/make/main.c,v
+retrieving revision 1.246
+retrieving revision 1.247
+diff -u -p -r1.246 -r1.247
+--- main.c	29 Aug 2010 23:05:27 -0000	1.246
++++ main.c	18 Sep 2011 23:39:26 -0000	1.247
+@@ -2089,6 +2089,11 @@ main (int argc, char **argv, char **envp
+ 
+           ++restarts;
+ 
++          /* If we're re-exec'ing the first make, put back the number of
++             job slots so define_makefiles() will get it right.  */
++          if (master_job_slots)
++            job_slots = master_job_slots;
++
+           /* Reset makeflags in case they were changed.  */
+           {
+             const char *pv = define_makeflags (1, 1);
+@@ -2825,9 +2830,6 @@ define_makeflags (int all, int makefile)
+ 		       && (*(unsigned int *) cs->value_ptr ==
+ 			   *(unsigned int *) cs->noarg_value))
+ 		ADD_FLAG ("", 0); /* Optional value omitted; see below.  */
+-	      else if (cs->c == 'j')
+-		/* Special case for `-j'.  */
+-		ADD_FLAG ("1", 1);
+ 	      else
+ 		{
+ 		  char *buf = alloca (30);
diff --git a/pkgs/development/tools/build-managers/gnumake/MAKEFLAGS-reexec.patch b/pkgs/development/tools/build-managers/gnumake/MAKEFLAGS-reexec.patch
deleted file mode 100644
index a2f59657d4ca..000000000000
--- a/pkgs/development/tools/build-managers/gnumake/MAKEFLAGS-reexec.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugs.gentoo.org/331975
-https://savannah.gnu.org/bugs/?30723
-
---- main.c	2010/07/19 07:10:53	1.243
-+++ main.c	2010/08/10 07:35:34	1.244
-@@ -2093,7 +2093,7 @@
-             const char *pv = define_makeflags (1, 1);
-             char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
-             sprintf (p, "MAKEFLAGS=%s", pv);
--            putenv (p);
-+            putenv (allocated_variable_expand (p));
-           }
- 
- 	  if (ISDB (DB_BASIC))
diff --git a/pkgs/development/tools/build-managers/gnumake/archives-many-objs.patch b/pkgs/development/tools/build-managers/gnumake/archives-many-objs.patch
deleted file mode 100644
index 73c0381ced45..000000000000
--- a/pkgs/development/tools/build-managers/gnumake/archives-many-objs.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -u -p -r1.193 -r1.194
---- read.c	13 Jul 2010 01:20:42 -0000	1.193
-+++ read.c	14 Aug 2010 02:50:14 -0000	1.194
-@@ -3028,7 +3028,7 @@ parse_file_seq (char **stringp, unsigned
-             {
-               /* This looks like the first element in an open archive group.
-                  A valid group MUST have ')' as the last character.  */
--              const char *e = p + nlen;
-+              const char *e = p;
-               do
-                 {
-                   e = next_token (e);
-@@ -3084,19 +3084,19 @@ parse_file_seq (char **stringp, unsigned
-          Go to the next item in the string.  */
-       if (flags & PARSEFS_NOGLOB)
-         {
--          NEWELT (concat (2, prefix, tp));
-+          NEWELT (concat (2, prefix, tmpbuf));
-           continue;
-         }
- 
-       /* If we get here we know we're doing glob expansion.
-          TP is a string in tmpbuf.  NLEN is no longer used.
-          We may need to do more work: after this NAME will be set.  */
--      name = tp;
-+      name = tmpbuf;
- 
-       /* Expand tilde if applicable.  */
--      if (tp[0] == '~')
-+      if (tmpbuf[0] == '~')
- 	{
--	  tildep = tilde_expand (tp);
-+	  tildep = tilde_expand (tmpbuf);
- 	  if (tildep != 0)
-             name = tildep;
- 	}
-@@ -3152,7 +3152,10 @@ parse_file_seq (char **stringp, unsigned
-             else
-               {
-                 /* We got a chain of items.  Attach them.  */
--                (*newp)->next = found;
-+                if (*newp)
-+                  (*newp)->next = found;
-+                else
-+                  *newp = found;
- 
-                 /* Find and set the new end.  Massage names if necessary.  */
-                 while (1)
diff --git a/pkgs/development/tools/build-managers/gnumake/construct-command-line.patch b/pkgs/development/tools/build-managers/gnumake/construct-command-line.patch
deleted file mode 100644
index aa4a1afe3fd0..000000000000
--- a/pkgs/development/tools/build-managers/gnumake/construct-command-line.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-https://savannah.gnu.org/bugs/?23922
-
-From 6f3684710a0f832533191f8657a57bc2fbba90ba Mon Sep 17 00:00:00 2001
-From: eliz <eliz>
-Date: Sat, 7 May 2011 08:29:13 +0000
-Subject: [PATCH]  job.c (construct_command_argv_internal): Don't assume
- shellflags  is always non-NULL.  Escape-protect characters
- special to the  shell when copying the value of SHELL into
- new_line.  Fixes  Savannah bug #23922.
-
----
- ChangeLog |  7 +++++++
- job.c     | 23 ++++++++++++++++-------
- 2 files changed, 23 insertions(+), 7 deletions(-)
-
-diff --git job.c job.c
-index 67b402d..c2ce84d 100644
---- job.c
-+++ job.c
-@@ -2844,12 +2844,12 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
- 
-     unsigned int shell_len = strlen (shell);
-     unsigned int line_len = strlen (line);
--    unsigned int sflags_len = strlen (shellflags);
-+    unsigned int sflags_len = shellflags ? strlen (shellflags) : 0;
-     char *command_ptr = NULL; /* used for batch_mode_shell mode */
-     char *new_line;
- 
- # ifdef __EMX__ /* is this necessary? */
--    if (!unixy_shell)
-+    if (!unixy_shell && shellflags)
-       shellflags[0] = '/'; /* "/c" */
- # endif
- 
-@@ -2911,19 +2911,28 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
- 
- 	new_argv = xmalloc (4 * sizeof (char *));
- 	new_argv[0] = xstrdup(shell);
--	new_argv[1] = xstrdup(shellflags);
-+	new_argv[1] = xstrdup(shellflags ? shellflags : "");
- 	new_argv[2] = line;
- 	new_argv[3] = NULL;
- 	return new_argv;
-       }
- 
--    new_line = alloca (shell_len + 1 + sflags_len + 1
-+    new_line = alloca ((shell_len*2) + 1 + sflags_len + 1
-                              + (line_len*2) + 1);
-     ap = new_line;
--    memcpy (ap, shell, shell_len);
--    ap += shell_len;
-+    /* Copy SHELL, escaping any characters special to the shell.  If
-+       we don't escape them, construct_command_argv_internal will
-+       recursively call itself ad nauseam, or until stack overflow,
-+       whichever happens first.  */
-+    for (p = shell; *p != '\0'; ++p)
-+      {
-+	if (strchr (sh_chars, *p) != 0)
-+	  *(ap++) = '\\';
-+	*(ap++) = *p;
-+      }
-     *(ap++) = ' ';
--    memcpy (ap, shellflags, sflags_len);
-+    if (shellflags)
-+      memcpy (ap, shellflags, sflags_len);
-     ap += sflags_len;
-     *(ap++) = ' ';
-     command_ptr = ap;
--- 
-1.7.12
-
diff --git a/pkgs/development/tools/build-managers/gnumake/copy-on-expand.patch b/pkgs/development/tools/build-managers/gnumake/copy-on-expand.patch
deleted file mode 100644
index 3f202b4db96b..000000000000
--- a/pkgs/development/tools/build-managers/gnumake/copy-on-expand.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-fix from upstream cvs
-
-----------------------------
-revision 1.58
-date: 2011-08-29 12:20:19 -0400;  author: psmith;  state: Exp;  lines: +7 -13;  commitid: MdH0jSxpuIy7mqxv;
-Save strings we're expanding in case an embedded eval causes them
-to be freed (if they're the value of a variable that's reset for example).
-See Savannah patch #7534
-
-Index: expand.c
-===================================================================
-RCS file: /sources/make/make/expand.c,v
-retrieving revision 1.57
-retrieving revision 1.58
-diff -u -p -r1.57 -r1.58
---- expand.c	7 May 2011 20:03:49 -0000	1.57
-+++ expand.c	29 Aug 2011 16:20:19 -0000	1.58
-@@ -197,7 +197,7 @@ variable_expand_string (char *line, cons
- {
-   struct variable *v;
-   const char *p, *p1;
--  char *abuf = NULL;
-+  char *save;
-   char *o;
-   unsigned int line_offset;
- 
-@@ -212,16 +212,11 @@ variable_expand_string (char *line, cons
-       return (variable_buffer);
-     }
- 
--  /* If we want a subset of the string, allocate a temporary buffer for it.
--     Most of the functions we use here don't work with length limits.  */
--  if (length > 0 && string[length] != '\0')
--    {
--      abuf = xmalloc(length+1);
--      memcpy(abuf, string, length);
--      abuf[length] = '\0';
--      string = abuf;
--    }
--  p = string;
-+  /* We need a copy of STRING: due to eval, it's possible that it will get
-+     freed as we process it (it might be the value of a variable that's reset
-+     for example).  Also having a nil-terminated string is handy.  */
-+  save = length < 0 ? xstrdup (string) : xstrndup (string, length);
-+  p = save;
- 
-   while (1)
-     {
-@@ -411,8 +406,7 @@ variable_expand_string (char *line, cons
-       ++p;
-     }
- 
--  if (abuf)
--    free (abuf);
-+  free (save);
- 
-   variable_buffer_output (o, "", 1);
-   return (variable_buffer + line_offset);
diff --git a/pkgs/development/tools/build-managers/gnumake/darwin-library_search-dylib.patch b/pkgs/development/tools/build-managers/gnumake/darwin-library_search-dylib.patch
deleted file mode 100644
index de7e4f615212..000000000000
--- a/pkgs/development/tools/build-managers/gnumake/darwin-library_search-dylib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fixed default libpatttern on Darwin, imported from prefix overlay.
-Got merged upstream:
-https://savannah.gnu.org/bugs/?37197
---- default.c.orig	2009-05-02 12:25:24 +0200
-+++ default.c	2009-05-02 12:25:58 +0200
-@@ -509,7 +509,11 @@
- #ifdef __MSDOS__
-     ".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a",
- #else
-+#ifdef __APPLE__
-+    ".LIBPATTERNS", "lib%.dylib lib%.a",
-+#else
-     ".LIBPATTERNS", "lib%.so lib%.a",
-+#endif
- #endif
- #endif
- 
diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix
deleted file mode 100644
index 4f3c7defa488..000000000000
--- a/pkgs/development/tools/build-managers/gnumake/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{stdenv, fetchurl}:
-
-let version = "3.82"; in
-stdenv.mkDerivation {
-  name = "gnumake-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnu/make/make-${version}.tar.bz2";
-    sha256 = "0ri98385hsd7li6rh4l5afcq92v8l2lgiaz85wgcfh4w2wzsghg2";
-  };
-
-  /* On Darwin, there are 3 test failures that haven't been investigated
-     yet.  */
-  doCheck = !stdenv.isDarwin && !stdenv.isFreeBSD;
-
-  patches =
-    [
-      # Provide nested log output for subsequent pretty-printing by
-      # nix-log2xml.
-      ./log.patch
-
-      # Purity: don't look for library dependencies (of the form
-      # `-lfoo') in /lib and /usr/lib.  It's a stupid feature anyway.
-      # Likewise, when searching for included Makefiles, don't look in
-      # /usr/include and friends.
-      ./impure-dirs.patch
-
-      # a bunch of patches from Gentoo, mostly should be from upstream (unreleased)
-      ./archives-many-objs.patch
-      ./MAKEFLAGS-reexec.patch
-      ./memory-corruption.patch
-      ./glob-speedup.patch
-      ./copy-on-expand.patch
-      ./oneshell.patch
-      ./parallel-remake.patch
-      ./intermediate-parallel.patch
-      ./construct-command-line.patch
-      ./long-command-line.patch
-      ./darwin-library_search-dylib.patch
-    ];
-  patchFlags = "-p0";
-
-  meta = {
-    description = "GNU Make, a program controlling the generation of non-source files from sources";
-
-    longDescription =
-      '' Make is a tool which controls the generation of executables and
-         other non-source files of a program from the program's source files.
-
-         Make gets its knowledge of how to build your program from a file
-         called the makefile, which lists each of the non-source files and
-         how to compute it from other files. When you write a program, you
-         should write a makefile for it, so that it is possible to use Make
-         to build and install the program.
-      '';
-
-    homepage = http://www.gnu.org/software/make/;
-
-    license = "GPLv3+";
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/development/tools/build-managers/gnumake/glob-speedup.patch b/pkgs/development/tools/build-managers/gnumake/glob-speedup.patch
deleted file mode 100644
index 45971f33590b..000000000000
--- a/pkgs/development/tools/build-managers/gnumake/glob-speedup.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-change from upstream to speed up by skipping unused globs
-https://bugs.gentoo.org/382845
-
-http://cvs.savannah.gnu.org/viewvc/make/read.c?root=make&r1=1.198&r2=1.200
-
-Revision 1.200
-Sat May 7 14:36:12 2011 UTC (4 months, 1 week ago) by psmith 
-Branch: MAIN 
-Changes since 1.199: +1 -1 lines 
-Inverted the boolean test from what I wanted it to be.  Added a
-regression test to make sure this continues to work.
-
-Revision 1.199
-Mon May 2 00:18:06 2011 UTC (4 months, 2 weeks ago) by psmith 
-Branch: MAIN 
-Changes since 1.198: +35 -25 lines 
-Avoid invoking glob() unless the filename has potential globbing
-characters in it, for performance improvements.
-
---- read.c	2011/04/29 15:27:39	1.198
-+++ read.c	2011/05/07 14:36:12	1.200
-@@ -2901,6 +2901,7 @@
-       const char *name;
-       const char **nlist = 0;
-       char *tildep = 0;
-+      int globme = 1;
- #ifndef NO_ARCHIVES
-       char *arname = 0;
-       char *memname = 0;
-@@ -3109,32 +3110,40 @@
- 	}
- #endif /* !NO_ARCHIVES */
- 
--      switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
--	{
--	case GLOB_NOSPACE:
--	  fatal (NILF, _("virtual memory exhausted"));
--
--	case 0:
--          /* Success.  */
--          i = gl.gl_pathc;
--          nlist = (const char **)gl.gl_pathv;
--          break;
--
--        case GLOB_NOMATCH:
--          /* If we want only existing items, skip this one.  */
--          if (flags & PARSEFS_EXISTS)
--            {
--              i = 0;
--              break;
--            }
--          /* FALLTHROUGH */
--
--	default:
--          /* By default keep this name.  */
-+      /* glob() is expensive: don't call it unless we need to.  */
-+      if (!(flags & PARSEFS_EXISTS) && strpbrk (name, "?*[") == NULL)
-+        {
-+          globme = 0;
-           i = 1;
-           nlist = &name;
--          break;
--	}
-+        }
-+      else
-+        switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
-+          {
-+          case GLOB_NOSPACE:
-+            fatal (NILF, _("virtual memory exhausted"));
-+
-+          case 0:
-+            /* Success.  */
-+            i = gl.gl_pathc;
-+            nlist = (const char **)gl.gl_pathv;
-+            break;
-+
-+          case GLOB_NOMATCH:
-+            /* If we want only existing items, skip this one.  */
-+            if (flags & PARSEFS_EXISTS)
-+              {
-+                i = 0;
-+                break;
-+              }
-+            /* FALLTHROUGH */
-+
-+          default:
-+            /* By default keep this name.  */
-+            i = 1;
-+            nlist = &name;
-+            break;
-+          }
- 
-       /* For each matched element, add it to the list.  */
-       while (i-- > 0)
-@@ -3174,7 +3183,8 @@
- #endif /* !NO_ARCHIVES */
-           NEWELT (concat (2, prefix, nlist[i]));
- 
--      globfree (&gl);
-+      if (globme)
-+        globfree (&gl);
- 
- #ifndef NO_ARCHIVES
-       if (arname)
diff --git a/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch
deleted file mode 100644
index f6646f1d0126..000000000000
--- a/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -rc read.c read.c
-*** read.c	2006-03-17 15:24:20.000000000 +0100
---- read.c	2007-05-24 17:16:31.000000000 +0200
-***************
-*** 99,107 ****
---- 99,109 ----
-  #endif
-      INCLUDEDIR,
-  #ifndef _AMIGA
-+ #if 0    
-      "/usr/gnu/include",
-      "/usr/local/include",
-      "/usr/include",
-+ #endif    
-  #endif
-      0
-    };
-diff -rc reremake.c
-*** remake.c	2006-03-20 03:36:37.000000000 +0100
---- remake.c	2007-05-24 17:06:54.000000000 +0200
-***************
-*** 1452,1460 ****
---- 1452,1462 ----
-    static char *dirs[] =
-      {
-  #ifndef _AMIGA
-+ #if 0
-        "/lib",
-        "/usr/lib",
-  #endif
-+ #endif
-  #if defined(WINDOWS32) && !defined(LIBDIR)
-  /*
-   * This is completely up to the user at product install time. Just define
diff --git a/pkgs/development/tools/build-managers/gnumake/intermediate-parallel.patch b/pkgs/development/tools/build-managers/gnumake/intermediate-parallel.patch
deleted file mode 100644
index 9bb7add0bde2..000000000000
--- a/pkgs/development/tools/build-managers/gnumake/intermediate-parallel.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git remake.c remake.c
-index c0bf709..b1ddd23 100644
---- remake.c
-+++ remake.c
-@@ -612,6 +612,10 @@ update_file_1 (struct file *file, unsigned int depth)
-                 d->file->dontcare = file->dontcare;
-               }
- 
-+            /* We may have already considered this file, when we didn't know
-+               we'd need to update it.  Force update_file() to consider it and
-+               not prune it.  */
-+            d->file->considered = !considered;
- 
- 	    dep_status |= update_file (d->file, depth);
- 
-diff --git tests/scripts/features/parallelism tests/scripts/features/parallelism
-index d4250f0..76d24a7 100644
---- tests/scripts/features/parallelism
-+++ tests/scripts/features/parallelism
-@@ -214,6 +214,23 @@ rm main.x");
-     rmfiles(qw(foo.y foo.y.in main.bar));
- }
- 
-+# Ensure intermediate/secondary files are not pruned incorrectly.
-+# See Savannah bug #30653
-+
-+utouch(-15, 'file2');
-+utouch(-10, 'file4');
-+utouch(-5,  'file1');
-+
-+run_make_test(q!
-+.INTERMEDIATE: file3
-+file4: file3 ; @mv -f $< $@
-+file3: file2 ; touch $@
-+file2: file1 ; @touch $@
-+!,
-+              '--no-print-directory -j2', "touch file3");
-+
-+#rmfiles('file1', 'file2', 'file3', 'file4');
-+
- if ($all_tests) {
-     # Jobserver FD handling is messed up in some way.
-     # Savannah bug #28189
--- 
-1.7.12
-
diff --git a/pkgs/development/tools/build-managers/gnumake/log-3.81.patch b/pkgs/development/tools/build-managers/gnumake/log-3.81.patch
deleted file mode 100644
index b98d85a08265..000000000000
--- a/pkgs/development/tools/build-managers/gnumake/log-3.81.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -rc job.c job.c
-*** job.c	2006-03-20 04:03:04.000000000 +0100
---- job.c	2009-01-19 19:37:28.000000000 +0100
-***************
-*** 1083,1089 ****
-       appear.  */
-  
-    message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag))
-! 	   ? "%s" : (char *) 0, p);
-  
-    /* Tell update_goal_chain that a command has been started on behalf of
-       this target.  It is important that this happens here and not in
---- 1083,1089 ----
-       appear.  */
-  
-    message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag))
-!           ? (enable_nested_output ? "\e[3s\e[a%s\e[b" : "%s") : (char *) 0, p);
-  
-    /* Tell update_goal_chain that a command has been started on behalf of
-       this target.  It is important that this happens here and not in
-diff -rc main.c main.c
-*** main.c	2006-03-20 03:36:37.000000000 +0100
---- main.c	2009-01-19 19:41:41.000000000 +0100
-***************
-*** 886,891 ****
---- 886,900 ----
-  }
-  
-  
-+ static void close_nesting()
-+ {
-+   while (stdout_nesting_level--)
-+     printf("\e[q");
-+   while (stderr_nesting_level--)
-+     fprintf(stderr, "\e[q");
-+ }
-+ 
-+ 
-  #ifdef _AMIGA
-  int
-  main (int argc, char **argv)
-***************
-*** 931,936 ****
---- 940,950 ----
-    atexit (close_stdout);
-  #endif
-  
-+   atexit(close_nesting);
-+ 
-+   if (getenv("NIX_INDENT_MAKE"))
-+     enable_nested_output = 1;
-+ 
-    /* Needed for OS/2 */
-    initialize_main(&argc, &argv);
-  
-***************
-*** 3095,3100 ****
---- 3109,3120 ----
-  
-    /* Use entire sentences to give the translators a fighting chance.  */
-  
-+   if (entering && enable_nested_output)
-+     {
-+       printf("\e[p");
-+       stdout_nesting_level++;
-+     }
-+   
-    if (makelevel == 0)
-      if (starting_directory == 0)
-        if (entering)
-***************
-*** 3124,3129 ****
---- 3144,3159 ----
-          printf (_("%s[%u]: Leaving directory `%s'\n"),
-                  program, makelevel, starting_directory);
-  
-+   if (!entering && enable_nested_output)
-+     {
-+       printf("\e[q");
-+       stdout_nesting_level--;
-+     }
-+  
-    /* Flush stdout to be sure this comes before any stderr output.  */
-    fflush (stdout);
-  }
-+ 
-+ int enable_nested_output = 0;
-+ int stdout_nesting_level = 0;
-+ int stderr_nesting_level = 0;
-diff -rc make.h
-*** make.h	2006-02-16 00:54:43.000000000 +0100
---- make.h	2009-01-19 19:32:03.000000000 +0100
-***************
-*** 609,611 ****
---- 609,614 ----
-  #define ENULLLOOP(_v,_c)   do{ errno = 0; \
-                                 while (((_v)=_c)==0 && errno==EINTR); }while(0)
-  
-+ extern int enable_nested_output;
-+ extern int stdout_nesting_level;
-+ extern int stderr_nesting_level;
-diff -rc reremake.c
-*** remake.c	2006-03-20 03:36:37.000000000 +0100
---- remake.c	2009-01-19 19:39:40.000000000 +0100
-***************
-*** 1120,1126 ****
---- 1120,1137 ----
-        /* The normal case: start some commands.  */
-        if (!touch_flag || file->cmds->any_recurse)
-  	{
-+           if (enable_nested_output) 
-+             {
-+               log_working_directory (1);
-+               fprintf(stderr, "\e[pbuilding %s\n", file->name);
-+               stderr_nesting_level++;
-+             }
-  	  execute_file_commands (file);
-+           if (enable_nested_output) 
-+             {
-+               fprintf(stderr, "\e[q");
-+               stderr_nesting_level--;
-+             }
-  	  return;
-  	}
-  
diff --git a/pkgs/development/tools/build-managers/gnumake/log.patch b/pkgs/development/tools/build-managers/gnumake/log.patch
deleted file mode 100644
index e6197fd8e78f..000000000000
--- a/pkgs/development/tools/build-managers/gnumake/log.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -rc job.c job.c
-*** job.c	2006-03-20 04:03:04.000000000 +0100
---- job.c	2009-01-19 19:37:28.000000000 +0100
-***************
-*** 1083,1089 ****
-       appear.  */
-  
-    message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag))
-! 	   ? "%s" : (char *) 0, p);
-  
-    /* Tell update_goal_chain that a command has been started on behalf of
-       this target.  It is important that this happens here and not in
---- 1083,1089 ----
-       appear.  */
-  
-    message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag))
-!           ? (enable_nested_output ? "\e[3s\e[a%s\e[b" : "%s") : (char *) 0, p);
-  
-    /* Tell update_goal_chain that a command has been started on behalf of
-       this target.  It is important that this happens here and not in
-diff -rc main.c main.c
-*** main.c	2006-03-20 03:36:37.000000000 +0100
---- main.c	2009-01-19 19:41:41.000000000 +0100
-***************
-*** 886,891 ****
---- 886,900 ----
-  }
-  
-  
-+ static void close_nesting()
-+ {
-+   while (stdout_nesting_level--)
-+     printf("\e[q");
-+   while (stderr_nesting_level--)
-+     fprintf(stderr, "\e[q");
-+ }
-+ 
-+ 
-  #ifdef _AMIGA
-  int
-  main (int argc, char **argv)
-***************
-*** 931,936 ****
---- 940,950 ----
-    atexit (close_stdout);
-  #endif
-  
-+   atexit(close_nesting);
-+ 
-+   if (getenv("NIX_INDENT_MAKE"))
-+     enable_nested_output = 1;
-+ 
-    /* Needed for OS/2 */
-    initialize_main(&argc, &argv);
-  
-***************
-*** 3095,3100 ****
---- 3109,3120 ----
-  
-    /* Use entire sentences to give the translators a fighting chance.  */
-  
-+   if (entering && enable_nested_output)
-+     {
-+       printf("\e[p");
-+       stdout_nesting_level++;
-+     }
-+   
-    if (makelevel == 0)
-      if (starting_directory == 0)
-        if (entering)
-***************
-*** 3124,3129 ****
---- 3144,3159 ----
-          printf (_("%s[%u]: Leaving directory `%s'\n"),
-                  program, makelevel, starting_directory);
-  
-+   if (!entering && enable_nested_output)
-+     {
-+       printf("\e[q");
-+       stdout_nesting_level--;
-+     }
-+  
-    /* Flush stdout to be sure this comes before any stderr output.  */
-    fflush (stdout);
-  }
-+ 
-+ int enable_nested_output = 0;
-+ int stdout_nesting_level = 0;
-+ int stderr_nesting_level = 0;
-diff -rc make.h
-*** make.h	2006-02-16 00:54:43.000000000 +0100
---- make.h	2009-01-19 19:32:03.000000000 +0100
-***************
-*** 609,611 ****
---- 609,614 ----
-  
-  #define ENULLLOOP(_v,_c)   do { errno = 0; (_v) = _c; } \
-                             while((_v)==0 && errno==EINTR)
-+ extern int enable_nested_output;
-+ extern int stdout_nesting_level;
-+ extern int stderr_nesting_level;
-diff -rc reremake.c
-*** remake.c	2006-03-20 03:36:37.000000000 +0100
---- remake.c	2009-01-19 19:39:40.000000000 +0100
-***************
-*** 1120,1126 ****
---- 1120,1137 ----
-        /* The normal case: start some commands.  */
-        if (!touch_flag || file->cmds->any_recurse)
-  	{
-+           if (enable_nested_output) 
-+             {
-+               log_working_directory (1);
-+               fprintf(stderr, "\e[pbuilding %s\n", file->name);
-+               stderr_nesting_level++;
-+             }
-  	  execute_file_commands (file);
-+           if (enable_nested_output) 
-+             {
-+               fprintf(stderr, "\e[q");
-+               stderr_nesting_level--;
-+             }
-  	  return;
-  	}
-  
diff --git a/pkgs/development/tools/build-managers/gnumake/long-command-line.patch b/pkgs/development/tools/build-managers/gnumake/long-command-line.patch
deleted file mode 100644
index 39ea05843bfd..000000000000
--- a/pkgs/development/tools/build-managers/gnumake/long-command-line.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://savannah.gnu.org/bugs/?36451
-
-From a95796de3a491d8acfc8ea94c217b90531161786 Mon Sep 17 00:00:00 2001
-From: psmith <psmith>
-Date: Sun, 9 Sep 2012 23:25:07 +0000
-Subject: [PATCH] Keep the command line on the heap to avoid stack overflow.
- Fixes Savannah bug #36451.
-
----
- ChangeLog |  3 +++
- job.c     | 13 +++++++++----
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git job.c job.c
-index 754576b..f7b7d51 100644
---- job.c
-+++ job.c
-@@ -2984,8 +2984,8 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
- 	return new_argv;
-       }
- 
--    new_line = alloca ((shell_len*2) + 1 + sflags_len + 1
--                             + (line_len*2) + 1);
-+    new_line = xmalloc ((shell_len*2) + 1 + sflags_len + 1
-+                        + (line_len*2) + 1);
-     ap = new_line;
-     /* Copy SHELL, escaping any characters special to the shell.  If
-        we don't escape them, construct_command_argv_internal will
-@@ -3052,8 +3052,11 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
- 	*ap++ = *p;
-       }
-     if (ap == new_line + shell_len + sflags_len + 2)
--      /* Line was empty.  */
--      return 0;
-+      {
-+        /* Line was empty.  */
-+        free (new_line);
-+        return 0;
-+      }
-     *ap = '\0';
- 
- #ifdef WINDOWS32
-@@ -3194,6 +3197,8 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
-       fatal (NILF, _("%s (line %d) Bad shell context (!unixy && !batch_mode_shell)\n"),
-             __FILE__, __LINE__);
- #endif
-+
-+    free (new_line);
-   }
- #endif	/* ! AMIGA */
- 
--- 
-1.7.12
-
diff --git a/pkgs/development/tools/build-managers/gnumake/memory-corruption.patch b/pkgs/development/tools/build-managers/gnumake/memory-corruption.patch
deleted file mode 100644
index b28c07353ec2..000000000000
--- a/pkgs/development/tools/build-managers/gnumake/memory-corruption.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- function.c	2011/04/18 01:25:20	1.121
-+++ function.c	2011/05/02 12:35:01	1.122
-@@ -706,7 +706,7 @@
-   const char *word_iterator = argv[0];
-   char buf[20];
- 
--  while (find_next_token (&word_iterator, (unsigned int *) 0) != 0)
-+  while (find_next_token (&word_iterator, NULL) != 0)
-     ++i;
- 
-   sprintf (buf, "%d", i);
-@@ -1133,21 +1133,14 @@
- 
-   /* Find the maximum number of words we'll have.  */
-   t = argv[0];
--  wordi = 1;
--  while (*t != '\0')
-+  wordi = 0;
-+  while ((p = find_next_token (&t, NULL)) != 0)
-     {
--      char c = *(t++);
--
--      if (! isspace ((unsigned char)c))
--        continue;
--
-+      ++t;
-       ++wordi;
--
--      while (isspace ((unsigned char)*t))
--        ++t;
-     }
- 
--  words = xmalloc (wordi * sizeof (char *));
-+  words = xmalloc ((wordi == 0 ? 1 : wordi) * sizeof (char *));
- 
-   /* Now assign pointers to each string in the array.  */
-   t = argv[0];
diff --git a/pkgs/development/tools/build-managers/gnumake/oneshell.patch b/pkgs/development/tools/build-managers/gnumake/oneshell.patch
deleted file mode 100644
index fbade127ce61..000000000000
--- a/pkgs/development/tools/build-managers/gnumake/oneshell.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-fix from upstream cvs
-
-----------------------------
-revision 1.245
-date: 2010-08-13 22:50:14 -0400;  author: psmith;  state: Exp;  lines: +1 -1;  commitid: 4UaslPqQHZTs5wKu;
-- Add oneshell to $(.FEATURES) (forgot that!)
-
-Index: main.c
-===================================================================
-RCS file: /sources/make/make/main.c,v
-retrieving revision 1.244
-retrieving revision 1.245
-diff -u -p -r1.244 -r1.245
---- main.c	10 Aug 2010 07:35:34 -0000	1.244
-+++ main.c	14 Aug 2010 02:50:14 -0000	1.245
-@@ -1138,7 +1138,7 @@ main (int argc, char **argv, char **envp
-      a macro and some compilers (MSVC) don't like conditionals in macros.  */
-   {
-     const char *features = "target-specific order-only second-expansion"
--                           " else-if shortest-stem undefine"
-+                           " else-if shortest-stem undefine oneshell"
- #ifndef NO_ARCHIVES
-                            " archives"
- #endif
diff --git a/pkgs/development/tools/build-managers/gnumake/parallel-remake.patch b/pkgs/development/tools/build-managers/gnumake/parallel-remake.patch
deleted file mode 100644
index a19fe7b7d629..000000000000
--- a/pkgs/development/tools/build-managers/gnumake/parallel-remake.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-fix from upstream cvs
-
-----------------------------
-revision 1.247
-date: 2011-09-18 19:39:26 -0400;  author: psmith;  state: Exp;  lines: +5 -3;  commitid: 07NxO4T5PiWC82Av;
-When we re-exec the master makefile in a jobserver environment, ensure
-that MAKEFLAGS is set properly so the re-exec'd make runs in parallel.
-See Savannah bug #33873.
-
-Index: main.c
-===================================================================
-RCS file: /sources/make/make/main.c,v
-retrieving revision 1.246
-retrieving revision 1.247
-diff -u -p -r1.246 -r1.247
---- main.c	29 Aug 2010 23:05:27 -0000	1.246
-+++ main.c	18 Sep 2011 23:39:26 -0000	1.247
-@@ -2089,6 +2089,11 @@ main (int argc, char **argv, char **envp
- 
-           ++restarts;
- 
-+          /* If we're re-exec'ing the first make, put back the number of
-+             job slots so define_makefiles() will get it right.  */
-+          if (master_job_slots)
-+            job_slots = master_job_slots;
-+
-           /* Reset makeflags in case they were changed.  */
-           {
-             const char *pv = define_makeflags (1, 1);
-@@ -2825,9 +2830,6 @@ define_makeflags (int all, int makefile)
- 		       && (*(unsigned int *) cs->value_ptr ==
- 			   *(unsigned int *) cs->noarg_value))
- 		ADD_FLAG ("", 0); /* Optional value omitted; see below.  */
--	      else if (cs->c == 'j')
--		/* Special case for `-j'.  */
--		ADD_FLAG ("1", 1);
- 	      else
- 		{
- 		  char *buf = alloca (30);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db76a4e55065..3bffbc5f2606 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3641,10 +3641,10 @@ let
 
   gnum4 = callPackage ../development/tools/misc/gnum4 { };
 
-  gnumake = callPackage ../development/tools/build-managers/gnumake { };
-
-  gnumake380 = callPackage ../development/tools/build-managers/gnumake-3.80 { };
-  gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81.nix { };
+  gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { };
+  gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81 { };
+  gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { };
+  gnumake = gnumake382;
 
   gob2 = callPackage ../development/tools/misc/gob2 { };
 
-- 
cgit 1.4.1


From e2f8c7a208da6c540516873ca10cbfd51a31287c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 16:09:43 +0100
Subject: all-packages.nix: strip trailing whitespace

---
 pkgs/top-level/all-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3bffbc5f2606..3566b63bb6c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8492,7 +8492,7 @@ let
     jackSupport = config.mumble.jackSupport or false;
   };
 
-  murmur = callPackage ../applications/networking/mumble/murmur.nix { 
+  murmur = callPackage ../applications/networking/mumble/murmur.nix {
     avahi = avahi.override {
       withLibdnssdCompat = true;
     };
@@ -9599,10 +9599,10 @@ let
 
 
   ### DESKTOP ENVIRONMENTS
-  
+
    cinnamon = recurseIntoAttrs {
     cinnamon-translations  = callPackage ../desktops/cinnamon/cinnamon-translations.nix { };
-    }; 
+    };
 
   enlightenment = callPackage ../desktops/enlightenment { };
 
-- 
cgit 1.4.1


From 6dfc18dc00c159a0ee579153a56811c5ece0905e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 16:14:41 +0100
Subject: gnumake: add version 4.0

---
 .../gnumake/4.0/darwin-library_search-dylib.patch  | 17 ++++++++
 .../tools/build-managers/gnumake/4.0/default.nix   | 49 ++++++++++++++++++++++
 .../build-managers/gnumake/4.0/impure-dirs.patch   | 34 +++++++++++++++
 pkgs/top-level/all-packages.nix                    |  1 +
 4 files changed, 101 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch
 create mode 100644 pkgs/development/tools/build-managers/gnumake/4.0/default.nix
 create mode 100644 pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch

(limited to 'pkgs')

diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch b/pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch
new file mode 100644
index 000000000000..de7e4f615212
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch
@@ -0,0 +1,17 @@
+Fixed default libpatttern on Darwin, imported from prefix overlay.
+Got merged upstream:
+https://savannah.gnu.org/bugs/?37197
+--- default.c.orig	2009-05-02 12:25:24 +0200
++++ default.c	2009-05-02 12:25:58 +0200
+@@ -509,7 +509,11 @@
+ #ifdef __MSDOS__
+     ".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a",
+ #else
++#ifdef __APPLE__
++    ".LIBPATTERNS", "lib%.dylib lib%.a",
++#else
+     ".LIBPATTERNS", "lib%.so lib%.a",
++#endif
+ #endif
+ #endif
+ 
diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/default.nix b/pkgs/development/tools/build-managers/gnumake/4.0/default.nix
new file mode 100644
index 000000000000..6a76fa0302b6
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/4.0/default.nix
@@ -0,0 +1,49 @@
+{stdenv, fetchurl}:
+
+let version = "4.0"; in
+stdenv.mkDerivation {
+  name = "gnumake-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnu/make/make-${version}.tar.bz2";
+    sha256 = "1nyvn8mknw0mf7727lprva3lisl1y0n03lvar342rrpdmz3qc1p6";
+  };
+
+  /* On Darwin, there are 3 test failures that haven't been investigated
+     yet.  */
+  doCheck = !stdenv.isDarwin && !stdenv.isFreeBSD;
+
+  patches =
+    [
+      # Purity: don't look for library dependencies (of the form
+      # `-lfoo') in /lib and /usr/lib.  It's a stupid feature anyway.
+      # Likewise, when searching for included Makefiles, don't look in
+      # /usr/include and friends.
+      ./impure-dirs.patch
+
+      # a bunch of patches from Gentoo, mostly should be from upstream (unreleased)
+      ./darwin-library_search-dylib.patch
+    ];
+  patchFlags = "-p0";
+
+  meta = {
+    description = "GNU Make, a program controlling the generation of non-source files from sources";
+
+    longDescription =
+      '' Make is a tool which controls the generation of executables and
+         other non-source files of a program from the program's source files.
+
+         Make gets its knowledge of how to build your program from a file
+         called the makefile, which lists each of the non-source files and
+         how to compute it from other files. When you write a program, you
+         should write a makefile for it, so that it is possible to use Make
+         to build and install the program.
+      '';
+
+    homepage = http://www.gnu.org/software/make/;
+
+    license = "GPLv3+";
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch
new file mode 100644
index 000000000000..f6646f1d0126
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch
@@ -0,0 +1,34 @@
+diff -rc read.c read.c
+*** read.c	2006-03-17 15:24:20.000000000 +0100
+--- read.c	2007-05-24 17:16:31.000000000 +0200
+***************
+*** 99,107 ****
+--- 99,109 ----
+  #endif
+      INCLUDEDIR,
+  #ifndef _AMIGA
++ #if 0    
+      "/usr/gnu/include",
+      "/usr/local/include",
+      "/usr/include",
++ #endif    
+  #endif
+      0
+    };
+diff -rc reremake.c
+*** remake.c	2006-03-20 03:36:37.000000000 +0100
+--- remake.c	2007-05-24 17:06:54.000000000 +0200
+***************
+*** 1452,1460 ****
+--- 1452,1462 ----
+    static char *dirs[] =
+      {
+  #ifndef _AMIGA
++ #if 0
+        "/lib",
+        "/usr/lib",
+  #endif
++ #endif
+  #if defined(WINDOWS32) && !defined(LIBDIR)
+  /*
+   * This is completely up to the user at product install time. Just define
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3566b63bb6c1..4887b05a2b6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3644,6 +3644,7 @@ let
   gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { };
   gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81 { };
   gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { };
+  gnumake40  = callPackage ../development/tools/build-managers/gnumake/4.0  { };
   gnumake = gnumake382;
 
   gob2 = callPackage ../development/tools/misc/gob2 { };
-- 
cgit 1.4.1


From 088f472fe5cf7c438645a1085b23a87b893bffbc Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 9 Dec 2013 11:37:03 -0500
Subject: Add oracle jdk 7

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/compilers/jdk/jdk7-linux.nix | 131 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   7 ++
 2 files changed, 138 insertions(+)
 create mode 100644 pkgs/development/compilers/jdk/jdk7-linux.nix

(limited to 'pkgs')

diff --git a/pkgs/development/compilers/jdk/jdk7-linux.nix b/pkgs/development/compilers/jdk/jdk7-linux.nix
new file mode 100644
index 000000000000..42a84fb16ab1
--- /dev/null
+++ b/pkgs/development/compilers/jdk/jdk7-linux.nix
@@ -0,0 +1,131 @@
+{ swingSupport ? true
+, stdenv
+, requireFile
+, xlibs ? null
+, installjdk ? true
+, pluginSupport ? true
+, installjce ? false
+}:
+
+assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
+assert swingSupport -> xlibs != null;
+
+let
+
+  /**
+   * The JRE libraries are in directories that depend on the CPU.
+   */
+  architecture =
+    if stdenv.system == "i686-linux" then
+      "i386"
+    else if stdenv.system == "x86_64-linux" then
+      "amd64"
+    else
+      abort "jdk requires i686-linux or x86_64 linux";
+
+  jce =
+    if installjce then
+      requireFile {
+        name = "UnlimitedJCEPolicyJDK7.zip";
+        url = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html;
+        sha256 = "0qljzfxbikm8br5k7rkamibp1vkyjrf6blbxpx6hn4k46f62bhnh";
+      }
+    else
+      null;
+in
+
+stdenv.mkDerivation {
+  name =
+    if installjdk then "jdk-1.7.0_45" else "jre-1.7.0_45";
+
+  src =
+    if stdenv.system == "i686-linux" then
+      requireFile {
+        name = "jdk-7u45-linux-i586.tar.gz";
+        url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
+        sha256 = "1q0nw2rwmavcrssyigq76p1h00hm8kd3rhb5bdv7rbdcs0jxrjsa";
+      }
+    else if stdenv.system == "x86_64-linux" then
+      requireFile {
+        name = "jdk-7u45-linux-x64.tar.gz";
+        url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
+        sha256 = "06jbz536zycqkdpc7zriay0jidmj9nriqva60afsgpv93kcf9spj";
+      }
+    else
+      abort "jdk requires i686-linux or x86_64 linux";
+
+  installPhase = ''
+    cd ..
+    if test -z "$installjdk"; then
+      mv $sourceRoot/jre $out
+    else
+      mv $sourceRoot $out
+    fi
+
+    for file in $out/*
+    do
+      if test -f $file ; then
+        rm $file
+      fi
+    done
+
+    if test -n "$installjdk"; then
+      for file in $out/jre/*
+      do
+        if test -f $file ; then
+          rm $file
+        fi
+      done
+    fi
+
+    # construct the rpath
+    rpath=
+    for i in $libraries; do
+        rpath=$rpath''${rpath:+:}$i/lib
+    done
+
+    if test -z "$installjdk"; then
+      jrePath=$out
+    else
+      jrePath=$out/jre
+    fi
+
+    if test -n "$jce"; then
+      unzip $jce
+      cp -v jce/*.jar $jrePath/lib/security
+    fi
+
+    rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/jli
+
+    # set all the dynamic linkers
+    find $out -type f -perm +100 \
+        -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+        --set-rpath "$rpath" {} \;
+
+    find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
+
+    if test -z "$pluginSupport"; then
+      rm -f $out/bin/javaws
+      if test -n "$installjdk"; then
+        rm -f $out/jre/bin/javaws
+      fi
+    fi
+
+    mkdir $jrePath/lib/${architecture}/plugins
+    ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins
+  '';
+
+  inherit installjdk pluginSupport;
+
+  /**
+   * libXt is only needed on amd64
+   */
+  libraries =
+    [stdenv.gcc.libc] ++
+    (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt] else []);
+
+  passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
+
+  meta.license = "unfree";
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4887b05a2b6b..3f9f1ccf0470 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2817,6 +2817,8 @@ let
 
   oraclejdk = pkgs.jdkdistro true false;
 
+  oraclejdk7 = pkgs.oraclejdk7distro true false;
+
   oraclejre = lowPrio (pkgs.jdkdistro false false);
 
   jrePlugin = lowPrio (pkgs.jdkdistro false true);
@@ -2830,6 +2832,11 @@ let
     (if pluginSupport then appendToName "plugin" else x: x)
       (callPackage ../development/compilers/jdk/jdk6-linux.nix { });
 
+  oraclejdk7distro = installjdk: pluginSupport:
+    assert supportsJDK;
+    (if pluginSupport then appendToName "plugin" else x: x)
+      (callPackage ../development/compilers/jdk/jdk7-linux.nix { inherit installjdk; });
+
   jikes = callPackage ../development/compilers/jikes { };
 
   julia = callPackage ../development/compilers/julia {
-- 
cgit 1.4.1


From 9131b45db45c2a2807f92a52f6cb23ea59c22578 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 9 Dec 2013 12:01:37 -0500
Subject: Linux 3.12.4

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index df5f596dc74e..842d2911f770 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.3";
+  version = "3.12.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "b649c759646a630893c98855fb7e9e87e954105e3acac7b81ca85b1161572713";
+    sha256 = "c56317810e5716dd2be7ad947a6bd174460f7cf9afb33b700a052aa91f73f9bb";
   };
 
   features.iwlwifi = true;
-- 
cgit 1.4.1


From ac21aa9a8295c60ac846abcb26e54878dabe2f4f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 9 Dec 2013 13:25:07 -0500
Subject: Unpacking jce requires zip

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/compilers/jdk/jdk7-linux.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'pkgs')

diff --git a/pkgs/development/compilers/jdk/jdk7-linux.nix b/pkgs/development/compilers/jdk/jdk7-linux.nix
index 42a84fb16ab1..a7a5eccee9d5 100644
--- a/pkgs/development/compilers/jdk/jdk7-linux.nix
+++ b/pkgs/development/compilers/jdk/jdk7-linux.nix
@@ -1,6 +1,7 @@
 { swingSupport ? true
 , stdenv
 , requireFile
+, unzip
 , xlibs ? null
 , installjdk ? true
 , pluginSupport ? true
@@ -54,6 +55,8 @@ stdenv.mkDerivation {
     else
       abort "jdk requires i686-linux or x86_64 linux";
 
+  buildInputs = if installjce then [ unzip ] else [];
+
   installPhase = ''
     cd ..
     if test -z "$installjdk"; then
-- 
cgit 1.4.1


From 5acb97b972e4905393cc3a5d5e8cc1c132155d50 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Mon, 9 Dec 2013 21:07:56 +0100
Subject: libopus: update 1.0.3 -> 1.1, enable tests

---
 pkgs/development/libraries/libopus/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index 11f7a370efa9..b1bf65d0fe67 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -1,15 +1,20 @@
 { stdenv, fetchurl, fixedPoint ? false }:
 
+let
+  version = "1.1";
+in
 stdenv.mkDerivation rec {
-  name = "libopus-1.0.3";
-  
+  name = "libopus-${version}";
+
   src = fetchurl {
-    url = "http://downloads.xiph.org/releases/opus/opus-1.0.3.tar.gz";
-    sha256 = "175l7hv7d03c4iz60g185nqvwrabc39ksil0d7g07i6vjaf0h6hr";
+    url = "http://downloads.xiph.org/releases/opus/opus-${version}.tar.gz";
+    sha256 = "158xprn2086arvdib3vbbygz7z6jqkw2nci7nlywzzwallap0wmr";
   };
 
   configureFlags = stdenv.lib.optionalString fixedPoint "--enable-fixed-point";
 
+  doCheck = true;
+
   meta = {
     description = "Open, royalty-free, highly versatile audio codec";
     license = "BSD";
-- 
cgit 1.4.1


From f36d5c162cfff50042decf19373aa596e0ba7132 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 22:11:30 +0100
Subject: rtorrent: update to version 0.9.3

This version is dubbed "unstable" and apparently it lacks the man page that
used to come with earlier releases. :-(

We need the latest version, though, because of the recent update to libtorrent.
---
 pkgs/tools/networking/p2p/rtorrent/default.nix | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix
index b503c1d91521..78eaf81e8191 100644
--- a/pkgs/tools/networking/p2p/rtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/rtorrent/default.nix
@@ -1,24 +1,22 @@
 { stdenv, fetchurl, libtorrent, ncurses, pkgconfig, libsigcxx, curl
-, zlib, openssl }:
+, zlib, openssl
+}:
 
-let
-  version = "0.9.2";
-in
-stdenv.mkDerivation {
-  name = "rtorrent-${version}";
+stdenv.mkDerivation rec {
+  name = "rtorrent-0.9.3";
 
   src = fetchurl {
-    url = "http://libtorrent.rakshasa.no/downloads/rtorrent-${version}.tar.gz";
-    sha256 = "5c8f8c780bee376afce3c1cde2f5ecb928f40bac23b2b8171deed5cf3c888c3d";
+    url = "http://libtorrent.rakshasa.no/downloads/${name}.tar.gz";
+    sha256 = "043krhsiawigf8yjd5qfkdn5iqrssph1705dsx5fgbxipr0wm4wy";
   };
 
   buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl ];
 
-  postInstall = ''
-    mkdir -p $out/share/man/man1 $out/share/rtorrent
-    mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1
-    mv doc/rtorrent.rc $out/share/rtorrent/rtorrent.rc
-  '';
+  # postInstall = ''
+  #   mkdir -p $out/share/man/man1 $out/share/rtorrent
+  #   mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1
+  #   mv doc/rtorrent.rc $out/share/rtorrent/rtorrent.rc
+  # '';
 
   meta = {
     homepage = "http://libtorrent.rakshasa.no/";
-- 
cgit 1.4.1


From 08a3ef19cdf53ae947abf05065d0c5b40e51fea1 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 12:14:14 +0200
Subject: dropbear: update from 2013.60 to 2013.62

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

(limited to 'pkgs')

diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index 933267eff23d..00e747da7c7e 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -2,11 +2,11 @@
 sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }:
 
 stdenv.mkDerivation rec {
-  name = "dropbear-2013.60";
+  name = "dropbear-2013.62";
 
   src = fetchurl {
     url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2";
-    sha256 = "1fw1hrcavfqjmsn34dhkrzh8w06yfqvfss2rkvvnxnad7d2m432c";
+    sha256 = "1ylz0zd68cxdgs4x4cpc2y8h75395y10bxb1qflv0m6cpc166rf6";
   };
 
   dontDisableStatic = enableStatic;
-- 
cgit 1.4.1


From 328d59eab6c2cdd94cb358d635fd6b4b64982e73 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 10 Dec 2013 00:51:04 +0200
Subject: add meta.repositories.git to several packages

---
 pkgs/applications/science/electronics/verilog/default.nix | 1 +
 pkgs/servers/memcached/default.nix                        | 1 +
 pkgs/tools/filesystems/dosfstools/default.nix             | 1 +
 pkgs/tools/misc/youtube-dl/default.nix                    | 1 +
 4 files changed, 4 insertions(+)

(limited to 'pkgs')

diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix
index 883e332a2671..f2c9d2e646f0 100644
--- a/pkgs/applications/science/electronics/verilog/default.nix
+++ b/pkgs/applications/science/electronics/verilog/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Icarus Verilog compiler";
+    repositories.git = https://github.com/steveicarus/iverilog.git;
     homepage = http://www.icarus.com;
     license = "GPLv2+";
     maintainers = with stdenv.lib.maintainers; [winden];
diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index 1c3c3f706e48..ef77c3191cab 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A distributed memory object caching system";
+    repositories.git = https://github.com/memcached/memcached.git;
     homepage = http://memcached.org/;
     license = "bsd";
     maintainers = [ stdenv.lib.maintainers.coconnor ];
diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index 7511d75dd1a5..b9f101059186 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Utilities for creating and checking FAT and VFAT file systems";
+    repositories.git = git://daniel-baumann.ch/git/software/dosfstools.git;
     homepage = http://www.daniel-baumann.ch/software/dosfstools/;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index bf9dc76bbc13..77d7efdb5f68 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://rg3.github.com/youtube-dl/";
+    repositories.git = https://github.com/rg3/youtube-dl.git;
     description = "Command-line tool to download videos from YouTube.com and other sites";
 
     platforms = with stdenv.lib.platforms; linux ++ darwin;
-- 
cgit 1.4.1


From 9e4a60d54e5a1c2604f2e379af2574751de96959 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 9 Dec 2013 23:11:50 +0000
Subject: haskellPackages.extensibleEffects: New expression

---
 .../libraries/haskell/extensible-effects/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/haskell-packages.nix                  |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/extensible-effects/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/haskell/extensible-effects/default.nix b/pkgs/development/libraries/haskell/extensible-effects/default.nix
new file mode 100644
index 000000000000..f97b5cd5e28c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/extensible-effects/default.nix
@@ -0,0 +1,20 @@
+{ cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "extensible-effects";
+  version = "1.2.1";
+  sha256 = "066977hjhcg44v47hkjpf2gs48xsry74l4h8hp753jsvbfsv0030";
+  testDepends = [
+    HUnit QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2
+  ];
+  meta = {
+    homepage = "https://github.com/RobotGymnast/extensible-effects";
+    description = "An Alternative to Monad Transformers";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 747ce660b511..b23b03a3edb0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -992,6 +992,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   fileLocation = callPackage ../development/libraries/haskell/file-location {};
 
+  extensibleEffects = callPackage ../development/libraries/haskell/extensible-effects {};
+
   extensibleExceptions_0_1_1_0 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.0.nix {};
   extensibleExceptions_0_1_1_2 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.2.nix {};
   extensibleExceptions_0_1_1_3 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.3.nix {};
-- 
cgit 1.4.1


From 7317135edc20ee57b2bcaaf717d645288208ca36 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 9 Dec 2013 23:13:44 +0000
Subject: haskellPackages.IntervalMap: New expression

---
 .../libraries/haskell/IntervalMap/default.nix            | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix                      |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/IntervalMap/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/haskell/IntervalMap/default.nix b/pkgs/development/libraries/haskell/IntervalMap/default.nix
new file mode 100644
index 000000000000..e2b94abd7c8d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/IntervalMap/default.nix
@@ -0,0 +1,16 @@
+{ cabal, Cabal, deepseq, QuickCheck }:
+
+cabal.mkDerivation (self: {
+  pname = "IntervalMap";
+  version = "0.3.0.2";
+  sha256 = "14pbq5n2cn9gxjkmqpnbn7dx9963wp3sdbb180wm9l5xqi338s0l";
+  buildDepends = [ deepseq ];
+  testDepends = [ Cabal deepseq QuickCheck ];
+  meta = {
+    homepage = "http://www.chr-breitkopf.de/comp/IntervalMap";
+    description = "Maps from Intervals to values, with efficient search";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 747ce660b511..c8dba1a891c8 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1361,6 +1361,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   intervals = callPackage ../development/libraries/haskell/intervals {};
 
+  IntervalMap = callPackage ../development/libraries/haskell/IntervalMap {};
+
   ioChoice = callPackage ../development/libraries/haskell/io-choice {};
 
   IORefCAS = callPackage ../development/libraries/haskell/IORefCAS {};
-- 
cgit 1.4.1


From 11668c9273f37e0f7ed2b775373463311d174b89 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 9 Dec 2013 23:32:00 +0000
Subject: haskellPackages.exPool: New expression

---
 pkgs/development/libraries/haskell/ex-pool/default.nix | 17 +++++++++++++++++
 pkgs/top-level/haskell-packages.nix                    |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/ex-pool/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/haskell/ex-pool/default.nix b/pkgs/development/libraries/haskell/ex-pool/default.nix
new file mode 100644
index 000000000000..9bf966e749af
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ex-pool/default.nix
@@ -0,0 +1,17 @@
+{ cabal, exceptions, hashable, stm, time, transformers, vector }:
+
+cabal.mkDerivation (self: {
+  pname = "ex-pool";
+  version = "0.1.0.2";
+  sha256 = "11q63yfr59r6cfzi635xj75nhcc2yi83snc75k638wyamxgvxng4";
+  buildDepends = [
+    exceptions hashable stm time transformers vector
+  ];
+  meta = {
+    homepage = "https://github.com/kim/ex-pool";
+    description = "Another fork of resource-pool, with a MonadIO and MonadCatch constraint";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 747ce660b511..fc8edf5d7877 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -975,6 +975,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   esqueleto = callPackage ../development/libraries/haskell/esqueleto {};
 
+  exPool = callPackage ../development/libraries/haskell/ex-pool { hashable = self.hashable_1_2_1_0; };
+
   exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {};
 
   exceptionTransformers = callPackage ../development/libraries/haskell/exception-transformers {};
-- 
cgit 1.4.1


From 192cca63ef3bba82e28e0762b75dc651191e3bbb Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 9 Dec 2013 23:35:59 +0000
Subject: haskellPackages.haskelldb: New expression

---
 pkgs/development/libraries/haskell/haskelldb/default.nix | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix                      |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/haskelldb/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/haskell/haskelldb/default.nix b/pkgs/development/libraries/haskell/haskelldb/default.nix
new file mode 100644
index 000000000000..fde1d71b2b03
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haskelldb/default.nix
@@ -0,0 +1,15 @@
+{ cabal, mtl, time }:
+
+cabal.mkDerivation (self: {
+  pname = "haskelldb";
+  version = "2.2.2";
+  sha256 = "1nwy05wsffagv62kbi8ahm6s591wal7cdl19p0fqi86qz05y9hkm";
+  buildDepends = [ mtl time ];
+  meta = {
+    homepage = "https://github.com/m4dc4p/haskelldb";
+    description = "A library of combinators for generating and executing SQL statements";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 747ce660b511..2c0b8ebf3dfe 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1170,6 +1170,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   hashtables = callPackage ../development/libraries/haskell/hashtables {};
 
+  haskelldb = callPackage ../development/libraries/haskell/haskelldb {};
+
   haskeline = callPackage ../development/libraries/haskell/haskeline {};
 
   haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {};
-- 
cgit 1.4.1


From 393dcd9c84e104ab7ff7e35f5612dc221e58d29b Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Tue, 10 Dec 2013 11:56:25 +0200
Subject: gmime: update from 2.6.15 to 2.6.19

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

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix
index 99859b9f34ef..a8a3943e409e 100644
--- a/pkgs/development/libraries/gmime/default.nix
+++ b/pkgs/development/libraries/gmime/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, zlib, libgpgerror }:
 
 stdenv.mkDerivation rec {
-  name = "gmime-2.6.15";
+  name = "gmime-2.6.19";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gmime/2.6/${name}.tar.xz";
-    sha256 = "16n9gmlwn6rphi59hrwy6dpn785s3r13h2kmrn3k61l2kfws1hml";
+    sha256 = "0jm1fgbjgh496rsc0il2y46qd4bqq2ln9168p4zzh68mk4ml1yxg";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
cgit 1.4.1