From d7b494a2f43d1422f1c97d184cbe99f73e8f6bb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 18 Nov 2010 20:00:39 +0000
Subject: [PATCH 01/94] Updating from trunk to get a security fix on openssl.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24759
---
 .../development/libraries/openssl/default.nix |  4 ++--
 pkgs/misc/emulators/vice/default.nix          |  6 ++---
 pkgs/top-level/python-packages.nix            | 23 +++++++++++++++++++
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 6b1efd7bc03..90732cf75f8 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -7,11 +7,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "openssl-1.0.0a";
+  name = "openssl-1.0.0b";
 
   src = fetchurl {
     url = "http://www.openssl.org/source/${name}.tar.gz";
-    sha256 = "0qqgyzfb0alwx329z8bqybzamfl9j2maykykvq6zk3ibq0gvva8q";
+    sha256 = "0cbk04cwmbf7l0bycqx8y04grfsx96mn2d8lbrydkqiyncplwysf";
   };
 
   patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix
index 6a0eb402001..293fe43d065 100644
--- a/pkgs/misc/emulators/vice/default.nix
+++ b/pkgs/misc/emulators/vice/default.nix
@@ -3,10 +3,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "vice-2.1";
+  name = "vice-2.2";
   src = fetchurl {
-    url = http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.1.tar.gz;
-    sha256 = "dc42df924bd4b4ab4af43e372d873a79ea035059f31f2f5c297c234b1c532c66";
+    url = http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.2.tar.gz;
+    sha256 = "0l8mp9ybx494fdqgr1ps4x3c3qzms4yyg4hzcn3ihzy92zw1nn2x";
   };
   buildInputs = [ perl gettext libpng giflib libjpeg alsaLib readline mesa
                   pkgconfig gtk SDL autoconf automake ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8c4595dcd21..b3a39592c78 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -886,6 +886,29 @@ rec {
     };
   };
 
+  magic = buildPythonPackage rec {
+    name = "magic-0.3.1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/python-magic/python-${name}.tar.gz";
+      md5 = "397cff81d2502e81fd3830a61ca2ad2c";
+    };
+
+    preConfigure =
+      ''
+        # Ensure that the module can find libmagic by hard-coding the
+        # path to libmagic.so.  Maybe there is a nicer way.
+        substituteInPlace magic.py --replace \
+          "ctypes.util.find_library('magic')" \
+          "'${pkgs.file}/lib/libmagic.so'"
+      '';
+
+    meta = {
+      description = "A Python wrapper around libmagic";
+      homepage = https://github.com/ahupp/python-magic;
+    };
+  };
+
   setuptoolsDarcs = buildPythonPackage {
     name = "setuptools-darcs-1.2.9";
 

From a98b72fb77f5dbce5f806bb448edec667280a12d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 18 Nov 2010 22:59:57 +0000
Subject: [PATCH 02/94] New glibc fix, this time for
 https://bugzilla.redhat.com/show_bug.cgi?id=651638

svn path=/nixpkgs/branches/stdenv-updates/; revision=24761
---
 pkgs/development/libraries/glibc-2.12/common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.12/common.nix
index 619145ca8b3..f29fb8a0b04 100644
--- a/pkgs/development/libraries/glibc-2.12/common.nix
+++ b/pkgs/development/libraries/glibc-2.12/common.nix
@@ -81,6 +81,9 @@ stdenv.mkDerivation ({
     /* Fix for CVE-2010-3856. */
     ./ignore-origin.patch
 
+    /* Fix for CVE-2010-3856. */
+    ./strncasecmp_sse42.patch
+
   ];
 
   postPatch = ''

From 9d124b1c70064c7e61f85cfe4dfe801867adbb7f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 19 Nov 2010 04:07:34 +0000
Subject: [PATCH 03/94] Fix DrGeo build

svn path=/nixpkgs/branches/stdenv-updates/; revision=24762
---
 .../science/geometry/drgeo/default.nix        |  3 +-
 .../science/geometry/drgeo/struct.patch       | 68 +++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/science/geometry/drgeo/struct.patch

diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix
index ff52d366765..2b10ec238c9 100644
--- a/pkgs/applications/science/geometry/drgeo/default.nix
+++ b/pkgs/applications/science/geometry/drgeo/default.nix
@@ -11,7 +11,8 @@ rec {
   configureFlags = [];
 
   /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" "doPreBuild" "doMakeInstall"];
+  phaseNames = ["doPatch" "doConfigure" "doPreBuild" "doMakeInstall"];
+  patches = [ ./struct.patch ];
 
   doPreBuild = fullDepEntry (''
     cp drgeo.desktop.in drgeo.desktop
diff --git a/pkgs/applications/science/geometry/drgeo/struct.patch b/pkgs/applications/science/geometry/drgeo/struct.patch
new file mode 100644
index 00000000000..7364cae5f58
--- /dev/null
+++ b/pkgs/applications/science/geometry/drgeo/struct.patch
@@ -0,0 +1,68 @@
+-- drgeo-1.1.0/debian/patches/00list
+++ drgeo-1.1.0/debian/patches/00list
+@ -7 +7 @@
+
+07-fix_ftbfs-gcc-4.5.dpatch
+nly in patch2:
+nchanged:
+-- drgeo-1.1.0.orig/debian/patches/07-fix_ftbfs-gcc-4.5.dpatch
+++ drgeo-1.1.0/debian/patches/07-fix_ftbfs-gcc-4.5.dpatch
+@ -0,0 +1,58 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07-fix_ftbfs-gcc-4.5.dpatch by Fabrice Coutadeur <fabric...@ubuntu.com>
+##
+## Description: fix FTBFS with gcc 4.5 with undefined reference to
+## `drgeoDialogData'
+## Author: Petr Gajdos <pgaj...@suse.cz>
+## Origin: https://build.opensuse.org/package/files?package=drgeo&project=openSUSE%3A11.3%3AContrib
+
+...@dpatch@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' drgeo-1.1.0~/geo/drgeo_dialog.cc drgeo-1.1.0/geo/drgeo_dialog.cc
+--- drgeo-1.1.0~/geo/drgeo_dialog.cc	2003-10-27 10:17:25.000000000 +0000
++++ drgeo-1.1.0/geo/drgeo_dialog.cc	2010-11-13 07:26:03.258908003 +0000
+@@ -38,12 +38,7 @@
+ // Used in the style dialod callback, I know it's ugly, but so easy
+ static drgeoFigure *selected_figure;
+ 
+-struct
+-{
+-  drgeoPoint mouse;
+-  drgeoFigure *figure;
+-}
+-drgeoDialogData;
++DialogData drgeoDialogData;
+ 
+ 
+ static void drgeo_edit_dialog_cb (GtkWidget * dialog,
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' drgeo-1.1.0~/geo/drgeo_dialog.h drgeo-1.1.0/geo/drgeo_dialog.h
+--- drgeo-1.1.0~/geo/drgeo_dialog.h	2003-06-12 22:30:23.000000000 +0000
++++ drgeo-1.1.0/geo/drgeo_dialog.h	2010-11-13 07:26:03.258908003 +0000
+@@ -34,4 +34,11 @@
+ }
+ 
+ #endif				/* __cplusplus */
++
++typedef struct
++{
++  drgeoPoint mouse;
++  drgeoFigure *figure;
++} DialogData;
++
+ #endif
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' drgeo-1.1.0~/geo/drgeo_figure.cc drgeo-1.1.0/geo/drgeo_figure.cc
+--- drgeo-1.1.0~/geo/drgeo_figure.cc	2005-07-14 07:30:01.000000000 +0000
++++ drgeo-1.1.0/geo/drgeo_figure.cc	2010-11-13 07:26:03.258908003 +0000
+@@ -48,12 +48,7 @@
+ #include "drgeo_dialog.h"
+ #include "traite.h"
+ 
+-extern struct
+-{
+-  drgeoPoint mouse;
+-  drgeoFigure *figure;
+-}
+-drgeoDialogData;
++extern DialogData drgeoDialogData;
+ 
+ typedef struct drgeoSearchValue
+ {

From f904e3c821cf9d42aca72abc42996b958c57db30 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 19 Nov 2010 13:12:13 +0000
Subject: [PATCH 04/94] Brute-force fix; I cannot understand why GCC behaves in
 a complicated way, but there is a simple workaround

svn path=/nixpkgs/branches/stdenv-updates/; revision=24771
---
 .../libraries/opencv/changeset_r3190.diff     | 20 +++++++++++++++++++
 pkgs/development/libraries/opencv/default.nix |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/opencv/changeset_r3190.diff

diff --git a/pkgs/development/libraries/opencv/changeset_r3190.diff b/pkgs/development/libraries/opencv/changeset_r3190.diff
new file mode 100644
index 00000000000..4a614659e72
--- /dev/null
+++ b/pkgs/development/libraries/opencv/changeset_r3190.diff
@@ -0,0 +1,20 @@
+--- opencv/src/highgui/cvcap_ffmpeg.cpp
++++ opencv/src/highgui/cvcap_ffmpeg.cpp
+@@ -49,6 +49,15 @@
+ #if !defined(WIN32) || defined(__MINGW32__)
+ // some versions of FFMPEG assume a C99 compiler, and don't define INT64_C
+-#ifndef INT64_C
+-#define INT64_C
++#if !defined INT64_C || !defined UINT64_C
++# if __WORDSIZE == 64
++#  define INT64_C(c)	c ## UL
++# else
++#  define INT64_C(c)	c ## ULL
++# endif
++# if __WORDSIZE == 64
++#  define UINT64_C(c)	c ## UL
++# else
++#  define UINT64_C(c)	c ## ULL
++# endif
+ #define __STDC_CONSTANT_MACROS
+ // force re-inclusion of stdint.h to get INT64_C macro
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index 1b64875d631..c8b77d5f572 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig
     xineLib gstreamer ];
 
+  patches = [ ./changeset_r3190.diff ];
+
   meta = {
     description = "Open Computer Vision Library with more than 500 algorithms";
     homepage = http://opencv.willowgarage.com/;

From 560b88b9201c8ea3a6715103a0b9314e23bf9889 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 19 Nov 2010 22:21:05 +0000
Subject: [PATCH 05/94] I forgot a patch I mentioned in the previous commit.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24779
---
 .../glibc-2.12/strncasecmp_sse42.patch        | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 pkgs/development/libraries/glibc-2.12/strncasecmp_sse42.patch

diff --git a/pkgs/development/libraries/glibc-2.12/strncasecmp_sse42.patch b/pkgs/development/libraries/glibc-2.12/strncasecmp_sse42.patch
new file mode 100644
index 00000000000..e5e4613d9d1
--- /dev/null
+++ b/pkgs/development/libraries/glibc-2.12/strncasecmp_sse42.patch
@@ -0,0 +1,31 @@
+https://bugzilla.redhat.com/show_bug.cgi?id=651638
+
+2010-11-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	[BZ #12205]
+	* string/test-strncasecmp.c (check_result): New function.
+	(do_one_test): Use it.
+	(check1): New function.
+	(test_main): Use it.
+
+	* sysdeps/i386/i686/multiarch/strcmp.S (nibble_ashr_use_sse4_2_exit):
+	Support strcasecmp and strncasecmp.
+
+diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S
+index 54e5bbc..1859289 100644
+--- a/sysdeps/x86_64/multiarch/strcmp.S
++++ b/sysdeps/x86_64/multiarch/strcmp.S
+@@ -1809,7 +1809,13 @@ LABEL(nibble_ashr_15_use_sse4_2):
+ 	ja	LABEL(loop_ashr_15_use_sse4_2)
+ 
+ LABEL(nibble_ashr_use_sse4_2_exit):
++# if !defined USE_AS_STRCASECMP_L && !defined USE_AS_STRNCASECMP_L
+ 	pcmpistri      $0x1a,(%rsi,%rdx), %xmm0
++# else
++	movdqa	(%rsi,%rdx), %xmm1
++	TOLOWER (%xmm0, %xmm1)
++	pcmpistri $0x1a, %xmm1, %xmm0
++# endif
+ 	.p2align 4
+ LABEL(use_sse4_2_exit):
+ 	jnc	LABEL(strcmp_exitz_sse4_2)

From 7195b61a319cba8e3047311781b46a60c1f1a5b6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 20 Nov 2010 20:51:29 +0000
Subject: [PATCH 06/94] Update Wireshark

svn path=/nixpkgs/branches/stdenv-updates/; revision=24785
---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 3c2e94c0595..53710c54eaf 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison}:
 
 stdenv.mkDerivation rec {
-  version = "1.4.0";
+  version = "1.4.2";
   name = "wireshark-${version}";
   src = fetchurl {
     url = "http://www.wireshark.org/download/src/${name}.tar.bz2";
-    sha256 = "1c0df77d11c643b1142b6ed3fd21e0c79b3f05f1749fe10e9ba5fd3beee8b743";
+    sha256 = "1cj9n3yhahj6pabx1h1gas6b6dhwsljjz2w3ngky3a4g6bnf3ij4";
   };
   configureFlags = "--with-pcap=${libpcap}";
   buildInputs = [perl pkgconfig gtk libpcap flex bison];

From ea00506f53f7309405e164797e6287b1b85bb8d7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 20 Nov 2010 21:01:18 +0000
Subject: [PATCH 07/94] Update mupdf

svn path=/nixpkgs/branches/stdenv-updates/; revision=24786
---
 pkgs/applications/misc/mupdf/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 15d2ac98804..8127fa23115 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, zlib, freetype, libjpeg, jbig2dec, openjpeg
 , libX11, libXext }:
 stdenv.mkDerivation rec {
-  name = "mupdf-0.6";
+  name = "mupdf-0.7";
 
   src = fetchurl {
-    url = "http://mupdf.com/download/source/${name}.tar.gz";
-    sha256 = "01cn2kz4zx53qhqvbxy8xd7xqbh58kpid8ykvx5hz7pf2gqw91vg";
+    url = "http://mupdf.com/download/${name}.tar.gz";
+    sha256 = "e7f6307fa472575d27fe893e787ddb3fc927f03ba4ae23105f917189e81960a6";
   };
 
   buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ];

From c1620ef5523df0a4a6dec11389d5d89e9955bdb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 21 Nov 2010 14:29:20 +0000
Subject: [PATCH 08/94] Fixing a stdenv problem... 'binutils' where linked with
 zlib from bootstrap-tools, because zlib was there and binutils were not
 having an explicit buildInput for zlib. Due to that, we ended up with stdenv
 (gcc-wrapper) depending on bootstrap-tools as runtime dependency.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24790
---
 pkgs/development/tools/misc/binutils/snapshot.nix | 4 +++-
 pkgs/stdenv/linux/default.nix                     | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/snapshot.nix b/pkgs/development/tools/misc/binutils/snapshot.nix
index 79f01cad4ef..1a02eba7579 100644
--- a/pkgs/development/tools/misc/binutils/snapshot.nix
+++ b/pkgs/development/tools/misc/binutils/snapshot.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, noSysDirs, cross ? null}:
+{stdenv, fetchurl, noSysDirs, zlib, cross ? null}:
 
 let
     basename = "binutils-2.20.51";
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
     ./new-dtags.patch
   ];
 
+  buildInputs = [ zlib ];
+
   inherit noSysDirs;
 
   preConfigure = ''
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index af98fd98b74..2203601f836 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -191,7 +191,7 @@ rec {
   # 6) Construct a third stdenv identical to the 2nd, except that
   #    this one uses the Glibc built in step 3.  It still uses
   #    the recent binutils and rest of the bootstrap tools, including GCC.
-  stdenvLinuxBoot3 = removeAttrs (stdenvBootFun {
+  stdenvLinuxBoot3 = stdenvBootFun {
     gcc = wrapGCC {
       binutils = stdenvLinuxBoot1Pkgs.binutils;
       coreutils = bootstrapTools;
@@ -202,7 +202,7 @@ rec {
       inherit (stdenvLinuxBoot1Pkgs) perl;
     };
     inherit fetchurl;
-  }) ["gcc" "binutils"];
+  };
 
   
   # 7) The packages that can be built using the third stdenv.

From 13a8b34a81632aa8c23293c5646d43cab724e878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 21 Nov 2010 15:26:36 +0000
Subject: [PATCH 09/94] Fix for a syscall restart bug on linux-mips

svn path=/nixpkgs/branches/stdenv-updates/; revision=24791
---
 pkgs/os-specific/linux/kernel/mips_restart.patch | 12 ++++++++++++
 pkgs/os-specific/linux/kernel/patches.nix        |  5 +++++
 pkgs/top-level/all-packages.nix                  |  1 +
 3 files changed, 18 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/mips_restart.patch

diff --git a/pkgs/os-specific/linux/kernel/mips_restart.patch b/pkgs/os-specific/linux/kernel/mips_restart.patch
new file mode 100644
index 00000000000..42a9b4f253c
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/mips_restart.patch
@@ -0,0 +1,12 @@
+diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
+index 9996094..ae167df 100644
+--- a/arch/mips/kernel/process.c
++++ b/arch/mips/kernel/process.c
+@@ -142,7 +142,6 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
+ 	childregs->regs[7] = 0;	/* Clear error flag */
+ 
+ 	childregs->regs[2] = 0;	/* Child gets zero as return value */
+-	regs->regs[2] = p->pid;
+ 
+ 	if (childregs->cp0_status & ST0_CU0) {
+ 		childregs->regs[28] = (unsigned long) ti;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index cdaa9da57d9..3ad48033f7a 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -203,6 +203,11 @@ in
       patch = ./sheevaplug_modules-2.6.35.patch;
     };
 
+  mips_restart_2_6_36 =
+    { name = "mips_restart_2_6_36";
+      patch = ./mips_restart.patch;
+    };
+
   guruplug_defconfig =
     { # Default configuration for the GuruPlug.  From
       # <http://www.openplug.org/plugwiki/images/c/c6/Guruplug-patchset-2.6.33.2.tar.bz2>.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 762743b8e7d..2b519af92e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4764,6 +4764,7 @@ let
       [ #kernelPatches.fbcondecor_2_6_35
         kernelPatches.sec_perm_2_6_24
         #kernelPatches.aufs2_2_6_35
+        kernelPatches.mips_restart_2_6_36
       ];
   };
 

From 7715dc2bebcbfdc46dc1fed7ed33850d024ef1b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 21 Nov 2010 20:39:52 +0000
Subject: [PATCH 10/94] Updating busybox.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24800
---
 pkgs/misc/busybox/default.nix     | 12 ++++--------
 pkgs/misc/busybox/make-3.82.patch | 29 -----------------------------
 2 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/misc/busybox/make-3.82.patch

diff --git a/pkgs/misc/busybox/default.nix b/pkgs/misc/busybox/default.nix
index c40ff9b8075..67ea1c1fa9a 100644
--- a/pkgs/misc/busybox/default.nix
+++ b/pkgs/misc/busybox/default.nix
@@ -20,10 +20,8 @@ let
             echo "parseconfig: removing $NAME"
             sed -i /^$NAME=/d .config
 
-            if test "$OPTION" != n; then
-                echo "parseconfig: setting $NAME=$OPTION"
-                echo "$NAME=$OPTION" >> .config
-            fi
+            echo "parseconfig: setting $NAME=$OPTION"
+            echo "$NAME=$OPTION" >> .config
         done
         set +x
     }
@@ -41,15 +39,13 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "busybox-1.17.1";
+  name = "busybox-1.17.3";
 
   src = fetchurl {
     url = "http://busybox.net/downloads/${name}.tar.bz2";
-    sha256 = "0r6i76lad5w359pw93i9wrq2a1pxk8xw6xr4cq71n5by1n0pg4dz";
+    sha256 = "1whza71p28r243j0qil1ari6p779h84ix1ikmmsqs1hsyrs04byy";
   };
 
-  patches = [ ./make-3.82.patch ];
-
   configurePhase = ''
     make defconfig
     ${configParser}
diff --git a/pkgs/misc/busybox/make-3.82.patch b/pkgs/misc/busybox/make-3.82.patch
deleted file mode 100644
index eb95ae3b833..00000000000
--- a/pkgs/misc/busybox/make-3.82.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- busybox/Makefile	2010-08-19 10:38:51.000000000 +0200
-+++ busybox-make382/Makefile	2010-08-19 14:46:03.000000000 +0200
-@@ -433,7 +433,12 @@
- -include $(srctree)/arch/$(ARCH)/Makefile
- export KBUILD_DEFCONFIG
- 
--config %config: scripts_basic outputmakefile gen_build_files FORCE
-+config: scripts_basic outputmakefile gen_build_files FORCE
-+	$(Q)mkdir -p include
-+	$(Q)$(MAKE) $(build)=scripts/kconfig $@
-+	$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
-+
-+%config: scripts_basic outputmakefile gen_build_files FORCE
- 	$(Q)mkdir -p include
- 	$(Q)$(MAKE) $(build)=scripts/kconfig $@
- 	$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
-@@ -1285,7 +1290,11 @@
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
- 
- # Modules
--/ %/: prepare scripts FORCE
-+%/: prepare scripts FORCE
-+	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
-+	$(build)=$(build-dir)
-+
-+/: prepare scripts FORCE
- 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
- 	$(build)=$(build-dir)
- %.ko: prepare scripts FORCE

From 293704a6f87047db796eecaf77e7af16eca18029 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 22 Nov 2010 23:16:05 +0000
Subject: [PATCH 11/94] Fix the makefile

svn path=/nixpkgs/branches/stdenv-updates/; revision=24816
---
 pkgs/tools/compression/ncompress/builder.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/compression/ncompress/builder.sh b/pkgs/tools/compression/ncompress/builder.sh
index fb0824d8a28..7a3f34aae46 100644
--- a/pkgs/tools/compression/ncompress/builder.sh
+++ b/pkgs/tools/compression/ncompress/builder.sh
@@ -3,6 +3,7 @@ installFlags="PREFIX=$out"
 
 preBuild() {
     cp Makefile.def Makefile
+    sed -i GNUmakefile -e 's/compress %/%/g'
 }
 
 postInstall() {

From 3c452363ce94665e2d04715004a23648cfb5770b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 23 Nov 2010 05:54:58 +0000
Subject: [PATCH 12/94] Use a patch to fix make 3.82 build of Coq

svn path=/nixpkgs/branches/stdenv-updates/; revision=24817
---
 .../logic/coq/coq-8.3-make-3.82-compat.patch  | 84 +++++++++++++++++++
 .../science/logic/coq/default.nix             |  2 +-
 2 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/science/logic/coq/coq-8.3-make-3.82-compat.patch

diff --git a/pkgs/applications/science/logic/coq/coq-8.3-make-3.82-compat.patch b/pkgs/applications/science/logic/coq/coq-8.3-make-3.82-compat.patch
new file mode 100644
index 00000000000..5176aa33ec8
--- /dev/null
+++ b/pkgs/applications/science/logic/coq/coq-8.3-make-3.82-compat.patch
@@ -0,0 +1,84 @@
+From: glondu <glondu@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Date: Tue, 19 Oct 2010 13:22:08 +0000 (+0000)
+Subject: Fix mixed implicit and normal rules
+X-Git-Url: https://gforge.inria.fr/plugins/scmgit/cgi-bin/gitweb.cgi?p=coq%2Fcoq-svn.git;a=commitdiff_plain;h=86eb08bad450dd3fa77b11e4a34d2f493ab80d85
+
+Fix mixed implicit and normal rules
+
+This fixes build with GNU Make 3.82. See threads:
+
+  https://sympa-roc.inria.fr/wws/arc/coqdev/2010-10/msg00025.html
+  http://thread.gmane.org/gmane.comp.gnu.make.bugs/4912
+
+git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/branches/v8.3@13566 85f007b7-540e-0410-9357-904b9bb8a0f7
+---
+
+diff --git a/Makefile b/Makefile
+index b1edc01..ea73c51 100644
+--- a/Makefile
++++ b/Makefile
+@@ -160,9 +160,19 @@ else
+ stage1 $(STAGE1_TARGETS) : always
+ 	$(call stage-template,1)
+ 
++ifneq (,$(STAGE1_IMPLICITS))
++$(STAGE1_IMPLICITS) : always
++	$(call stage-template,1)
++endif
++
+ stage2 $(STAGE2_TARGETS) : stage1
+ 	$(call stage-template,2)
+ 
++ifneq (,$(STAGE2_IMPLICITS))
++$(STAGE2_IMPLICITS) : stage1
++	$(call stage-template,2)
++endif
++
+ # Nota:
+ # - world is one of the targets in $(STAGE2_TARGETS), hence launching
+ # "make" or "make world" leads to recursion into stage1 then stage2
+diff --git a/Makefile.common b/Makefile.common
+index cc38980..46bf217 100644
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -365,7 +365,7 @@ DATE=$(shell LANG=C date +"%B %Y")
+ 
+ SOURCEDOCDIR=dev/source-doc
+ 
+-CAML_OBJECT_PATTERNS:=%.cmo %.cmx %.cmi %.cma %.cmxa %.cmxs %.dep.ps %.dot
++CAML_OBJECT_PATTERNS:=%.cmo %.cmx %.o %.cmi %.cma %.cmxa %.a %.cmxs %.dep.ps %.dot
+ 
+ ### Targets forwarded by Makefile to a specific stage:
+ 
+@@ -374,10 +374,12 @@ CAML_OBJECT_PATTERNS:=%.cmo %.cmx %.cmi %.cma %.cmxa %.cmxs %.dep.ps %.dot
+ STAGE1_TARGETS:= $(STAGE1) $(COQDEPBOOT) \
+   $(GENFILES) \
+   source-doc revision toplevel/mltop.byteml toplevel/mltop.optml \
+-  $(STAGE1_ML4:.ml4=.ml4-preprocessed) %.o
++  $(STAGE1_ML4:.ml4=.ml4-preprocessed)
++
++STAGE1_IMPLICITS:=
+ 
+ ifdef CM_STAGE1
+- STAGE1_TARGETS+=$(CAML_OBJECT_PATTERNS)
++ STAGE1_IMPLICITS+=$(CAML_OBJECT_PATTERNS)
+ endif
+ 
+ ## Enumeration of targets that require being done at stage2
+@@ -402,12 +404,13 @@ STAGE2_TARGETS:=$(COQBINARIES) lib kernel byterun library proofs tactics \
+   printers debug initplugins plugins \
+   world install coqide coqide-files coq coqlib \
+   coqlight states check init theories theories-light \
+-  $(DOC_TARGETS) $(VO_TARGETS) validate \
+-  %.vo %.glob states/% install-% %.ml4-preprocessed \
++  $(DOC_TARGETS) $(VO_TARGETS) validate
++
++STAGE2_IMPLICITS:= %.vo %.glob states/% install-% %.ml4-preprocessed \
+   $(DOC_TARGET_PATTERNS)
+ 
+ ifndef CM_STAGE1
+- STAGE2_TARGETS+=$(CAML_OBJECT_PATTERNS)
++ STAGE2_IMPLICITS+=$(CAML_OBJECT_PATTERNS)
+ endif
+ 
+ 
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index d72a2104370..f63e03e9ad9 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
 
   buildFlags = "world"; # Debug with "world VERBOSE=1";
 
-  patches = [ ./configure.patch ];
+  patches = [ ./configure.patch ./coq-8.3-make-3.82-compat.patch ];
 
   postPatch = ''
     UNAME=$(type -tp uname)

From df8db9a701d6eee1d5c4b16dbad5430a8f371e1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 23 Nov 2010 20:46:45 +0000
Subject: [PATCH 13/94] Making the nanonote uboot not start the default console
 in ttyS0, but in tty0 instead. It's more comfortable for those not having a
 serial line attached to it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24828
---
 pkgs/misc/uboot/nanonote.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/uboot/nanonote.nix b/pkgs/misc/uboot/nanonote.nix
index 9e39501a7a3..ff7c7742265 100644
--- a/pkgs/misc/uboot/nanonote.nix
+++ b/pkgs/misc/uboot/nanonote.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   srcPatches = fetchgit {
     url = "git://projects.qi-hardware.com/openwrt-xburst.git";
     rev = "3244d5ef9f93802f9b9b6f4405636424abf6fa83";
-    sha256 = "8ae25853028930b418fad90637e0e68f9888285ba3ad1f720be45f08823ee855";
+    sha256 = "99dde9c3c4c66722d3ee2223d306bc84289a8aa77d0b5918ca49c2f4032ab38f";
   };
 
   patchPhase = ''
@@ -25,6 +25,7 @@ stdenv.mkDerivation {
         patch -p1 < $a
     done
     chmod +w -R *
+    sed -i -e 's/console=ttyS0,57600n8//' include/configs/qi_lb60.h
   '';
 
   # Remove the cross compiler prefix, and add reiserfs support

From 794b722ccac1bee87b013eeba085df1c1fad6bb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 23 Nov 2010 20:47:23 +0000
Subject: [PATCH 14/94] Making sysvinit and mingetty crossbuild

svn path=/nixpkgs/branches/stdenv-updates/; revision=24829
---
 pkgs/os-specific/linux/mingetty/default.nix | 4 ++++
 pkgs/os-specific/linux/sysvinit/default.nix | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix
index fc3c50e1986..b27baa5480b 100644
--- a/pkgs/os-specific/linux/mingetty/default.nix
+++ b/pkgs/os-specific/linux/mingetty/default.nix
@@ -8,6 +8,10 @@ stdenv.mkDerivation {
     sha256 = "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g";
   };
 
+  crossAttrs = {
+    makeFlags = "CC=${stdenv.cross.config}-gcc";
+  };
+
   preInstall = ''
     ensureDir $out/sbin $out/share/man/man8
     makeFlagsArray=(SBINDIR=$out/sbin MANDIR=$out/share/man/man8)
diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix
index a05638dcb77..4fa2a55367a 100644
--- a/pkgs/os-specific/linux/sysvinit/default.nix
+++ b/pkgs/os-specific/linux/sysvinit/default.nix
@@ -14,6 +14,10 @@ stdenv.mkDerivation {
 
   makeFlags = "SULOGINLIBS=-lcrypt ROOT=$(out) MANDIR=/share/man";
 
+  crossAttrs = {
+    makeFlags = "SULOGINLIBS=-lcrypt ROOT=$(out) MANDIR=/share/man CC=${stdenv.cross.config}-gcc";
+  };
+
   preInstall =
     ''
       substituteInPlace src/Makefile --replace /usr /

From 5007314654d9c996b78411fe570991d857c56369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 25 Nov 2010 09:05:04 +0000
Subject: [PATCH 15/94] Updating busybox

svn path=/nixpkgs/branches/stdenv-updates/; revision=24850
---
 pkgs/misc/busybox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/busybox/default.nix b/pkgs/misc/busybox/default.nix
index 67ea1c1fa9a..a63411367e8 100644
--- a/pkgs/misc/busybox/default.nix
+++ b/pkgs/misc/busybox/default.nix
@@ -39,11 +39,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "busybox-1.17.3";
+  name = "busybox-1.18.0";
 
   src = fetchurl {
     url = "http://busybox.net/downloads/${name}.tar.bz2";
-    sha256 = "1whza71p28r243j0qil1ari6p779h84ix1ikmmsqs1hsyrs04byy";
+    sha256 = "007bc8k6sc62iyjmyv3di2c8xdxvdhvqg68c7pn40m0455lmx79s";
   };
 
   configurePhase = ''

From d910fcbcee35023475e2f0756c90218d8d5cd866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 25 Nov 2010 09:14:56 +0000
Subject: [PATCH 16/94] Making bash and kbd cross-build

svn path=/nixpkgs/branches/stdenv-updates/; revision=24851
---
 pkgs/os-specific/linux/kbd/default.nix | 2 +-
 pkgs/shells/bash/default.nix           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index 2483a86c486..c54ac4c2c73 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ff674y6d3b6ix08b9l2yzv8igns768biyp5y92vip7iz4xv2p2j";
   };
 
-  buildInputs = [ bison flex autoconf automake  ];
+  buildNativeInputs = [ bison flex autoconf automake ];
 
   # We get a warning in armv5tel-linux and the fuloong2f,
   # so we disable -Werror in it
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index 0f4b610f412..7971a19871c 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
       import ./bash-patches.nix patch;
 
   # Note: Bison is needed because the patches above modify parse.y.
-  buildNativeInputs = [bison];
-  buildInputs = stdenv.lib.optional (texinfo != null) texinfo
+  buildNativeInputs = [bison]
+    ++ stdenv.lib.optional (texinfo != null) texinfo
     ++ stdenv.lib.optional interactive readline;
 
   configureFlags = if interactive then "--with-installed-readline" else "--disable-readline";

From 1cb59660e00d557c06672bc035d72210244b551c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 25 Nov 2010 09:32:12 +0000
Subject: [PATCH 17/94] Removing valgrind patches, as we got a recent valgrind
 already.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24853
---
 .../tools/analysis/valgrind/default.nix       |  8 +--
 .../tools/analysis/valgrind/glibc-2.12.patch  | 72 -------------------
 .../tools/analysis/valgrind/stat_h.patch      | 53 --------------
 3 files changed, 2 insertions(+), 131 deletions(-)
 delete mode 100644 pkgs/development/tools/analysis/valgrind/glibc-2.12.patch
 delete mode 100644 pkgs/development/tools/analysis/valgrind/stat_h.patch

diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index 48441384759..5638e810edf 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -8,14 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "0pr8h0q909z15g2i2jrcryhqbshair42rylf3mprhyx4nm9h23xw";
   };
 
-  # Make Valgrind compile with Glibc 2.12.
-  patches = [ ./glibc-2.12.patch ./stat_h.patch ];
-  patchFlags = "-p0";
-  preConfigure = "autoreconf";
-
   # Perl is needed for `cg_annotate'.
   # GDB is needed to provide a sane default for `--db-command'.
-  buildInputs = [ perl autoconf automake ] ++ stdenv.lib.optional (!stdenv.isDarwin) gdb;
+  buildNativeInputs = [ perl autoconf automake ];
+  buildInputs = stdenv.lib.optional (!stdenv.isDarwin) gdb;
 
   configureFlags =
     if stdenv.system == "x86_64-linux" then ["--enable-only64bit"] else [];
diff --git a/pkgs/development/tools/analysis/valgrind/glibc-2.12.patch b/pkgs/development/tools/analysis/valgrind/glibc-2.12.patch
deleted file mode 100644
index bdee0778732..00000000000
--- a/pkgs/development/tools/analysis/valgrind/glibc-2.12.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-I changed the patch for 2.11 so it allows 2.12 too.
-
-r10941 from svn://svn.valgrind.org/valgrind/trunk
-
-------------------------------------------------------------------------
-r10941 | bart | 2009-11-15 20:11:19 +0100 (Sun, 15 Nov 2009) | 2 lines
-
-Added support for glibc 2.11.
-
-------------------------------------------------------------------------
-
-Index: configure.in
-===================================================================
---- configure.in	(revision 10940)
-+++ configure.in	(revision 10941)
-@@ -656,6 +656,26 @@
- ],
- GLIBC_VERSION="2.10")
- 
-+AC_EGREP_CPP([GLIBC_211], [
-+#include <features.h>
-+#ifdef __GNU_LIBRARY__
-+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11)
-+  GLIBC_211
-+ #endif
-+#endif
-+],
-+GLIBC_VERSION="2.11")
-+
-+AC_EGREP_CPP([GLIBC_212], [
-+#include <features.h>
-+#ifdef __GNU_LIBRARY__
-+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 12)
-+  GLIBC_212
-+ #endif
-+#endif
-+],
-+GLIBC_VERSION="2.12")
-+
- AC_EGREP_CPP([AIX5_LIBC], [
- #include <standards.h>
- #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530)
-@@ -742,6 +752,20 @@
- 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- 	;;
-+     2.11)
-+	AC_MSG_RESULT(2.11 family)
-+	AC_DEFINE([GLIBC_2_11], 1, [Define to 1 if you're using glibc 2.11.x])
-+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+	;;
-+     2.12)
-+	AC_MSG_RESULT(2.12 family)
-+	AC_DEFINE([GLIBC_2_12], 1, [Define to 1 if you're using glibc 2.12.x])
-+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+	;;
-      aix5)
- 	AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
- 	AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3])
-@@ -755,7 +772,7 @@
- 
-      *)
- 	AC_MSG_RESULT(unsupported version)
--	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.10])
-+	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.12])
- 	AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION])
- 	AC_MSG_ERROR([or Darwin libc])
- 	;;
diff --git a/pkgs/development/tools/analysis/valgrind/stat_h.patch b/pkgs/development/tools/analysis/valgrind/stat_h.patch
deleted file mode 100644
index c191cf45698..00000000000
--- a/pkgs/development/tools/analysis/valgrind/stat_h.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Taken from gentoo:
-http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-util/valgrind/files/valgrind-3.5.0-stat_h.patch?view=markup
-
-http://cvs.fedoraproject.org/viewvc/rpms/valgrind/devel/valgrind-3.5.0-stat_h.patch?view=log
-
---- include/vki/vki-amd64-linux.h
-+++ include/vki/vki-amd64-linux.h
-@@ -310,6 +310,9 @@ struct vki_stat {
- 	long		st_blksize;
- 	long		st_blocks;	/* Number 512-byte blocks allocated. */
- 
-+#undef st_atime
-+#undef st_mtime
-+#undef st_ctime
- 	unsigned long	st_atime;
- 	unsigned long 	st_atime_nsec; 
- 	unsigned long	st_mtime;
---- include/vki/vki-x86-linux.h
-+++ include/vki/vki-x86-linux.h
-@@ -348,6 +348,9 @@ struct vki_stat {
- 	unsigned long  st_size;
- 	unsigned long  st_blksize;
- 	unsigned long  st_blocks;
-+#undef st_atime
-+#undef st_mtime
-+#undef st_ctime
- 	unsigned long  st_atime;
- 	unsigned long  st_atime_nsec;
- 	unsigned long  st_mtime;
---- include/vki/vki-ppc32-linux.h
-+++ include/vki/vki-ppc32-linux.h
-@@ -392,6 +392,9 @@ struct vki_stat {
-    long			st_size;
-    unsigned long	st_blksize;
-    unsigned long	st_blocks;
-+#undef st_atime
-+#undef st_mtime
-+#undef st_ctime
-    unsigned long	st_atime;
-    unsigned long	st_atime_nsec;
-    unsigned long	st_mtime;
---- include/vki/vki-ppc64-linux.h
-+++ include/vki/vki-ppc64-linux.h
-@@ -428,6 +428,9 @@ struct vki_stat {
-   long            st_size;
-   unsigned long   st_blksize;
-   unsigned long   st_blocks;
-+#undef st_atime
-+#undef st_mtime
-+#undef st_ctime
-   unsigned long   st_atime;
-   unsigned long   st_atime_nsec;
-   unsigned long   st_mtime;

From c50a240e3d1d0cc7c6a781a64e049f5d33529397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 25 Nov 2010 09:38:28 +0000
Subject: [PATCH 18/94] xtrace 1.0.2.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24854
---
 pkgs/tools/X11/xtrace/default.nix | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/tools/X11/xtrace/default.nix
index ad99c320dba..56f33e8330d 100644
--- a/pkgs/tools/X11/xtrace/default.nix
+++ b/pkgs/tools/X11/xtrace/default.nix
@@ -1,17 +1,24 @@
-{stdenv, fetchurl, libX11}:
+{ stdenv, fetchurl, libX11, xauth, makeWrapper }:
 
+let version = "1.0.2"; in
 stdenv.mkDerivation {
-  name = "xtrace-1.0.1";
+  name = "xtrace-${version}";
   src = fetchurl {
-    url = "https://alioth.debian.org/frs/download.php/3149/xtrace_1.0.1.orig.tar.gz";
-    sha256 = "042rifm93mws7xbw86z0m1rmdijprlkijsi2882as1yf6gdbdqbm";
+    url = "https://alioth.debian.org/frs/download.php/3201/xtrace_${version}.orig.tar.gz";
+    sha256 = "0czywk2iwj9vifml0qjlbz8n9jnqjsm4zz22haii82bf4l5w3y04";
   };
-  buildInputs = [libX11];
+
+  buildInputs = [ libX11 makeWrapper ];
+
+  postInstall =
+    '' wrapProgram "$out/bin/xtrace" \
+         --prefix PATH ':' "${xauth}/bin"
+    '';
 
   meta = {
     homepage = http://xtrace.alioth.debian.org/;
-    description = "Trace X protocol connections";
-    license = "free";
+    description = "xtrace, a tool to trace X11 protocol connections";
+    license = "GPLv2";
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
   };

From 8d9d42f773a520fb35cc761f8250e89c12702de4 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 26 Nov 2010 12:34:46 +0000
Subject: [PATCH 19/94] add gettext_0_17, gettext_0_18 aliases to gettext,
 preparation for stdenv merge, concerning gnu hydra build configuration

svn path=/nixpkgs/branches/stdenv-updates/; revision=24867
---
 pkgs/top-level/all-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82ae222e2fc..85ccecbbd53 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2864,7 +2864,8 @@ let
 
   gettext = callPackage ../development/libraries/gettext { };
 
-  gettext_017 = callPackage ../development/libraries/gettext/0.17.nix { };
+  gettext_0_17 = callPackage ../development/libraries/gettext/0.17.nix { };
+  gettext_0_18 = gettext;
 
   gd = callPackage ../development/libraries/gd { };
 

From b37f799732c3f09aa43a2a02ec6753c68f158043 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 26 Nov 2010 12:38:09 +0000
Subject: [PATCH 20/94] gettext, now properly

svn path=/nixpkgs/branches/stdenv-updates/; revision=24868
---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85ccecbbd53..813adab18ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2862,10 +2862,10 @@ let
 
   geos = callPackage ../development/libraries/geos { };
 
-  gettext = callPackage ../development/libraries/gettext { };
+  gettext = gettext_0_18;
 
   gettext_0_17 = callPackage ../development/libraries/gettext/0.17.nix { };
-  gettext_0_18 = gettext;
+  gettext_0_18 = callPackage ../development/libraries/gettext { };
 
   gd = callPackage ../development/libraries/gd { };
 

From e571333232a40c50d40104bcaa86efc916860d07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 26 Nov 2010 14:12:10 +0000
Subject: [PATCH 21/94] Making ts and tm crossbuild

svn path=/nixpkgs/branches/stdenv-updates/; revision=24870
---
 pkgs/tools/system/tm/default.nix | 4 ++++
 pkgs/tools/system/ts/default.nix | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix
index a5e413690d0..0a4c1e58fc5 100644
--- a/pkgs/tools/system/tm/default.nix
+++ b/pkgs/tools/system/tm/default.nix
@@ -8,6 +8,10 @@ stdenv.mkDerivation {
 
   patchPhase = ''sed -i 's@/usr/bin/install@install@g' Makefile'';
 
+  crossAttrs = {
+    makeFlags = "CC=${stdenv.cross.config}-gcc";
+  };
+
   src = fetchurl {
     url = http://vicerveza.homeunix.net/~viric/soft/tm/tm-0.4.1.tar.gz;
     sha256 = "3b389bc03b6964ad5ffa57a344b891fdbcf7c9b2604adda723a863f83657c4a0";
diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix
index 80778a3546a..032b37a3868 100644
--- a/pkgs/tools/system/ts/default.nix
+++ b/pkgs/tools/system/ts/default.nix
@@ -6,6 +6,10 @@ stdenv.mkDerivation {
 
   installPhase=''make install "PREFIX=$out"'';
 
+  crossAttrs = {
+    makeFlags = "CC=${stdenv.cross.config}-gcc";
+  };
+
   src = fetchurl {
     url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.6.6.tar.gz;
     sha256 = "0mdg123ppq8ibf4315l4qi0w3n7wlj4x8dq5gx8f680v4bjvc30g";

From cbb3b6f1dc6871b88e9a12c9ea8b5f922c58e60b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 26 Nov 2010 14:33:30 +0000
Subject: [PATCH 22/94] Making fossil crossbuilt (I think I meant that in a
 previous commiit, but I ended up committing something screwed up)

svn path=/nixpkgs/branches/stdenv-updates/; revision=24873
---
 pkgs/applications/version-management/fossil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 24a21885767..291ab920679 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation {
     sha256 = "0h4g7qsbz5vyd3zxywcc2pf6vf3gavxqznpx8gn47j8y6mjp4byn";
   };
 
-  buildInputs = [ zlib openssl tcl ];
-  buildNativeInputs = [ zlib openssl ];
+  buildInputs = [ zlib openssl ];
+  buildNativeInputs = [ tcl ];
 
   doCheck = true;
 

From 7ff9a499297b7a35f97dce831eb51fbcc9461b44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 26 Nov 2010 14:34:29 +0000
Subject: [PATCH 23/94] Making halt and shutdown work fine in sysvinit (they
 had hardcoded /sbin, and now I hardcode $out/sbin) I also remove a patch I
 don't know what was it for.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24874
---
 pkgs/os-specific/linux/sysvinit/default.nix   |  5 ++++-
 .../linux/sysvinit/sysvinit-2.85-exec.patch   | 22 -------------------
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/sysvinit/sysvinit-2.85-exec.patch

diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix
index 4fa2a55367a..494098ec1d5 100644
--- a/pkgs/os-specific/linux/sysvinit/default.nix
+++ b/pkgs/os-specific/linux/sysvinit/default.nix
@@ -10,7 +10,10 @@ stdenv.mkDerivation {
     sha256 = "068mvzaz808a673zigyaqb63xc8bndh2klk16zi5c83rw70wifv0";
   };
   
-  patches = [ ./sysvinit-2.85-exec.patch ];
+  prePatch = ''
+    # Patch some minimal hard references, so halt/shutdown work
+    sed -i -e 's,/sbin/,$out/sbin/,' src/halt.c src/init.c src/paths.h
+  '';
 
   makeFlags = "SULOGINLIBS=-lcrypt ROOT=$(out) MANDIR=/share/man";
 
diff --git a/pkgs/os-specific/linux/sysvinit/sysvinit-2.85-exec.patch b/pkgs/os-specific/linux/sysvinit/sysvinit-2.85-exec.patch
deleted file mode 100644
index ef3d0f66b2f..00000000000
--- a/pkgs/os-specific/linux/sysvinit/sysvinit-2.85-exec.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ruN sysvinit-2.85/src/halt.c sysvinit-2.85.new/src/halt.c
---- sysvinit-2.85/src/halt.c	2001-11-27 13:12:03.000000000 +0100
-+++ sysvinit-2.85.new/src/halt.c	2005-10-18 20:09:47.000000000 +0200
-@@ -53,6 +53,10 @@
- #define KERNEL_MONITOR	1 /* If halt() puts you into the kernel monitor. */
- #define RUNLVL_PICKY	0 /* Be picky about the runlevel */
- 
-+#ifndef EXEC_PATH
-+  #define EXEC_PATH "/sbin/shutdown"
-+#endif
-+
- extern int ifdown(void);
- extern int hddown(void);
- extern void write_wtmp(char *user, char *id, int pid, int type, char *line);
-@@ -139,7 +143,7 @@
- 	args[i++] = "now";
- 	args[i++] = NULL;
- 
--	execv("/sbin/shutdown", args);
-+	execv(EXEC_PATH, args);
- 	execv("/etc/shutdown", args);
- 	execv("/bin/shutdown", args);

From 5103335a612a58c6e8bfb00d4fd066591815fa6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 26 Nov 2010 17:55:22 +0000
Subject: [PATCH 24/94] Making gpm crossbuild

svn path=/nixpkgs/branches/stdenv-updates/; revision=24879
---
 pkgs/servers/gpm/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix
index 5ab57b2cb3e..9ae20cd2c13 100644
--- a/pkgs/servers/gpm/default.nix
+++ b/pkgs/servers/gpm/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1990i19ddzn8gg5xwm53yn7d0mya885f48sd2hyvr7dvzyaw7ch8";
   };
 
-  buildInputs = [ flex bison ncurses ];
+  buildNativeInputs = [ flex bison ];
+  buildInputs = [ ncurses ];
 
   preConfigure =
     ''

From e18cbe33e6bcd4dd6b263747241451281fe153dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 26 Nov 2010 17:56:23 +0000
Subject: [PATCH 25/94] Adding a fbterm variant building with stdenv to get
 cross-build-ability (I want it in the nanonote)

svn path=/nixpkgs/branches/stdenv-updates/; revision=24880
---
 pkgs/os-specific/linux/fbterm/stdenv.nix | 32 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/os-specific/linux/fbterm/stdenv.nix

diff --git a/pkgs/os-specific/linux/fbterm/stdenv.nix b/pkgs/os-specific/linux/fbterm/stdenv.nix
new file mode 100644
index 00000000000..e57e528d2e3
--- /dev/null
+++ b/pkgs/os-specific/linux/fbterm/stdenv.nix
@@ -0,0 +1,32 @@
+# Quick version to be able to cross-build fbterm meanwhile builderDefs cannot
+# cross-build with an equivalent to the stdenvCross adapter.
+{ stdenv, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses }:
+
+let
+  version="1.5";
+  name="fbterm-1.5";
+  hash="05qzc6g9a79has3cy7dlw70n4pn13r552a2i1g4xy23acnpvvjsb";
+  url="http://fbterm.googlecode.com/files/fbterm-${version}.tar.gz";
+in
+
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    inherit url;
+    sha256 = hash;
+  };
+
+  buildNativeInputs = [ ncurses ];
+  buildInputs = [ gpm freetype fontconfig pkgconfig ];
+
+  patchPhase = ''
+    sed -e '/ifdef SYS_signalfd/atypedef long long loff_t;' -i src/fbterm.cpp
+
+    sed -e '/install-exec-hook:/,/^[^\t]/{d}; /.NOEXPORT/iinstall-exec-hook:\
+    ' -i src/Makefile.in
+
+    export HOME=$PWD;
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lfreetype"
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9cf46975103..f7e939ff939 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4491,6 +4491,8 @@ let
     inherit fontconfig gpm freetype pkgconfig ncurses;
   };
 
+  fbtermStdenv = callPackage ../os-specific/linux/fbterm/stdenv.nix { };
+
   fuse = callPackage ../os-specific/linux/fuse { };
 
   fxload = callPackage ../os-specific/linux/fxload { };

From f3beeca924145787bc766117fb34adac93303646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 26 Nov 2010 18:35:50 +0000
Subject: [PATCH 26/94] Fixing fbtermStdenv for cross building

svn path=/nixpkgs/branches/stdenv-updates/; revision=24881
---
 pkgs/os-specific/linux/fbterm/stdenv.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/fbterm/stdenv.nix b/pkgs/os-specific/linux/fbterm/stdenv.nix
index e57e528d2e3..893dba11b60 100644
--- a/pkgs/os-specific/linux/fbterm/stdenv.nix
+++ b/pkgs/os-specific/linux/fbterm/stdenv.nix
@@ -27,6 +27,9 @@ stdenv.mkDerivation {
     ' -i src/Makefile.in
 
     export HOME=$PWD;
+
     export NIX_LDFLAGS="$NIX_LDFLAGS -lfreetype"
+    # This is only relevant cross-building
+    export NIX_CROSS_LDFLAGS="$NIX_CROSS_LDFLAGS -lfreetype"
   '';
 }

From 614c40a1e1b11683edfeb12d5415c2d4f7f6038d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 26 Nov 2010 18:43:55 +0000
Subject: [PATCH 27/94] Adding the 'gzip' dependency to lynx (important
 cross-building). Otherwise, on a cross-built lynx, it cannot gunzip pages
 that came in gzip-compressed. (It was calling the host gzip, a lynx
 dependency, before)

svn path=/nixpkgs/branches/stdenv-updates/; revision=24882
---
 pkgs/applications/networking/browsers/lynx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index ed13fb550e5..c0175fc6a70 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses
+{ stdenv, fetchurl, ncurses, gzip
 , sslSupport ? true, openssl ? null
 }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   
   configureFlags = if sslSupport then "--with-ssl" else "";
   
-  buildInputs = [ ncurses ] ++ stdenv.lib.optional sslSupport openssl;
+  buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl;
   buildNativeInputs = [ ncurses ];
 
   crossAttrs = {

From c1dc539303dd89040d9fcfaf2b1b6b19cf53a443 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 26 Nov 2010 20:08:14 +0000
Subject: [PATCH 28/94] Fixing the sysvinit crossbuild (now yes)

svn path=/nixpkgs/branches/stdenv-updates/; revision=24885
---
 pkgs/os-specific/linux/sysvinit/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix
index 494098ec1d5..c088d3c5b1b 100644
--- a/pkgs/os-specific/linux/sysvinit/default.nix
+++ b/pkgs/os-specific/linux/sysvinit/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   
   prePatch = ''
     # Patch some minimal hard references, so halt/shutdown work
-    sed -i -e 's,/sbin/,$out/sbin/,' src/halt.c src/init.c src/paths.h
+    sed -i -e "s,/sbin/,$out/sbin/," src/halt.c src/init.c src/paths.h
   '';
 
   makeFlags = "SULOGINLIBS=-lcrypt ROOT=$(out) MANDIR=/share/man";

From ab419e9f86c78f02c4ddc04f4586c20a25dcb53d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 27 Nov 2010 15:49:43 +0000
Subject: [PATCH 29/94] Adding support for job control in bash cross-building,
 because otherwise it does not get built.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24890
---
 pkgs/shells/bash/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index 7971a19871c..60eaf4d4dab 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -2,7 +2,10 @@
 
 assert interactive -> readline != null;
 
-let realName = "bash-4.1"; in
+let
+  realName = "bash-4.1";
+  baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline";
+in
 
 stdenv.mkDerivation rec {
   name = "${realName}-p${toString (builtins.length patches)}";
@@ -33,12 +36,17 @@ stdenv.mkDerivation rec {
     in
       import ./bash-patches.nix patch;
 
+  crossAttrs = {
+    configureFlags = baseConfigureFlags +
+      " bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing";
+  };
+
+  configureFlags = baseConfigureFlags;
+
   # Note: Bison is needed because the patches above modify parse.y.
   buildNativeInputs = [bison]
     ++ stdenv.lib.optional (texinfo != null) texinfo
     ++ stdenv.lib.optional interactive readline;
-
-  configureFlags = if interactive then "--with-installed-readline" else "--disable-readline";
    
   postInstall = ''
     # Add an `sh' -> `bash' symlink.

From 0d122e7c6fe73bb61287c545fcfaba4e2b6285ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 29 Nov 2010 17:42:50 +0000
Subject: [PATCH 30/94] OProfile: Add dependency on zlib.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24925
---
 pkgs/development/tools/profiling/oprofile/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix
index 3e49c73e853..143704126f4 100644
--- a/pkgs/development/tools/profiling/oprofile/default.nix
+++ b/pkgs/development/tools/profiling/oprofile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, binutils, popt, makeWrapper, gawk, which, gnugrep
+{ stdenv, fetchurl, binutils, popt, makeWrapper, gawk, which, gnugrep, zlib
 , qt ? null, libX11 ? null, libXext ? null, libpng ? null }:
 
 # libX11 is needed because the Qt build stuff automatically adds `-lX11'.
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
             s|^PATH=.*$||g"
   '';
 
-  buildInputs = [ binutils popt makeWrapper gawk which gnugrep ]
+  buildInputs = [ binutils zlib popt makeWrapper gawk which gnugrep ]
     ++ stdenv.lib.optionals (qt != null) [ qt libX11 libXext libpng ];
 
   configureFlags =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f7e939ff939..1e0c9e1353f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2507,7 +2507,7 @@ let
   openocd = callPackage ../development/tools/misc/openocd { };
 
   oprofile = import ../development/tools/profiling/oprofile {
-    inherit fetchurl stdenv binutils popt makeWrapper gawk which gnugrep;
+    inherit fetchurl stdenv binutils popt makeWrapper gawk which gnugrep zlib;
 
     # Optional build inputs for the (useless) GUI.
     /*

From fca73ee251d58abbe41d22c50836f45516cd345a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 29 Nov 2010 18:00:26 +0000
Subject: [PATCH 31/94] Making directfb with more options, so it can be
 cross-built without X for example.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24926
---
 .../libraries/directfb/default.nix            | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix
index 0a3c5e5d7b2..55a8a823e1c 100644
--- a/pkgs/development/libraries/directfb/default.nix
+++ b/pkgs/development/libraries/directfb/default.nix
@@ -1,6 +1,7 @@
-{stdenv, fetchurl, perl, zlib, libjpeg, freetype, 
-  SDL, libX11, xproto, xextproto, libXext, libpng,
-  renderproto, libXrender, giflib}:
+{stdenv, fetchurl, perl, zlib, libjpeg, freetype, libpng, giflib
+, enableX11 ? true, libX11, xproto, xextproto, libXext, renderproto, libXrender
+, enableSDL ? true, SDL }:
+
 let s = import ./src-for-default.nix; in
 stdenv.mkDerivation {
   inherit (s) name;
@@ -8,22 +9,30 @@ stdenv.mkDerivation {
     url = s.url;
     sha256 = s.hash;
   };
-  buildInputs = [perl zlib libjpeg freetype SDL
-    xproto libX11 libXext xextproto libpng
-    renderproto libXrender giflib
+
+  buildNativeInputs = [ perl ];
+
+  buildInputs = [ zlib libjpeg freetype giflib libpng ]
+    ++ stdenv.lib.optional enableSDL SDL
+    ++ stdenv.lib.optionals enableX11 [
+      xproto libX11 libXext xextproto
+      renderproto libXrender
     ];
+
   NIX_LDFLAGS="-lgcc_s";
+
   configureFlags = [
     "--enable-sdl"
     "--enable-zlib"
     "--with-gfxdrivers=all"
     "--enable-devmem"
     "--enable-fbdev"
-    "--enable-x11"
     "--enable-mmx"
     "--enable-sse"
     "--enable-sysfs"
     "--with-software"
     "--with-smooth-scaling"
+    ] ++ stdenv.lib.optionals enableX11 [
+      "--enable-x11"
     ];
 }

From ebe1ebaba8c0baa1db9691a8c97acf0f7a1fbe89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 29 Nov 2010 18:03:03 +0000
Subject: [PATCH 32/94] Adding a stdenv version of links2, to be able to
 cross-build it. This can be removed once builderDefs can be made to support
 the stdenvCross adapter

svn path=/nixpkgs/branches/stdenv-updates/; revision=24927
---
 .../networking/browsers/links2/stdenv.nix     | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/links2/stdenv.nix

diff --git a/pkgs/applications/networking/browsers/links2/stdenv.nix b/pkgs/applications/networking/browsers/links2/stdenv.nix
new file mode 100644
index 00000000000..923d0aff0f5
--- /dev/null
+++ b/pkgs/applications/networking/browsers/links2/stdenv.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, libpng, libjpeg, bzip2, zlib, libtiff,  gpm, openssl, pkgconfig, directfb 
+, enableX11 ? true, libX11, libXau, xproto, libXt }:
+
+let
+  version="2.2";
+  name="links2-2.2";
+  hash="188y37rw4s9brl55ncc12q1b45w0caxcnsq1gqyby9byw1sawnq9";
+  url="http://links.twibright.com/download/links-${version}.tar.gz";
+  advertisedUrl="http://links.twibright.com/download/links-2.2.tar.gz";
+in
+
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    inherit url;
+    sha256 = hash;
+  };
+
+  buildInputs = [ libpng libjpeg bzip2 zlib libtiff  gpm openssl pkgconfig directfb ]
+    ++ stdenv.lib.optionals enableX11 [ libX11 libXau xproto libXt ];
+
+  configureFlags = [
+    "--enable-graphics"
+    "--with-ssl"
+    "--with-fb"
+    ] ++ stdenv.lib.optional enableX11 "--with-x";
+
+  crossAttrs = {
+    preConfigure = ''
+      export CC=$crossConfig-gcc
+    '';
+  };
+
+  meta = {
+    description = "A small browser with some graphics support";
+    maintainers = [
+      stdenv.lib.maintainers.viric
+    ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e0c9e1353f..4cf3a33b70b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6045,6 +6045,8 @@ let
     inherit (xlibs) libX11 libXau xproto libXt;
   };
 
+  links2Stdenv = callPackage ../applications/networking/browsers/links2/stdenv.nix { };
+
   lxdvdrip = callPackage ../applications/video/lxdvdrip { };
 
   lynx = callPackage ../applications/networking/browsers/lynx { };

From f7cfcbd1f9bddb8ad6f99c9e8cb1a91ff5dd30ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 29 Nov 2010 23:51:24 +0000
Subject: [PATCH 33/94] Making gpm generate proper files in $out/lib, that
 allow good cross-linking.  I had to do this to get the FB driver in links2 -
 it wants gpm to build, and without these changes, the "-lgpm" did not work.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24932
---
 pkgs/servers/gpm/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix
index 9ae20cd2c13..cb664eac253 100644
--- a/pkgs/servers/gpm/default.nix
+++ b/pkgs/servers/gpm/default.nix
@@ -15,7 +15,16 @@ stdenv.mkDerivation rec {
     ''
       sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in
     '';
-      
+
+  # Its configure script does not allow --disable-static
+  # Disabling this, we make cross-builds easier, because having
+  # cross-built static libraries we either have to disable stripping
+  # or fixing the gpm users, because there -lgpm will fail.
+  postInstall = ''
+    rm -f $out/lib/*.a
+    ln -s $out/lib/libgpm.so.2 $out/lib/libgpm.so
+  '';
+
   meta = {
     homepage = http://www.nico.schottelius.org/software/gpm/;
     description = "A daemon that provides mouse support on the Linux console";

From 0196bb720e5a0a4fa12634387ffb002141cf318d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 30 Nov 2010 14:10:52 +0000
Subject: [PATCH 34/94] Making the addCoverageInformation stdenv adapter better
 in the sense that it does not override NIX_CFLAGS_COMPILE anymore in the
 mkDerivation parameter attributes. This way, apacheHttpd can be built
 properly with coverage information. An indication of this problem came from
 the nixos tests.subversion failure.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24938
---
 pkgs/stdenv/adapters.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 16597d70c1a..5e135524af9 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -242,17 +242,18 @@ rec {
   */
   addCoverageInstrumentation = stdenv:
     addAttrsToDerivation
-      { NIX_CFLAGS_COMPILE = "-O0 --coverage";
-
-        # This is an uberhack to prevent libtool from removing gcno
-        # files.  This has been fixed in libtool, but there are
-        # packages out there with old ltmain.sh scripts.
-        # See http://www.mail-archive.com/libtool@gnu.org/msg10725.html
+      {
         postUnpack =
           ''
+            # This is an uberhack to prevent libtool from removing gcno
+            # files.  This has been fixed in libtool, but there are
+            # packages out there with old ltmain.sh scripts.
+            # See http://www.mail-archive.com/libtool@gnu.org/msg10725.html
             for i in $(find -name ltmain.sh); do
                 substituteInPlace $i --replace '*.$objext)' '*.$objext | *.gcno)'
             done
+
+            export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -O0 --coverage"
           '';
       }
       

From b5f1600e49b8c91d45e328517407cc1efbf69456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 30 Nov 2010 14:46:07 +0000
Subject: [PATCH 35/94] Fixing the build of dev86 (it does not like gnumake
 3.82)

svn path=/nixpkgs/branches/stdenv-updates/; revision=24940
---
 pkgs/top-level/all-packages.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4cf3a33b70b..77c8993f4e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -543,7 +543,12 @@ let
 
   desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { };
 
-  dev86 = callPackage ../development/compilers/dev86 { };
+  dev86 = callPackage ../development/compilers/dev86 {
+    /* Using GNU Make 3.82 leads to this:
+         make[4]: *** No rule to make target `__ldivmod.o)'
+       So use 3.81.  */
+    stdenv = overrideInStdenv stdenv [gnumake381];
+  };
 
   dnsmasq = callPackage ../tools/networking/dnsmasq {
     # TODO i18n can be installed as well, implement it?

From 9af474ca722ee12aa6e6e99fe85fdb756597f135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 2 Dec 2010 22:23:15 +0000
Subject: [PATCH 36/94] Fixing a problem of nscd on (only) armv5tel
 (soft-float). It gets linked to libgcc_s (shared lib) unless doing the trick
 I thought feasible of telling 'configure' that the linker does not support
 "as-needed". I found this reading their 'configure' script.

We don't want nscd linked to libgcc because that would make glibc dependant on the
previous gcc. This only happens on armv5tel, for the supported platforms.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24959
---
 pkgs/development/libraries/glibc-2.12/common.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.12/common.nix
index f29fb8a0b04..9ad0358e5cc 100644
--- a/pkgs/development/libraries/glibc-2.12/common.nix
+++ b/pkgs/development/libraries/glibc-2.12/common.nix
@@ -115,6 +115,10 @@ stdenv.mkDerivation ({
     "--host=arm-linux-gnueabi"
     "--build=arm-linux-gnueabi"
     "--without-fp"
+
+    # To avoid linking with -lgcc_s (dynamic link)
+    # so the glibc does not depend on its compiler store path
+    "libc_cv_as_needed=no"
   ];
   
   buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ]

From cf79eb4d89fcf1dbcbaece923d2d2537b0572253 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 4 Dec 2010 10:35:04 +0000
Subject: [PATCH 37/94] Making gdb cross-build (python apart)

svn path=/nixpkgs/branches/stdenv-updates/; revision=24965
---
 pkgs/development/tools/misc/gdb/default.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 31c92621ad7..00aeed1b41b 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
     sha256 = "1w0h6hya0bl46xddd57mdzwmffplwglhnh9x9hv46ll4mf44ni5z";
   };
 
-  buildInputs = [ ncurses readline gmp mpfr expat texinfo python ]
+  # I think python is not a native input, but I leave it
+  # here while I will not need it cross building
+  buildNativeInputs = [ texinfo python ];
+  buildInputs = [ ncurses readline gmp mpfr expat ]
     ++ stdenv.lib.optional doCheck dejagnu;
 
   configureFlags =
@@ -22,6 +25,14 @@ stdenv.mkDerivation rec {
     '' + stdenv.lib.optionalString (target != null)
        " --target=${target.config}";
 
+  crossAttrs = {
+    configureFlags =
+      '' --with-gmp=${gmp.hostDrv} --with-mpfr=${mpfr.hostDrv} --with-system-readline
+         --with-expat --with-libexpat-prefix=${expat.hostDrv}
+      '' + stdenv.lib.optionalString (target != null)
+         " --target=${target.config}";
+  };
+
   postInstall =
     '' # Remove Info files already provided by Binutils and other packages.
        rm -v $out/share/info/{standards,configure,bfd}.info

From cd9d91306c7f4f3d00c4f21ebbd864a186c8d4a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 4 Dec 2010 21:43:24 +0000
Subject: [PATCH 38/94] Fixing the dependency of cscope on 'emacs'.

On the other hand, cross-building emacs fails even to evaluate. I did not investigate.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24970
---
 pkgs/development/tools/misc/cscope/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix
index 2a9e77bd05b..c27c7ab291a 100644
--- a/pkgs/development/tools/misc/cscope/default.nix
+++ b/pkgs/development/tools/misc/cscope/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--with-ncurses=${ncurses}";
 
-  buildInputs = [ ncurses emacs ];
-  buildNativeInputs = [ pkgconfig ];
+  buildInputs = [ ncurses ];
+  buildNativeInputs = [ pkgconfig emacs ];
 
   postInstall = ''
     # Install Emacs mode.

From 1b62c9c06173f4d5e6b090e5ae0c68fa5f478faf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 4 Dec 2010 21:45:37 +0000
Subject: [PATCH 39/94] I made changes to achieve a working cross-built gcc
 wrapper. Now, "gcc45.hostDrv" works in the host system, together with libc,
 binutils, dynamic linker, ...

svn path=/nixpkgs/branches/stdenv-updates/; revision=24971
---
 pkgs/build-support/gcc-wrapper/default.nix       | 16 ++++++++++++++++
 pkgs/development/libraries/glibc-2.12/common.nix |  4 +++-
 pkgs/shells/bash/default.nix                     |  4 ++++
 pkgs/top-level/all-packages.nix                  |  5 +++--
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix
index 56069ec17b3..d30bf874506 100644
--- a/pkgs/build-support/gcc-wrapper/default.nix
+++ b/pkgs/build-support/gcc-wrapper/default.nix
@@ -51,6 +51,22 @@ stdenv.mkDerivation {
   langVhdl = if nativeTools then false else gcc ? langVhdl && gcc.langVhdl;
   zlib = if (gcc != null && gcc ? langVhdl) then zlib else null;
   shell = if shell == "" then stdenv.shell else shell;
+
+  crossAttrs = {
+    shell = shell.hostDrv + "${shell.hostDrv.shellPath}";
+    libc = libc.hostDrv;
+    coreutils = coreutils.hostDrv;
+    binutils = binutils.hostDrv;
+    gcc = gcc.hostDrv;
+    #
+    # This is not the best way to do this. I think the reference should be
+    # the style in the gcc-cross-wrapper, but to keep a stable stdenv now I
+    # do this sufficient if/else.
+    dynamicLinker = 
+      (if stdenv.cross.arch == "arm" then "ld-linux.so.3" else
+       if stdenv.cross.arch == "mips" then "ld.so.1" else
+       abort "don't know the name of the dynamic linker for this platform");
+  };
   
   meta =
     let gcc_ = if gcc != null then gcc else {}; in
diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.12/common.nix
index 9ad0358e5cc..f9d9e8f81a7 100644
--- a/pkgs/development/libraries/glibc-2.12/common.nix
+++ b/pkgs/development/libraries/glibc-2.12/common.nix
@@ -15,7 +15,9 @@ let
 
   needsPortsNative = stdenv.isMips || stdenv.isArm;
   needsPortsCross = cross.arch == "mips" || cross.arch == "arm";
-  needsPorts = if cross == null then needsPortsNative else needsPortsCross;
+  needsPorts = if (stdenv ? cross) && stdenv.cross != null then true
+    else if cross == null then needsPortsNative
+    else needsPortsCross;
 
   srcPorts = fetchurl {
     # A tarball I manually made from a git clone, for the tag "glibc-2.12.1".
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index 60eaf4d4dab..f29d4354a06 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -81,4 +81,8 @@ stdenv.mkDerivation rec {
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
   };
+
+  passthru = {
+    shellPath = "/bin/bash";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77c8993f4e3..cf1547064a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2052,6 +2052,7 @@ let
     nativePrefix = if stdenv ? gcc then stdenv.gcc.nativePrefix else "";
     gcc = baseGCC;
     libc = glibc;
+    shell = bash;
     inherit stdenv binutils coreutils zlib;
   };
 
@@ -2917,13 +2918,13 @@ let
     installLocales = getPkgConfig "glibc" "locales" false;
   });
 
-  glibc212 = callPackage ../development/libraries/glibc-2.12 {
+  glibc212 = (callPackage ../development/libraries/glibc-2.12 {
     kernelHeaders = linuxHeaders;
     installLocales = getPkgConfig "glibc" "locales" false;
     machHeaders = null;
     hurdHeaders = null;
     gccCross = null;
-  };
+  }) // { hostDrv = glibc212Cross; };
 
   glibc212Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.12)
     (let crossGNU = (crossSystem != null && crossSystem.config == "i586-pc-gnu");

From b94588c5c4bc3e24e84af7fddb426e89975a2146 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Dec 2010 13:45:07 +0000
Subject: [PATCH 40/94] * Remove obsolete patch.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25001
---
 ...r-passing-an-impure-NIX_BUILD_CORES-.patch | 126 ------------------
 1 file changed, 126 deletions(-)
 delete mode 100644 pkgs/tools/package-management/nix/0001-Added-support-for-passing-an-impure-NIX_BUILD_CORES-.patch

diff --git a/pkgs/tools/package-management/nix/0001-Added-support-for-passing-an-impure-NIX_BUILD_CORES-.patch b/pkgs/tools/package-management/nix/0001-Added-support-for-passing-an-impure-NIX_BUILD_CORES-.patch
deleted file mode 100644
index e5c4ba1b01e..00000000000
--- a/pkgs/tools/package-management/nix/0001-Added-support-for-passing-an-impure-NIX_BUILD_CORES-.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 9c655f52be055d06cbeb3144e14d6135a8d408e0 Mon Sep 17 00:00:00 2001
-From: Peter Simons <simons@cryp.to>
-Date: Tue, 22 Jun 2010 16:59:03 +0200
-Subject: [PATCH] Added support for passing an (impure) NIX_BUILD_CORES variable to build expressions.
-
-This patch adds the configuration file variable "build-cores" and the
-command line argument "--cores". These settings specify the number of
-CPU cores to utilize for parallel building within a job, i.e. by passing
-an appropriate "-j" flag to GNU Make. The default value is 1, which
-means that parallel building is *disabled*. If the number of build cores
-is specified as 0 (synonymously: "guess" or "auto"), then the actual
-value is supposed to be auto-detected by builders at run-time, i.e by
-calling the nproc(1) utility from coreutils.
-
-The environment variable $NIX_BUILD_CORES is available to builders, but
-the contents of that variable does *not* influence the hash that goes
-into the $out store path, i.e. the number of build cores to be utilized
-can be changed at will without requiring any re-builds.
----
- nix.conf.example        |   12 ++++++++++++
- src/libmain/shared.cc   |   14 ++++++++++++++
- src/libstore/build.cc   |    3 +++
- src/libstore/globals.cc |    1 +
- src/libstore/globals.hh |    5 +++++
- 5 files changed, 35 insertions(+), 0 deletions(-)
-
-diff --git a/nix.conf.example b/nix.conf.example
-index e17cf3c..6175d86 100644
---- a/nix.conf.example
-+++ b/nix.conf.example
-@@ -59,6 +59,18 @@
- #build-max-jobs = 1
- 
- 
-+### Option `build-cores'
-+#
-+# This option defines the number of CPU cores to utilize in parallel
-+# within a build job, i.e. by passing an appropriate `-jN' flag to
-+# GNU make. The default is 1, meaning that parallel building within
-+# jobs is disabled. Passing the special values `0', `auto', or
-+# `guess' causes Nix to try and auto-detect the number of available
-+# cores on the local host. This setting can be overridden using the
-+# `--cores' command line switch.
-+#build-cores = 1
-+
-+
- ### Option `build-max-silent-time'
- #
- # This option defines the maximum number of seconds that a builder can
-diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
-index 3fbec4b..19aa1e7 100644
---- a/src/libmain/shared.cc
-+++ b/src/libmain/shared.cc
-@@ -135,6 +135,12 @@ static void initAndRun(int argc, char * * argv)
-     /* Get some settings from the configuration file. */
-     thisSystem = querySetting("system", SYSTEM);
-     maxBuildJobs = queryIntSetting("build-max-jobs", 1);
-+    string tmp = querySetting("build-cores", "/UNDEFINED");
-+    std::transform(tmp.begin(), tmp.end(), tmp.begin(), tolower);
-+    if (tmp == "auto" || tmp == "guess")
-+      buildCores = 0;
-+    else
-+      buildCores = queryIntSetting("build-cores", 1);
-     maxSilentTime = queryIntSetting("build-max-silent-time", 0);
- 
-     /* Catch SIGINT. */
-@@ -226,6 +232,14 @@ static void initAndRun(int argc, char * * argv)
-             tryFallback = true;
-         else if (arg == "--max-jobs" || arg == "-j")
-             maxBuildJobs = getIntArg<unsigned int>(arg, i, args.end());
-+        else if (arg == "--cores") {
-+            string tmp = *(++i);
-+            std::transform(tmp.begin(), tmp.end(), tmp.begin(), tolower);
-+            if (tmp == "auto" || tmp == "guess")
-+              buildCores = 0u;
-+            else
-+              buildCores = getIntArg<unsigned int>(arg, --i, args.end());
-+        }
-         else if (arg == "--readonly-mode")
-             readOnlyMode = true;
-         else if (arg == "--max-silent-time")
-diff --git a/src/libstore/build.cc b/src/libstore/build.cc
-index f901c1f..a53c23b 100644
---- a/src/libstore/build.cc
-+++ b/src/libstore/build.cc
-@@ -1411,6 +1411,9 @@ void DerivationGoal::startBuilder()
-        in the store or in the build directory). */
-     env["NIX_STORE"] = nixStore;
- 
-+    /* The maximum number of cores to utilize for parallel building. */
-+    env["NIX_BUILD_CORES"] = (format("%d") % buildCores).str();
-+
-     /* Add all bindings specified in the derivation. */
-     foreach (StringPairs::iterator, i, drv.env)
-         env[i->first] = i->second;
-diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
-index cc0e44e..75d2f69 100644
---- a/src/libstore/globals.cc
-+++ b/src/libstore/globals.cc
-@@ -22,6 +22,7 @@ bool keepGoing = false;
- bool tryFallback = false;
- Verbosity buildVerbosity = lvlInfo;
- unsigned int maxBuildJobs = 1;
-+unsigned int buildCores = 1;
- bool readOnlyMode = false;
- string thisSystem = "unset";
- time_t maxSilentTime = 0;
-diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
-index d3388e3..a74a741 100644
---- a/src/libstore/globals.hh
-+++ b/src/libstore/globals.hh
-@@ -55,6 +55,11 @@ extern Verbosity buildVerbosity;
- /* Maximum number of parallel build jobs.  0 means unlimited. */
- extern unsigned int maxBuildJobs;
- 
-+/* Number of CPU cores to utilize in parallel within a build, i.e. by passing
-+   this number to Make via '-j'. 0 means that the number of actual CPU cores on
-+   the local host ought to be auto-detected. */
-+extern unsigned int buildCores;
-+
- /* Read-only mode.  Don't copy stuff to the store, don't change the
-    database. */
- extern bool readOnlyMode;
--- 
-1.7.1
-

From bf0fa02bffde8fa79a41eef68e47b560540e3a40 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Dec 2010 14:25:58 +0000
Subject: [PATCH 41/94] * Fix the GRUB 1 build on x86_64-linux.  It didn't
 build because   gcc43_multi is broken in the stdenv branch.  However, for
 GRUB 1 we   can just use the 32-bit build of GRUB (using callPackage_i686).

svn path=/nixpkgs/branches/stdenv-updates/; revision=25003
---
 pkgs/top-level/all-packages.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cf1547064a2..8e64e245bc2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -725,10 +725,8 @@ let
     ghostscript = null;
   };
 
-  grub = import ../tools/misc/grub {
-    inherit fetchurl autoconf automake;
-    stdenv = stdenv_32bit;
-    buggyBiosCDSupport = (getConfig ["grub" "buggyBiosCDSupport"] true);
+  grub = callPackage_i686 ../tools/misc/grub {
+    buggyBiosCDSupport = getConfig ["grub" "buggyBiosCDSupport"] true;
   };
 
   grub2 = callPackage ../tools/misc/grub/1.9x.nix { };

From 09bcba17f5bac4e93031e00c6684d25e9b770477 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 6 Dec 2010 15:30:19 +0000
Subject: [PATCH 42/94] Adding the nanonote openwrt 2.6.36 kernel

svn path=/nixpkgs/branches/stdenv-updates/; revision=25005
---
 .../linux/kernel/linux-nanonote-jz-2.6.36.nix | 241 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  12 +
 2 files changed, 253 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-nanonote-jz-2.6.36.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-nanonote-jz-2.6.36.nix b/pkgs/os-specific/linux/kernel/linux-nanonote-jz-2.6.36.nix
new file mode 100644
index 00000000000..ed5eabf025b
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-nanonote-jz-2.6.36.nix
@@ -0,0 +1,241 @@
+args @ { stdenv, fetchurl, fetchsvn, userModeLinux ? false, extraConfig ? ""
+, ... }:
+
+let
+  configWithPlatform = kernelPlatform :
+    ''
+      # Don't include any debug features.
+      DEBUG_KERNEL n
+
+      # Support drivers that need external firmware.
+      STANDALONE n
+
+      # Make /proc/config.gz available.
+      IKCONFIG_PROC y
+
+      # Optimize with -O2, not -Os.
+      CC_OPTIMIZE_FOR_SIZE n
+
+      # Enable the kernel's built-in memory tester.
+      MEMTEST y
+
+      # Include the CFQ I/O scheduler in the kernel, rather than as a
+      # module, so that the initrd gets a good I/O scheduler.
+      IOSCHED_CFQ y
+
+      # Disable some expensive (?) features.
+      FTRACE n
+      KPROBES n
+      NUMA? n
+      PM_TRACE_RTC n
+
+      # Enable various subsystems.
+      ACCESSIBILITY y # Accessibility support
+      AUXDISPLAY y # Auxiliary Display support
+      DONGLE y # Serial dongle support
+      HIPPI y
+      MTD_COMPLEX_MAPPINGS y # needed for many devices
+      NET_POCKET y # enable pocket and portable adapters
+      SCSI_LOWLEVEL y # enable lots of SCSI devices
+      SCSI_LOWLEVEL_PCMCIA y
+      SPI y # needed for many devices
+      SPI_MASTER y
+      WAN y
+
+      # Networking options.
+      IP_PNP n
+      IPV6_PRIVACY y
+      NETFILTER_ADVANCED y
+      IP_VS_PROTO_TCP y
+      IP_VS_PROTO_UDP y
+      IP_VS_PROTO_ESP y
+      IP_VS_PROTO_AH y
+      IP_DCCP_CCID3 n # experimental
+      CLS_U32_PERF y
+      CLS_U32_MARK y
+
+      # Wireless networking.
+      IPW2100_MONITOR y # support promiscuous mode
+      IPW2200_MONITOR y # support promiscuous mode
+      IWL4965 y # Intel Wireless WiFi 4965AGN
+      IWL5000 y # Intel Wireless WiFi 5000AGN
+      HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
+      HOSTAP_FIRMWARE_NVRAM y
+
+      # Some settings to make sure that fbcondecor works - in particular,
+      # disable tileblitting and the drivers that need it.
+
+      # Enable various FB devices.
+      FB y
+      FB_EFI y
+      FB_NVIDIA_I2C y # Enable DDC Support
+      FB_RIVA_I2C y
+      FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
+      FB_ATY_GX y # Mach64 GX support
+      FB_SAVAGE_I2C y
+      FB_SAVAGE_ACCEL y
+      FB_SIS_300 y
+      FB_SIS_315 y
+      FB_3DFX_ACCEL y
+      FB_GEODE y
+
+      # Video configuration
+      # The intel drivers already require KMS
+      DRM_I915_KMS y
+
+      # Sound.
+      SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
+      SND_HDA_INPUT_BEEP y # Support digital beep via input layer
+      SND_USB_CAIAQ_INPUT y
+      PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
+
+      # USB serial devices.
+      USB_SERIAL_GENERIC y # USB Generic Serial Driver
+      USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
+      USB_SERIAL_KEYSPAN_USA28 y
+      USB_SERIAL_KEYSPAN_USA28X y
+      USB_SERIAL_KEYSPAN_USA28XA y
+      USB_SERIAL_KEYSPAN_USA28XB y
+      USB_SERIAL_KEYSPAN_USA19 y
+      USB_SERIAL_KEYSPAN_USA18X y
+      USB_SERIAL_KEYSPAN_USA19W y
+      USB_SERIAL_KEYSPAN_USA19QW y
+      USB_SERIAL_KEYSPAN_USA19QI y
+      USB_SERIAL_KEYSPAN_USA49W y
+      USB_SERIAL_KEYSPAN_USA49WLC y
+
+      # Filesystem options - in particular, enable extended attributes and
+      # ACLs for all filesystems that support them.
+      EXT2_FS_XATTR y # Ext2 extended attributes
+      EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
+      EXT2_FS_SECURITY y # Ext2 Security Labels
+      EXT2_FS_XIP y # Ext2 execute in place support
+      EXT4_FS_POSIX_ACL y
+      EXT4_FS_SECURITY y
+      REISERFS_FS_XATTR y
+      REISERFS_FS_POSIX_ACL y
+      REISERFS_FS_SECURITY y
+      JFS_POSIX_ACL y
+      JFS_SECURITY y
+      XFS_QUOTA y
+      XFS_POSIX_ACL y
+      XFS_RT y # XFS Realtime subvolume support
+      OCFS2_DEBUG_MASKLOG n
+      BTRFS_FS_POSIX_ACL y
+      UBIFS_FS_XATTR y
+      UBIFS_FS_ADVANCED_COMPR y
+      NFSD_V2_ACL y
+      NFSD_V3 y
+      NFSD_V3_ACL y
+      NFSD_V4 y
+      CIFS_XATTR y
+      CIFS_POSIX y
+
+      # Security related features.
+      STRICT_DEVMEM y # Filter access to /dev/mem
+      SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
+
+      # Misc. options.
+      8139TOO_8129 y
+      8139TOO_PIO n # PIO is slower
+      AIC79XX_DEBUG_ENABLE n
+      AIC7XXX_DEBUG_ENABLE n
+      AIC94XX_DEBUG n
+      B43_PCMCIA y
+      BLK_DEV_BSG n
+      BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
+      BLK_DEV_IDEACPI y # IDE ACPI support
+      BLK_DEV_INTEGRITY y
+      BSD_PROCESS_ACCT_V3 y
+      BT_HCIUART_BCSP y
+      BT_HCIUART_H4 y # UART (H4) protocol support
+      BT_HCIUART_LL y
+      BT_RFCOMM_TTY y # RFCOMM TTY support
+      CPU_FREQ_DEBUG n
+      CRASH_DUMP n
+      DMAR? n # experimental
+      DVB_DYNAMIC_MINORS y # we use udev
+      FUSION y # Fusion MPT device support
+      IDE_GD_ATAPI y # ATAPI floppy support
+      IRDA_ULTRA y # Ultra (connectionless) protocol
+      JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
+      JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
+      JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
+      JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
+      KALLSYMS_EXTRA_PASS n
+      LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
+      LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
+      LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
+      LOGO n # not needed
+      MEDIA_ATTACH y
+      MEGARAID_NEWGEN y
+      MICROCODE_AMD y
+      MODVERSIONS y
+      MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
+      MTRR_SANITIZER y
+      NET_FC y # Fibre Channel driver support
+      PPP_MULTILINK y # PPP multilink support
+      REGULATOR y # Voltage and Current Regulator Support
+      SCSI_LOGGING y # SCSI logging facility
+      SERIAL_8250 y # 8250/16550 and compatible serial support
+      SLIP_COMPRESSED y # CSLIP compressed headers
+      SLIP_SMART y
+      THERMAL_HWMON y # Hardware monitoring support
+      USB_DEBUG n
+      USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
+      X86_CHECK_BIOS_CORRUPTION y
+      X86_MCE y
+
+      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
+      ${extraConfig}
+    '';
+in
+
+import ./generic.nix (
+
+  rec {
+    version = "qi_lb60-2.6.35-openwrt-24283";
+  
+    src = fetchurl {
+      url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.36.tar.bz2";
+      sha256 = "15a076d1a435a6bf8e92834eba4b390b4ec094ce06d47f89d071ca9e5788ce04";
+    };
+
+    srcPatch = fetchsvn {
+      url = "svn://svn.openwrt.org/openwrt/trunk/target/linux";
+      rev = 24283;
+      sha256 = "4e30266bbaf004acb10b5c182d0c01c7aba685956d36e76ea7c24dd55ae51c10";
+    };
+
+    preConfigure = ''
+      cp -R ${srcPatch}/generic/files/* .
+      chmod +w -R *
+      GLOBIGNORE='.:..:*preinit_as_init*'
+      for a in ${srcPatch}/generic/patches-2.6.36/* ${srcPatch}/xburst/patches-2.6.36/* ; do
+        echo applying patch $a
+        patch -p1 < $a
+      done
+      unset GLOBIGNORE
+      cat ${srcPatch}/generic/config-2.6.36 ${srcPatch}/xburst/config-2.6.36 \
+          ${srcPatch}/xburst/qi_lb60/config-2.6.36 > arch/mips/configs/qi_lb60_defconfig
+    '';
+
+    postInstall = ''
+      set -x
+      gzip -9 -c $out/vmlinux.bin > $out/vmlinux.bin.gz
+      KERNEL_ENTRY="0x`$crossConfig-nm $out/vmlinux 2>/dev/null |
+        grep " kernel_entry" | cut -f1 -d ' '`"
+      mkimage -A mips -O linux -T kernel -a 0x80010000 -C gzip \
+          -e $KERNEL_ENTRY -n "MIPS Nix Linux-2.6.36" \
+          -d $out/vmlinux.bin.gz $out/uImage
+      set +x
+    '';
+
+    config = configWithPlatform stdenv.platform;
+    configCross = configWithPlatform stdenv.cross.platform;
+
+    features.iwlwifi = true;
+  }
+
+  // removeAttrs args ["extraConfig"]
+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e64e245bc2..eb2808892a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4777,6 +4777,17 @@ let
       inherit fetchurl fetchsvn stdenv perl mktemp module_init_tools ubootChooser;
     };
 
+  linux_nanonote_jz_2_6_36 = makeOverridable
+    (import ../os-specific/linux/kernel/linux-nanonote-jz-2.6.36.nix) {
+      inherit fetchurl fetchsvn stdenv perl mktemp module_init_tools ubootChooser;
+      kernelPatches =
+        [ #kernelPatches.fbcondecor_2_6_35
+          kernelPatches.sec_perm_2_6_24
+          #kernelPatches.aufs2_2_6_35
+          kernelPatches.mips_restart_2_6_36
+        ];
+    };
+
   linux_2_6_35_oldI686 = linux_2_6_35.override {
       extraConfig = ''
           HIGHMEM64G? n
@@ -4912,6 +4923,7 @@ let
   linuxPackages_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_2_6_36 pkgs.linuxPackages_2_6_36);
   linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34); 
   linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35); 
+  linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36); 
 
   # The current default kernel / kernel modules.
   linux = linux_2_6_32;

From 475cbea1015ad87a262a4974651289ae0098322b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 6 Dec 2010 17:43:57 +0000
Subject: [PATCH 43/94] pkgs/tools/text/replace: move --mandir to standard
 location $out/share/man

Also, fixed the type of $makeFlags, which is a string, not a list.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25006
---
 pkgs/tools/text/replace/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix
index 339bf510c4b..01e58146ed8 100644
--- a/pkgs/tools/text/replace/default.nix
+++ b/pkgs/tools/text/replace/default.nix
@@ -8,12 +8,13 @@ stdenv.mkDerivation {
     sha256 = "1c2nkxx83vmlh1v3ib6r2xqh121gdb1rharwsimcb2h0xwc558dm";
   };
 
-  makeFlags = ["TREE=\$(out)"];
+  makeFlags = "TREE=\$(out) MANTREE=\$(TREE)/share/man";
 
   crossAttrs = {
-    makeFlags = [ "TREE=\$(out)" "CC=${stdenv.cross.config}-gcc" ];
+    makeFlags = "TREE=\$(out) MANTREE=\$(TREE)/share/man CC=${stdenv.cross.config}-gcc";
   };
 
+  preInstall = "ensureDir \$out/share/man";
   postInstall = "mv \$out/bin/replace \$out/bin/replace-literal";
 
   patches = [./malloc.patch];

From b2ae5a5ba974afe375e0ee2f6f3633b788ebbb13 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 6 Dec 2010 17:48:52 +0000
Subject: [PATCH 44/94] pkgs/tools/compression/bzip2: move --mandir into
 standard location $out/share/man

svn path=/nixpkgs/branches/stdenv-updates/; revision=25007
---
 pkgs/tools/compression/bzip2/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index 6be18e12a26..ff13c1a2ed0 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation {
   sharedLibrary =
     !stdenv.isDarwin && !(stdenv ? isDietLibC) && !(stdenv ? isStatic) && stdenv.system != "i686-cygwin" && !linkStatic;
 
+  preConfigure = "substituteInPlace Makefile --replace '$(PREFIX)/man' '$(PREFIX)/share/man'";
+
   makeFlags = if linkStatic then "LDFLAGS=-static" else "";
 
   inherit linkStatic;

From 43930b36d9bfdaaa48b751528cf567859dfa1312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 7 Dec 2010 15:18:05 +0000
Subject: [PATCH 45/94] I had changed the gcc-wrapper shell attribute, for it
 to be a specific kind of derivation instead of a string, but this did not
 cover all use cases we had. Instead of updating the use cases, I made the
 wrapper accept also a string.

We saw this problem trying to build gcc43_multi.


svn path=/nixpkgs/branches/stdenv-updates/; revision=25029
---
 pkgs/build-support/gcc-wrapper/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix
index d30bf874506..4e486f8fc64 100644
--- a/pkgs/build-support/gcc-wrapper/default.nix
+++ b/pkgs/build-support/gcc-wrapper/default.nix
@@ -50,10 +50,12 @@ stdenv.mkDerivation {
   langAda = if nativeTools then false else gcc ? langAda && gcc.langAda;
   langVhdl = if nativeTools then false else gcc ? langVhdl && gcc.langVhdl;
   zlib = if (gcc != null && gcc ? langVhdl) then zlib else null;
-  shell = if shell == "" then stdenv.shell else shell;
+  shell = if shell == "" then stdenv.shell else
+    if builtins.isAttrs shell then (shell + shell.shellPath)
+    else shell;
 
   crossAttrs = {
-    shell = shell.hostDrv + "${shell.hostDrv.shellPath}";
+    shell = shell.hostDrv + shell.hostDrv.shellPath;
     libc = libc.hostDrv;
     coreutils = coreutils.hostDrv;
     binutils = binutils.hostDrv;

From 2d3cf910947dcd585f434a5e698461fcfa902404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 8 Dec 2010 21:36:03 +0000
Subject: [PATCH 46/94] Updating openssl according to a security advisory in
 their web page.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25039
---
 pkgs/development/libraries/openssl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 90732cf75f8..54d4265e01c 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -7,11 +7,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "openssl-1.0.0b";
+  name = "openssl-1.0.0c";
 
   src = fetchurl {
     url = "http://www.openssl.org/source/${name}.tar.gz";
-    sha256 = "0cbk04cwmbf7l0bycqx8y04grfsx96mn2d8lbrydkqiyncplwysf";
+    sha256 = "1sq4sswyjxnr08lyjcafwdha6j5jd2b48vxfg48kdapdwdnv6cgp";
   };
 
   patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;

From 3f1a32c266f792290cb08c45ab40f22a43cb13cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 9 Dec 2010 23:43:01 +0000
Subject: [PATCH 47/94] Image-ExifTool 8.41.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25046
---
 pkgs/top-level/perl-packages.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8c2b616d796..8cf44ac0240 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1500,11 +1500,11 @@ rec {
   };
 
   ImageExifTool = buildPerlPackage rec {
-      name = "Image-ExifTool-8.12";
+      name = "Image-ExifTool-8.41";
 
       src = fetchurl {
         url = "http://www.sno.phy.queensu.ca/~phil/exiftool/${name}.tar.gz";
-        sha256 = "1s95f6cyl4cwyymmzsn49llza2hggh9lb3fqdpa83k6vbrzs86dh";
+        sha256 = "1fdjic0bhbai8zzl3287i9wcs88khiv8qx5slx9n3gzvbnxacvqg";
       };
 
       meta = {
@@ -1526,6 +1526,7 @@ rec {
         licenses = [ "GPLv1+" /* or */ "Artistic" ];
 
         maintainers = [ stdenv.lib.maintainers.ludo ];
+	platforms = stdenv.lib.platforms.unix;
       };
     };
 

From 0fe27433afe090d36dfeed2b61e635e61b07bb9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 12 Dec 2010 08:47:13 +0000
Subject: [PATCH 48/94] 'tar' fails at unpacking adobe files, but the files get
 unpacked. I simply disable the check for tar error codes.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25067
---
 pkgs/applications/misc/adobe-reader/builder.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/adobe-reader/builder.sh b/pkgs/applications/misc/adobe-reader/builder.sh
index 0b5ed4a4029..cd4bebfe9ad 100644
--- a/pkgs/applications/misc/adobe-reader/builder.sh
+++ b/pkgs/applications/misc/adobe-reader/builder.sh
@@ -3,11 +3,13 @@ source $stdenv/setup
 echo "unpacking $src..."
 tar xvfa $src
 
-ensureDir $out
+ensureDir $out/Adobe/Reader9
 
 echo "unpacking reader..."
+set +e
 tar xvf AdobeReader/COMMON.TAR -C $out
 tar xvf AdobeReader/ILINXR.TAR -C $out
+set -e
 
 # Disable this plugin for now (it needs LDAP, and I'm too lazy to add it).
 rm $out/Adobe/Reader*/Reader/intellinux/plug_ins/PPKLite.api

From e949c432a278ee55039520c2a8b6942d74355729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 12 Dec 2010 17:07:54 +0000
Subject: [PATCH 49/94] Fixing the evaluation of eval-release.nix. I don't
 understand why, but something ends up evaluating glibc.hostDrv.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25070
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index afc25a2e3ba..d6b64bc0e5f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2988,7 +2988,7 @@ let
     machHeaders = null;
     hurdHeaders = null;
     gccCross = null;
-  }) // { hostDrv = glibc212Cross; };
+  }) // (if crossSystem != null then { hostDrv = glibc212Cross; } else {});
 
   glibc212Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.12)
     (let crossGNU = (crossSystem != null && crossSystem.config == "i586-pc-gnu");

From 8416f47e26ad8c47c9aef879af35ba282f097c48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 12 Dec 2010 20:19:03 +0000
Subject: [PATCH 50/94] GNU Zile 2.3.21.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25075
---
 pkgs/applications/editors/zile/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix
index c9d3cf7b7ef..c81815da750 100644
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, ncurses, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "zile-2.3.20";
+  name = "zile-2.3.21";
 
   src = fetchurl {
     url = "mirror://gnu/zile/${name}.tar.gz";
-    sha256 = "0y07bkb7ypvsnz8ly7w274489icxw5z5hy6z50mx1nywkv2whd3q";
+    sha256 = "1cmw98khpyk0yv3fn94506fm7589adfbs57czrdsm4q8xf2xrj4i";
   };
 
   buildInputs = [ ncurses ];

From ac09f5b42d2a8412b71c415780e327eccb57494f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 12 Dec 2010 20:19:08 +0000
Subject: [PATCH 51/94] GNU ccRTP 1.7.2.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25076
---
 pkgs/development/libraries/ccrtp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix
index 11b8fba8b04..1b00e52a5b6 100644
--- a/pkgs/development/libraries/ccrtp/default.nix
+++ b/pkgs/development/libraries/ccrtp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, pkgconfig, libgcrypt, commoncpp2 }:
 
 stdenv.mkDerivation {
-  name = "ccrtp-1.7.1";
+  name = "ccrtp-1.7.2";
 
   src = fetchurl {
-    url = mirror://gnu/ccrtp/ccrtp-1.7.1.tar.gz;
-    sha256 = "0psi91r0fgawpa5x4jiq7lkr180agdi25gi0mfriqcmykxg7r1jn";
+    url = mirror://gnu/ccrtp/ccrtp-1.7.2.tar.gz;
+    sha256 = "1vz759f0342ih95sc7vmzx8als7y2ddr0s3jaaj03x22r7xaqzwy";
   };
 
   buildInputs = [ openssl pkgconfig libgcrypt commoncpp2 ];

From 209522e365569d895c7e1c560e59381b33ba79f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 12 Dec 2010 20:19:13 +0000
Subject: [PATCH 52/94] GNU Common C++ 1.8.1.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25077
---
 pkgs/development/libraries/commoncpp2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/commoncpp2/default.nix b/pkgs/development/libraries/commoncpp2/default.nix
index cd719e6a40b..81fb723c70a 100644
--- a/pkgs/development/libraries/commoncpp2/default.nix
+++ b/pkgs/development/libraries/commoncpp2/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "commoncpp2-1.8.0";
+  name = "commoncpp2-1.8.1";
 
   src = fetchurl {
     url = "mirror://gnu/commoncpp/${name}.tar.gz";
-    sha256 = "0a7arpm9l3s5qics5m77lyx1yl7998lkypydqwx11nj730034nmc";
+    sha256 = "0kmgr5w3b1qwzxnsnw94q6rqs0hr8nbv9clf07ca2a2fyypx9kjk";
   };
 
   doCheck = true;

From 12280e41b6350d0205b970253204fe961d4186de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 12 Dec 2010 20:19:18 +0000
Subject: [PATCH 53/94] GNU Linear Programming Kit 4.45.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25078
---
 pkgs/development/libraries/glpk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix
index d767cf4e3f3..1970ab57c9b 100644
--- a/pkgs/development/libraries/glpk/default.nix
+++ b/pkgs/development/libraries/glpk/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "glpk-4.44";
+  name = "glpk-4.45";
 
   src = fetchurl {
     url = "mirror://gnu/glpk/${name}.tar.gz";
-    sha256 = "0vby7idacxr4mzj2jrdrawrp91rl135zvnr3al5kdrqy0ik476i8";
+    sha256 = "13797cvyrvhga22klap9y370dlbnh40z5cf1dfkdjdj47mhwn1wj";
   };
 
   doCheck = true;

From c4756a5bb385f382ab16d1c9bccbe6e3e1b1a83f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 12 Dec 2010 20:19:23 +0000
Subject: [PATCH 54/94] GNU libtasn1 2.9.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25079
---
 pkgs/development/libraries/libtasn1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index a2fdeb09ce0..0f33174bf9f 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libtasn1-2.8";
+  name = "libtasn1-2.9";
 
   src = fetchurl {
     url = "mirror://gnu/libtasn1/${name}.tar.gz";
-    sha256 = "0njl5l9h48v2ikfim96yxpnwjhhfwfmszz4i08psw60bn7s78z9b";
+    sha256 = "1i0jnk810hg88jh3bhq63yn0n2cfmpmhrdm1ypv8rc68z9anii7s";
   };
 
   doCheck = true;

From a54b2d2ff07202c170f92a32848d58a86c1df501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 12 Dec 2010 20:19:28 +0000
Subject: [PATCH 55/94] GNU FreeDink 1.08.20101114.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25080
---
 pkgs/games/freedink/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix
index cb3f032539e..f41063272ce 100644
--- a/pkgs/games/freedink/default.nix
+++ b/pkgs/games/freedink/default.nix
@@ -2,11 +2,11 @@
 , pkgconfig, fontconfig, libzip, zip, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "freedink-1.08.20100420";
+  name = "freedink-1.08.20101114";
 
   src = fetchurl {
     url = "mirror://gnu/freedink/${name}.tar.gz";
-    sha256 = "0jw0690k7wgsga74nd8m1c3k34xmzgav6z0hhpx507krw2mkbm90";
+    sha256 = "0h3i7p7awk5flymh22xaazm2r56hv86z2il2gmbzrr6xh434zffa";
   };
 
   buildInputs = [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx pkgconfig fontconfig libzip zip zlib] ;

From ac8c173eb6df80e44639ac92f26cb6dc829f840c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 12 Dec 2010 20:19:33 +0000
Subject: [PATCH 56/94] GnuTLS 2.10.4.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25081
---
 pkgs/development/libraries/gnutls/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 666e5f539ed..04676611245 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -5,11 +5,11 @@ assert guileBindings -> guile != null;
 
 stdenv.mkDerivation rec {
 
-  name = "gnutls-2.10.2";
+  name = "gnutls-2.10.4";
 
   src = fetchurl {
     url = "mirror://gnu/gnutls/${name}.tar.bz2";
-    sha256 = "09479y0qy91qg20kkq9j0yy4agnpi4knb8ciq83cq0lvqqzplbp8";
+    sha256 = "1j2zfjipvzqfamyygndckjksizb5dd7f9wazvfciwrzya1jf7gxq";
   };
 
   configurePhase = ''

From 8404ee65b64f3b3ce796341e9ab68cd57e7444de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 12 Dec 2010 20:19:38 +0000
Subject: [PATCH 57/94] GNU Parallel 20101202.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25082
---
 pkgs/tools/misc/parallel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 05c1ffaa965..9cfa87f8383 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20100922";
+  name = "parallel-20101202";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "0bn1pka242pgm5dm0wkd4zf63rwv0wxxb0fjdjivlxyid72r7g8d";
+    sha256 = "156jnsf9dhmbi7r207fns2vphpnjdrbz5ndkp8m6d8b1p2qfj46i";
   };
 
   patchPhase =

From 5ce453b66e4af1639b628d53c6269411ecf897ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 12 Dec 2010 20:19:43 +0000
Subject: [PATCH 58/94] GNU acct 6.5.5.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25083
---
 pkgs/tools/system/acct/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix
index b8d9f6a3179..003dbb45a2a 100644
--- a/pkgs/tools/system/acct/default.nix
+++ b/pkgs/tools/system/acct/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "acct-6.5.4";
+  name = "acct-6.5.5";
 
   src = fetchurl {
     url = "mirror://gnu/acct/${name}.tar.gz";
-    sha256 = "1fvrv70rnli1q7pn1j10z55f26awh54zwwann0s88yrjvpbzbhka";
+    sha256 = "1mbg18acrva5m7kxc9pzhaknsqm4r90nrp7ax9jkm9wjkrxwhqs1";
   };
 
   doCheck = true;

From 2e819f094c2ff3e23f7a5a07b7d5b3ee3f2fead0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 12 Dec 2010 20:19:48 +0000
Subject: [PATCH 59/94] GNU wdiff 0.6.5.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25084
---
 pkgs/tools/text/wdiff/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix
index 760ab077012..1b51e19c427 100644
--- a/pkgs/tools/text/wdiff/default.nix
+++ b/pkgs/tools/text/wdiff/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "wdiff-0.6.3";
+  name = "wdiff-0.6.5";
 
   src = fetchurl {
     url = "mirror://gnu/wdiff/${name}.tar.gz";
-    sha256 = "04x0snfyahw9si160zwghh5nmijn535iacbbfsd376w4p0k5zk08";
+    sha256 = "1fij74hni4mi1zipf5is8kr1i9cssyyq5kqqhcxi0j7mynb5d1sm";
   };
 
   doCheck = true;

From d922bfcfc2df83d160a7311c59ba9684dd4e3212 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 12 Dec 2010 21:48:29 +0000
Subject: [PATCH 60/94] Making the current versions of flex/bison the default.
 Evaluation test passes. Please explicitly pass older versions to any package
 that can be adversely affected by too-fresh versions.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25086
---
 pkgs/top-level/all-packages.nix | 72 +++++++++------------------------
 1 file changed, 19 insertions(+), 53 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6b64bc0e5f..2f5636e33fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -664,9 +664,7 @@ let
   gifsicle = callPackage ../tools/graphics/gifsicle { };
 
   glusterfs = builderDefsPackage ../tools/filesystems/glusterfs {
-    inherit fuse;
-    bison = bison24;
-    flex = flex2535;
+    inherit fuse flex bison;
   };
 
   glxinfo = callPackage ../tools/graphics/glxinfo { };
@@ -859,13 +857,9 @@ let
 
   mcron = callPackage ../tools/system/mcron { };
 
-  mdbtools = callPackage ../tools/misc/mdbtools {
-    flex = flex2535;
-  };
+  mdbtools = callPackage ../tools/misc/mdbtools { };
 
-  mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix {
-    flex = flex2535;
-  };
+  mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix { };
 
   miniupnpd = callPackage ../tools/networking/miniupnpd { };
 
@@ -878,9 +872,7 @@ let
   mldonkey = callPackage ../applications/networking/p2p/mldonkey { };
 
   monit = builderDefsPackage ../tools/system/monit {
-    flex = flex2535;
-    bison = bison24;
-    inherit openssl;
+    inherit openssl flex bison;
   };
 
   mpage = callPackage ../tools/text/mpage { };
@@ -1325,9 +1317,7 @@ let
     wxGUI = getConfig [ "truecrypt" "wxGUI" ] true;
   };
 
-  ttmkfdir = callPackage ../tools/misc/ttmkfdir {
-    flex = flex2534;
-  };
+  ttmkfdir = callPackage ../tools/misc/ttmkfdir { };
 
   unbound = callPackage ../tools/networking/unbound { };
 
@@ -2424,7 +2414,7 @@ let
       cross = assert crossSystem != null; crossSystem;
   });
 
-  bison = bison23;
+  bison = bison24;
 
   bison1875 = callPackage ../development/tools/parsing/bison/bison-1.875.nix { };
 
@@ -2498,7 +2488,7 @@ let
 
   checkstyle = callPackage ../development/tools/analysis/checkstyle { };
 
-  flex = flex254a;
+  flex = flex2535;
 
   flex2535 = callPackage ../development/tools/parsing/flex/flex-2.5.35.nix { };
 
@@ -2656,9 +2646,8 @@ let
   valkyrie = callPackage ../development/tools/analysis/valkyrie { };
 
   xxdiff = builderDefsPackage (import ../development/tools/misc/xxdiff/3.2.nix) {
-    flex = flex2535;
     qt = qt3;
-    inherit pkgconfig makeWrapper bison python;
+    inherit pkgconfig makeWrapper bison python flex;
     inherit (xlibs) libXext libX11;
   };
 
@@ -4036,10 +4025,9 @@ let
       libjpeg libtiff libpng libxml2 libxslt sqlite
       icu cairo perl intltool automake libtool
       pkgconfig autoconf bison libproxy enchant
-      python ruby which;
+      python ruby which flex;
     inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg
       gstPluginsGood;
-    flex = flex2535;
     inherit (xlibs) libXt renderproto libXrender;
   }).deepOverride {libsoup = gnome28.libsoup_2_31;});
 
@@ -4064,9 +4052,7 @@ let
   xapianBindings = callPackage ../development/libraries/xapian/bindings {  # TODO perl php Java, tcl, C#, python
   };
 
-  Xaw3d = callPackage ../development/libraries/Xaw3d {
-    flex = flex2533;
-  };
+  Xaw3d = callPackage ../development/libraries/Xaw3d { };
 
   xbase = callPackage ../development/libraries/xbase { };
 
@@ -4565,9 +4551,7 @@ let
 
   fxload = callPackage ../os-specific/linux/fxload { };
 
-  gpm = callPackage ../servers/gpm {
-    flex = flex2535;
-  };
+  gpm = callPackage ../servers/gpm { };
 
   hal = callPackage ../os-specific/linux/hal { };
 
@@ -4662,10 +4646,7 @@ let
 
   libcroup = callPackage ../os-specific/linux/libcg { };
 
-  libnl = callPackage ../os-specific/linux/libnl {
-    flex = flex2535;
-    bison = bison24;
-  };
+  libnl = callPackage ../os-specific/linux/libnl { };
 
   linuxHeaders = linuxHeaders_2_6_32;
 
@@ -5097,7 +5078,6 @@ let
 
   pam_console = callPackage ../os-specific/linux/pam_console {
     libtool = libtool_1_5;
-    flex = if stdenv.system == "i686-linux" then flex else flex2533;
   };
 
   pam_devperm = callPackage ../os-specific/linux/pam_devperm { };
@@ -6800,9 +6780,7 @@ let
 
   gltron = callPackage ../games/gltron { };
 
-  gnuchess = builderDefsPackage (import ../games/gnuchess) {
-    flex = flex2535;
-  };
+  gnuchess = builderDefsPackage (import ../games/gnuchess) { };
 
   gnugo = callPackage ../games/gnugo { };
 
@@ -6914,9 +6892,7 @@ let
     libjpeg = libjpeg62;
   };
 
-  warzone2100 = callPackage ../games/warzone2100 {
-    flex = flex2535;
-  };
+  warzone2100 = callPackage ../games/warzone2100 { };
 
   xboard = builderDefsPackage (import ../games/xboard) {
     inherit (xlibs) libX11 xproto libXt libXaw libSM
@@ -7117,9 +7093,7 @@ let
 
   minisat = callPackage ../applications/science/logic/minisat {};
 
-  opensmt = callPackage ../applications/science/logic/opensmt {
-    flex = flex2535;
-  };
+  opensmt = callPackage ../applications/science/logic/opensmt { };
 
   prover9 = callPackage ../applications/science/logic/prover9 { };
 
@@ -7262,7 +7236,6 @@ let
 
   lilypond = callPackage ../misc/lilypond {
     inherit (gtkLibs) pango;
-    flex = flex2535;
   };
 
   martyr = callPackage ../development/libraries/martyr { };
@@ -7295,9 +7268,7 @@ let
     import ../tools/package-management/nix/custom.nix {
       inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake
         autoconf libtool configureFlags enableScripts lib libxml2 boehmgc
-	pkgconfig;
-      flex = flex2535;
-      bison = bison24;
+	pkgconfig flex bison;
       aterm = aterm25;
       db4 = db45;
       inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m;
@@ -7368,10 +7339,9 @@ let
   texLive = builderDefsPackage (import ../misc/tex/texlive) {
     inherit builderDefs zlib bzip2 ncurses libpng ed
       gd t1lib freetype icu perl ruby expat curl
-      libjpeg bison python fontconfig;
+      libjpeg bison python fontconfig flex;
     inherit (xlibs) libXaw libX11 xproto libXt libXpm
       libXmu libXext xextproto libSM libICE;
-    flex = flex2535;
     ghostscript = ghostscriptX;
   };
 
@@ -7421,13 +7391,9 @@ let
   vice = callPackage ../misc/emulators/vice { };
 
   # Wine cannot be built in 64-bit; use a 32-bit build instead.
-  wine = callPackage_i686 ../misc/emulators/wine {
-    flex = pkgsi686Linux.flex2535;
-  };
+  wine = callPackage_i686 ../misc/emulators/wine { };
 
-  wineWarcraft = callPackage_i686 ../misc/emulators/wine/wine-warcraft.nix {
-    flex = pkgsi686Linux.flex2535;
-  };
+  wineWarcraft = callPackage_i686 ../misc/emulators/wine/wine-warcraft.nix { };
 
   x2x = callPackage ../tools/X11/x2x { };
 

From 0847b74a2c18f7bc9ba99653d079bcc57f35efd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 12 Dec 2010 23:21:29 +0000
Subject: [PATCH 61/94] libuuid: Fix cross-GNU builds.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25087
---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f5636e33fc..3a1ac4010e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4524,8 +4524,8 @@ let
       hostDrv = lib.overrideDerivation utillinuxng.hostDrv (args: {
         # `libblkid' fails to build on GNU/Hurd.
         configureFlags = args.configureFlags
-          + " --disable-libblkid --disable-mount --disable-fsck"
-          + " --enable-static";
+          + " --disable-libblkid --disable-mount --disable-libmount"
+          + " --disable-fsck --enable-static";
         doCheck = false;
         CPPFLAGS =                    # ugly hack for ugly software!
           lib.concatStringsSep " "

From ef8619b4b2ed2589285f543e7ae409ac8bd07405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 12 Dec 2010 23:21:35 +0000
Subject: [PATCH 62/94] GNU Parted: Allow cross-GNU builds.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25088
---
 pkgs/tools/misc/parted/default.nix | 22 +++++++++++++++++-----
 pkgs/top-level/all-packages.nix    | 21 +++++++++++++++++----
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix
index c4061949424..622753e2303 100644
--- a/pkgs/tools/misc/parted/default.nix
+++ b/pkgs/tools/misc/parted/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, devicemapper, libuuid, gettext, readline
-, utillinuxng, xz }:
+, utillinuxng, xz, enableStatic ? false, hurd ? null }:
 
 stdenv.mkDerivation rec {
   name = "parted-2.3";
@@ -9,14 +9,26 @@ stdenv.mkDerivation rec {
     sha256 = "0sabj81nawcjm8ww34lxg65ka8crv3w2ab4crh8ypw5agg681836";
   };
 
-  buildInputs = [ xz libuuid gettext readline libuuid devicemapper ];
+  buildNativeInputs = [ xz ];
+  buildInputs = [ libuuid ]
+    ++ stdenv.lib.optional (readline != null) readline
+    ++ stdenv.lib.optional (gettext != null) gettext
+    ++ stdenv.lib.optional (devicemapper != null) devicemapper
+    ++ stdenv.lib.optional (hurd != null) hurd;
 
-  configureFlags = "--with-readline";
+  configureFlags =
+       (if (readline != null)
+        then [ "--with-readline" ]
+        else [ "--without-readline" ])
+    ++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper"
+    ++ stdenv.lib.optional enableStatic "--enable-static";
 
   doCheck = true;
 
-  # The `t0400-loop-clobber-infloop.sh' test wants `mkswap'.
-  preCheck = "export PATH=\"${utillinuxng}/sbin:$PATH\"";
+  preCheck =
+    stdenv.lib.optionalString doCheck
+      # The `t0400-loop-clobber-infloop.sh' test wants `mkswap'.
+      "export PATH=\"${utillinuxng}/sbin:$PATH\"";
 
   meta = {
     description = "GNU Parted, a tool to create, destroy, resize, check, and copy partitions";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a1ac4010e3..7cb15b9126e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1014,6 +1014,18 @@ let
 
   parted = callPackage ../tools/misc/parted { };
 
+  hurdPartedCross = (callPackage ../tools/misc/parted {
+    # Needs the Hurd's libstore.
+    hurd = hurdCrossIntermediate;
+
+    # The Hurd wants a libparted.a.
+    enableStatic = true;
+
+    gettext = null;
+    readline = null;
+    devicemapper = null;
+  }).hostDrv;
+
   patch = gnupatch;
 
   pbzip2 = callPackage ../tools/compression/pbzip2 { };
@@ -4588,10 +4600,11 @@ let
     # intermediate GCC.
     gccCross = gccCrossStageStatic;
 
-    # This intermediate Hurd is only needed to build libpthread, which really
-    # only needs libihash.
-    buildTarget = "libihash";
-    installTarget = "libihash-install";
+    # This intermediate Hurd is only needed to build libpthread, which needs
+    # libihash, and to build Parted, which needs libstore and
+    # libshouldbeinlibc.
+    buildTarget = "libihash libstore libshouldbeinlibc";
+    installTarget = "libihash-install libstore-install libshouldbeinlibc-install";
   });
 
   hurdHeaders = callPackage ../os-specific/gnu/hurd {

From 65e0e4dd688cbf352743087facc54293b99df7fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 12 Dec 2010 23:21:42 +0000
Subject: [PATCH 63/94] GNU Hurd: Add dependency on Parted.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25089
---
 pkgs/os-specific/gnu/hurd/default.nix | 7 ++++++-
 pkgs/top-level/all-packages.nix       | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix
index cfd88692ead..50802d3425b 100644
--- a/pkgs/os-specific/gnu/hurd/default.nix
+++ b/pkgs/os-specific/gnu/hurd/default.nix
@@ -1,9 +1,11 @@
 { fetchgit, stdenv, autoconf, automake, libtool, texinfo
 , machHeaders, mig, headersOnly ? true
 , cross ? null, gccCross ? null, glibcCross ? null
+, hurdPartedCross ? null, libuuid ? null
 , buildTarget ? "all", installTarget ? "install" }:
 
 assert (cross != null) -> (gccCross != null);
+assert (hurdPartedCross != null) -> (libuuid != null);
 
 let
   # Unfortunately we can't use `master@{DATE}', see
@@ -26,12 +28,15 @@ stdenv.mkDerivation ({
   };
 
   buildInputs = [ autoconf automake libtool texinfo mig ]
+    ++ stdenv.lib.optional (hurdPartedCross != null) hurdPartedCross
+    ++ stdenv.lib.optional (libuuid != null) libuuid
     ++ stdenv.lib.optional (gccCross != null) gccCross
     ++ stdenv.lib.optional (glibcCross != null) glibcCross;
 
   propagatedBuildInputs = [ machHeaders ];
 
-  configureFlags = stdenv.lib.optionals headersOnly [ "--build=i586-pc-gnu" ];
+  configureFlags = stdenv.lib.optionals headersOnly [ "--build=i586-pc-gnu" ]
+    ++ stdenv.lib.optional (hurdPartedCross != null) [ "--with-parted" ];
 
   preConfigure = "autoreconf -vfi";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7cb15b9126e..74550f2ce15 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4581,7 +4581,8 @@ let
 
   hurdCross = forceBuildDrv(import ../os-specific/gnu/hurd {
     inherit fetchgit stdenv autoconf libtool texinfo machHeaders
-      mig glibcCross;
+      mig glibcCross hurdPartedCross;
+    libuuid = libuuid.hostDrv;
     automake = automake111x;
     headersOnly = false;
     cross = assert crossSystem != null; crossSystem;
@@ -4612,6 +4613,8 @@ let
     headersOnly = true;
     gccCross = null;
     glibcCross = null;
+    libuuid = null;
+    hurdPartedCross = null;
   };
 
   hurdLibpthreadCross = forceBuildDrv(import ../os-specific/gnu/libpthread {

From 2ad6c9c6c215d48bd1524e8f281ede8bfea1e2dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 12 Dec 2010 23:35:10 +0000
Subject: [PATCH 64/94] Parted (cross-GNU): Only refer to `.hostDrv' when
 cross-building.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25090
---
 pkgs/top-level/all-packages.nix | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74550f2ce15..da0b5a67a21 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1014,17 +1014,20 @@ let
 
   parted = callPackage ../tools/misc/parted { };
 
-  hurdPartedCross = (callPackage ../tools/misc/parted {
-    # Needs the Hurd's libstore.
-    hurd = hurdCrossIntermediate;
+  hurdPartedCross =
+    if crossSystem != null && crossSystem.config == "i586-pc-gnu"
+    then (callPackage ../tools/misc/parted {
+        # Needs the Hurd's libstore.
+        hurd = hurdCrossIntermediate;
 
-    # The Hurd wants a libparted.a.
-    enableStatic = true;
+        # The Hurd wants a libparted.a.
+        enableStatic = true;
 
-    gettext = null;
-    readline = null;
-    devicemapper = null;
-  }).hostDrv;
+        gettext = null;
+        readline = null;
+        devicemapper = null;
+      }).hostDrv
+    else null;
 
   patch = gnupatch;
 

From ac9fac1ba1f68f848073032a021190c1cb92f95b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 12 Dec 2010 23:35:16 +0000
Subject: [PATCH 65/94] GNU Binutils 2.21.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25091
---
 .../tools/misc/binutils/default.nix           | 10 ++-
 .../tools/misc/binutils/snapshot.nix          | 61 -------------------
 pkgs/top-level/all-packages.nix               |  9 +--
 3 files changed, 8 insertions(+), 72 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/binutils/snapshot.nix

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 3e3dedd1e83..1928061c81d 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, noSysDirs, cross ? null}:
+{stdenv, fetchurl, noSysDirs, zlib, cross ? null}:
 
 let
-    basename = "binutils-2.20.1";
+    basename = "binutils-2.21";
 in
 stdenv.mkDerivation rec {
   name = basename + stdenv.lib.optionalString (cross != null) "-${cross.config}";
 
   src = fetchurl {
     url = "mirror://gnu/binutils/${basename}.tar.bz2";
-    sha256 = "1y7nwsprhr4hvx9ps2l0l0ivb6k41rcrx1invmzqxs475mr892r2";
+    sha256 = "1iyhc42zfa0j2gaxy4zvpk47sdqj4rqvib0mb8597ss8yidyrav0";
   };
 
   patches = [
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
     ./new-dtags.patch
   ];
 
+  buildInputs = [ zlib ];
+
   inherit noSysDirs;
 
   preConfigure = ''
@@ -34,6 +36,8 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = "--disable-werror" # needed for dietlibc build
+      + stdenv.lib.optionalString (stdenv.system == "mips64-linux")
+        " --enable-fix-loongson2f-nop"
       + stdenv.lib.optionalString (cross != null) " --target=${cross.config}";
 
   meta = {
diff --git a/pkgs/development/tools/misc/binutils/snapshot.nix b/pkgs/development/tools/misc/binutils/snapshot.nix
deleted file mode 100644
index 1a02eba7579..00000000000
--- a/pkgs/development/tools/misc/binutils/snapshot.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{stdenv, fetchurl, noSysDirs, zlib, cross ? null}:
-
-let
-    basename = "binutils-2.20.51";
-in
-stdenv.mkDerivation rec {
-  name = basename + stdenv.lib.optionalString (cross != null) "-${cross.config}";
-
-  src = fetchurl {
-    url = http://nixos.org/tarballs/binutils-2.20.51-pre-20100901.tar.bz2;
-    sha256 = "1872fdnbnq5z5svq7mvc0vyyad8pknwvx2glxq1bbk0xv7arp72y";
-  };
-
-  patches = [
-    # Turn on --enable-new-dtags by default to make the linker set
-    # RUNPATH instead of RPATH on binaries.  This is important because
-    # RUNPATH can be overriden using LD_LIBRARY_PATH at runtime.
-    ./new-dtags.patch
-  ];
-
-  buildInputs = [ zlib ];
-
-  inherit noSysDirs;
-
-  preConfigure = ''
-    # Clear the default library search path.
-    if test "$noSysDirs" = "1"; then
-	echo 'NATIVE_LIB_DIRS=' >> ld/configure.tgt
-    fi
-
-    # Use symlinks instead of hard links to save space ("strip" in the
-    # fixup phase strips each hard link separately).
-    for i in binutils/Makefile.in gas/Makefile.in ld/Makefile.in; do
-        substituteInPlace $i --replace 'ln ' 'ln -s '
-    done
-  '';
-
-  configureFlags = "--disable-werror" # needed for dietlibc build
-      + stdenv.lib.optionalString (stdenv.system == "mips64-linux")
-        " --enable-fix-loongson2f-nop"
-      + stdenv.lib.optionalString (cross != null) " --target=${cross.config}";
-
-  meta = {
-    description = "GNU Binutils, tools for manipulating binaries (linker, assembler, etc.)";
-
-    longDescription = ''
-      The GNU Binutils are a collection of binary tools.  The main
-      ones are `ld' (the GNU linker) and `as' (the GNU assembler).
-      They also include the BFD (Binary File Descriptor) library,
-      `gprof', `nm', `strip', etc.
-    '';
-
-    homepage = http://www.gnu.org/software/binutils/;
-
-    license = "GPLv3+";
-
-    /* Give binutils a lower priority than gcc-wrapper to prevent a
-       collision due to the ld/as wrappers/symlinks in the latter. */
-    priority = "10";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da0b5a67a21..e8be849d431 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2412,17 +2412,10 @@ let
 
   avrdude = callPackage ../development/tools/misc/avrdude { };
 
-  binutils_release = callPackage ../development/tools/misc/binutils {
+  binutils = callPackage ../development/tools/misc/binutils {
     inherit noSysDirs;
   };
 
-  binutils_snapshot = callPackage ../development/tools/misc/binutils/snapshot.nix {
-    inherit noSysDirs;
-  };
-
-  # We are waiting for a release. Meanwhile, sysvinit and the loongson2f need it.
-  binutils = binutils_snapshot;
-
   binutilsCross = forceBuildDrv (import ../development/tools/misc/binutils {
       inherit stdenv fetchurl;
       noSysDirs = true;

From e7739d9407565365ca7ebaafc75a6b875c68c83f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 12 Dec 2010 23:35:22 +0000
Subject: [PATCH 66/94] GNU Coreutils 8.7.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25092
---
 pkgs/tools/misc/coreutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index adf7b955410..21ce9215017 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -3,11 +3,11 @@
 assert aclSupport -> acl != null;
 
 stdenv.mkDerivation rec {
-  name = "coreutils-8.5";
+  name = "coreutils-8.7";
 
   src = fetchurl {
     url = "mirror://gnu/coreutils/${name}.tar.gz";
-    sha256 = "184cz98a9a6fw5db9hpy05srwxs3jqlvikqf2wxj1vfhqwm3w96x";
+    sha256 = "11ykd7glys6lcfb2mwgmkqmmffv1pan70j6sl9vcjpnlf9dvk7bw";
   };
 
   buildNativeInputs = [ perl ];

From f03da539a72977746325047dcc53de8474ad921f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 12 Dec 2010 23:35:27 +0000
Subject: [PATCH 67/94] GNU tar 1.25.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25093
---
 pkgs/tools/archivers/gnutar/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index eed4a14af6e..a38c7fcdd1e 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "gnutar-1.24";
+  name = "gnutar-1.25";
 
   src = fetchurl {
-    url = "mirror://gnu/tar/tar-1.24.tar.bz2";
-    sha256 = "1vddwgpdic4b88819bhg5jk4sj7cp1x1hxx9rqsg0s4gfmjy1ihp";
+    url = "mirror://gnu/tar/tar-1.25.tar.bz2";
+    sha256 = "0js9b1jd93kjk6dgf40y2fpgpnix247rk5aws2mjgwz0p10wxxpk";
   };
 
   meta = {

From 532e844a0c226e73bde8958d3ccd2a1bf13bf830 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 13 Dec 2010 08:04:14 +0000
Subject: [PATCH 68/94] Fix `binutilsCross'.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25094
---
 pkgs/top-level/all-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8be849d431..e2b982e1339 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2417,9 +2417,9 @@ let
   };
 
   binutilsCross = forceBuildDrv (import ../development/tools/misc/binutils {
-      inherit stdenv fetchurl;
-      noSysDirs = true;
-      cross = assert crossSystem != null; crossSystem;
+    inherit stdenv fetchurl zlib;
+    noSysDirs = true;
+    cross = assert crossSystem != null; crossSystem;
   });
 
   bison = bison24;

From 195a90d7ce5a3e449a43bf5d81299040601d1bb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 13 Dec 2010 22:46:21 +0000
Subject: [PATCH 69/94] Fixing a bug in the ld-wrapper, where the
 dynamic-linker path was taken as a path worth a "-rpath" entry.

This put a problem in the bootstrap, where we built 'zlib' and wanted to link programs with it, and while they got linked well, at runtime the boostrap-tools zlib came first on rpath becaue
the ld call was done with "-dynamic-linker ..." before "-lz".

I saw this trouble on the fuloong, where the zlib in boostrap-tools is not
runtime compatible with that binutils are linked to.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25107
---
 pkgs/build-support/gcc-wrapper/ld-wrapper.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
index 99ba3968ae3..ec09e758daf 100644
--- a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
@@ -105,6 +105,11 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then
             n=$((n + 1))
         elif test "${p:0:2}" = "-l"; then
             addToLibs ${p:2}
+        elif test "$p" = "-dynamic-linker"; then
+            # Ignore the dynamic linker argument, or it 
+            # will get into the next 'elif'. We don't want
+            # the dynamic linker path rpath to go always first.
+            n=$((n + 1))
         elif [[ "$p" =~ ^[^-].*\.so($|\.) ]]; then
             # This is a direct reference to a shared library, so add
             # its directory to the rpath.

From 3c78b202290023ce854936189cbd5cabdaa1a685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 13 Dec 2010 23:08:10 +0000
Subject: [PATCH 70/94] Updating glibc to 2.12.2 (considering the ports for
 2.12.1 would work equally).

I also update the url for the ports to take the upstream tarball instead of a
copy I had in vicerveza.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25108
---
 pkgs/development/libraries/glibc-2.12/common.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.12/common.nix
index f9d9e8f81a7..9b0d0ecab74 100644
--- a/pkgs/development/libraries/glibc-2.12/common.nix
+++ b/pkgs/development/libraries/glibc-2.12/common.nix
@@ -11,7 +11,7 @@ cross :
 
 let
   # For GNU/Hurd, see below.
-  version = if hurdHeaders != null then "20100512" else "2.12.1";
+  version = if hurdHeaders != null then "20100512" else "2.12.2";
 
   needsPortsNative = stdenv.isMips || stdenv.isArm;
   needsPortsCross = cross.arch == "mips" || cross.arch == "arm";
@@ -20,9 +20,9 @@ let
     else needsPortsCross;
 
   srcPorts = fetchurl {
-    # A tarball I manually made from a git clone, for the tag "glibc-2.12.1".
-    url = http://vicerveza.homeunix.net/~viric/tmp/nix/glibc-ports-2.12.1.tar.gz;
-    sha256 = "160dr4v9210r6d7xp0af5kx1pljcjaa2x4ya88psjiphcr6bsy37";
+    # These should work equally well for 2.12.2
+    url = "mirror://gnu/glibc/glibc-ports-2.12.1.tar.bz2";
+    sha256 = "041ix0nq7nc5r7jf80jsdlw4idah2mjp5nf7khybhc4cs1kc31ir";
   };
 
 in
@@ -159,7 +159,7 @@ stdenv.mkDerivation ({
     }
     else fetchurl {
       url = "mirror://gnu/glibc/glibc-${version}.tar.bz2";
-      sha256 = "01vlr473skl08xpcjz0b4lw23lsnskf5kx9s8nxwa4mwa9f137vm";
+      sha256 = "05hjz816a2hmzc44gxxi9vrdx6l9f23az794zj45xsxr94yfpy12";
     };
 
   # `fetchurl' is a function and thus should not be passed to the

From 55051fec781f257285170a310ed5c5d573430057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 13 Dec 2010 23:09:09 +0000
Subject: [PATCH 71/94] Removing patches for glibc bugs already fixed in the
 new glibc version.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25109
---
 .../libraries/glibc-2.12/audit_suid.patch     | 224 ------------------
 .../libraries/glibc-2.12/common.nix           |   6 -
 .../glibc-2.12/strncasecmp_sse42.patch        |  31 ---
 3 files changed, 261 deletions(-)
 delete mode 100644 pkgs/development/libraries/glibc-2.12/audit_suid.patch
 delete mode 100644 pkgs/development/libraries/glibc-2.12/strncasecmp_sse42.patch

diff --git a/pkgs/development/libraries/glibc-2.12/audit_suid.patch b/pkgs/development/libraries/glibc-2.12/audit_suid.patch
deleted file mode 100644
index 74ec4b763db..00000000000
--- a/pkgs/development/libraries/glibc-2.12/audit_suid.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-Fix for glibc vulnerability.
-http://www.securityfocus.com/bid/44347
-
-From:
-http://repo.or.cz/w/glibc.git/patch/8e9f92e9d5d7737afdacf79b76d98c4c42980508
-
-From 8e9f92e9d5d7737afdacf79b76d98c4c42980508 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Sun, 24 Oct 2010 21:43:15 -0400
-Subject: [PATCH] Require suid bit on audit objects in privileged programs
-
----
- ChangeLog                  |   15 +++++++++++++++
- elf/dl-deps.c              |    2 +-
- elf/dl-load.c              |   20 +++++++++++---------
- elf/dl-open.c              |    2 +-
- elf/rtld.c                 |   16 +++++++---------
- include/dlfcn.h            |    1 +
- sysdeps/generic/ldsodefs.h |    6 ++----
- 7 files changed, 38 insertions(+), 24 deletions(-)
-
-diff --git a/elf/dl-deps.c b/elf/dl-deps.c
-index a58de5c..a51fb6e 100644
---- a/elf/dl-deps.c
-+++ b/elf/dl-deps.c
-@@ -62,7 +62,7 @@ openaux (void *a)
- {
-   struct openaux_args *args = (struct openaux_args *) a;
- 
--  args->aux = _dl_map_object (args->map, args->name, 0,
-+  args->aux = _dl_map_object (args->map, args->name,
- 			      (args->map->l_type == lt_executable
- 			       ? lt_library : args->map->l_type),
- 			      args->trace_mode, args->open_mode,
-diff --git a/elf/dl-load.c b/elf/dl-load.c
-index a7162eb..aa8738f 100644
---- a/elf/dl-load.c
-+++ b/elf/dl-load.c
-@@ -1812,7 +1812,7 @@ open_verify (const char *name, struct filebuf *fbp, struct link_map *loader,
-    if MAY_FREE_DIRS is true.  */
- 
- static int
--open_path (const char *name, size_t namelen, int preloaded,
-+open_path (const char *name, size_t namelen, int secure,
- 	   struct r_search_path_struct *sps, char **realname,
- 	   struct filebuf *fbp, struct link_map *loader, int whatcode,
- 	   bool *found_other_class)
-@@ -1894,7 +1894,7 @@ open_path (const char *name, size_t namelen, int preloaded,
- 	  /* Remember whether we found any existing directory.  */
- 	  here_any |= this_dir->status[cnt] != nonexisting;
- 
--	  if (fd != -1 && __builtin_expect (preloaded, 0)
-+	  if (fd != -1 && __builtin_expect (secure, 0)
- 	      && INTUSE(__libc_enable_secure))
- 	    {
- 	      /* This is an extra security effort to make sure nobody can
-@@ -1963,7 +1963,7 @@ open_path (const char *name, size_t namelen, int preloaded,
- 
- struct link_map *
- internal_function
--_dl_map_object (struct link_map *loader, const char *name, int preloaded,
-+_dl_map_object (struct link_map *loader, const char *name,
- 		int type, int trace_mode, int mode, Lmid_t nsid)
- {
-   int fd;
-@@ -2067,7 +2067,8 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
- 	  for (l = loader; l; l = l->l_loader)
- 	    if (cache_rpath (l, &l->l_rpath_dirs, DT_RPATH, "RPATH"))
- 	      {
--		fd = open_path (name, namelen, preloaded, &l->l_rpath_dirs,
-+		fd = open_path (name, namelen, mode & __RTLD_SECURE,
-+				&l->l_rpath_dirs,
- 				&realname, &fb, loader, LA_SER_RUNPATH,
- 				&found_other_class);
- 		if (fd != -1)
-@@ -2082,14 +2083,15 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
- 	      && main_map != NULL && main_map->l_type != lt_loaded
- 	      && cache_rpath (main_map, &main_map->l_rpath_dirs, DT_RPATH,
- 			      "RPATH"))
--	    fd = open_path (name, namelen, preloaded, &main_map->l_rpath_dirs,
-+	    fd = open_path (name, namelen, mode & __RTLD_SECURE,
-+			    &main_map->l_rpath_dirs,
- 			    &realname, &fb, loader ?: main_map, LA_SER_RUNPATH,
- 			    &found_other_class);
- 	}
- 
-       /* Try the LD_LIBRARY_PATH environment variable.  */
-       if (fd == -1 && env_path_list.dirs != (void *) -1)
--	fd = open_path (name, namelen, preloaded, &env_path_list,
-+	fd = open_path (name, namelen, mode & __RTLD_SECURE, &env_path_list,
- 			&realname, &fb,
- 			loader ?: GL(dl_ns)[LM_ID_BASE]._ns_loaded,
- 			LA_SER_LIBPATH, &found_other_class);
-@@ -2098,12 +2100,12 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
-       if (fd == -1 && loader != NULL
- 	  && cache_rpath (loader, &loader->l_runpath_dirs,
- 			  DT_RUNPATH, "RUNPATH"))
--	fd = open_path (name, namelen, preloaded,
-+	fd = open_path (name, namelen, mode & __RTLD_SECURE,
- 			&loader->l_runpath_dirs, &realname, &fb, loader,
- 			LA_SER_RUNPATH, &found_other_class);
- 
-       if (fd == -1
--	  && (__builtin_expect (! preloaded, 1)
-+	  && (__builtin_expect (! (mode & __RTLD_SECURE), 1)
- 	      || ! INTUSE(__libc_enable_secure)))
- 	{
- 	  /* Check the list of libraries in the file /etc/ld.so.cache,
-@@ -2169,7 +2171,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
- 	  && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL
- 	      || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
- 	  && rtld_search_dirs.dirs != (void *) -1)
--	fd = open_path (name, namelen, preloaded, &rtld_search_dirs,
-+	fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs,
- 			&realname, &fb, l, LA_SER_DEFAULT, &found_other_class);
- 
-       /* Add another newline when we are tracing the library loading.  */
-diff --git a/elf/dl-open.c b/elf/dl-open.c
-index c394b3f..cf8e8cc 100644
---- a/elf/dl-open.c
-+++ b/elf/dl-open.c
-@@ -223,7 +223,7 @@ dl_open_worker (void *a)
- 
-   /* Load the named object.  */
-   struct link_map *new;
--  args->map = new = _dl_map_object (call_map, file, 0, lt_loaded, 0,
-+  args->map = new = _dl_map_object (call_map, file, lt_loaded, 0,
- 				    mode | __RTLD_CALLMAP, args->nsid);
- 
-   /* If the pointer returned is NULL this means the RTLD_NOLOAD flag is
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 5ecc4fe..06b534a 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -589,7 +589,6 @@ struct map_args
-   /* Argument to map_doit.  */
-   char *str;
-   struct link_map *loader;
--  int is_preloaded;
-   int mode;
-   /* Return value of map_doit.  */
-   struct link_map *map;
-@@ -627,16 +626,17 @@ static void
- map_doit (void *a)
- {
-   struct map_args *args = (struct map_args *) a;
--  args->map = _dl_map_object (args->loader, args->str,
--			      args->is_preloaded, lt_library, 0, args->mode,
--			      LM_ID_BASE);
-+  args->map = _dl_map_object (args->loader, args->str, lt_library, 0,
-+			      args->mode, LM_ID_BASE);
- }
- 
- static void
- dlmopen_doit (void *a)
- {
-   struct dlmopen_args *args = (struct dlmopen_args *) a;
--  args->map = _dl_open (args->fname, RTLD_LAZY | __RTLD_DLOPEN | __RTLD_AUDIT,
-+  args->map = _dl_open (args->fname,
-+			(RTLD_LAZY | __RTLD_DLOPEN | __RTLD_AUDIT
-+			 | __RTLD_SECURE),
- 			dl_main, LM_ID_NEWLM, _dl_argc, INTUSE(_dl_argv),
- 			__environ);
- }
-@@ -806,8 +806,7 @@ do_preload (char *fname, struct link_map *main_map, const char *where)
- 
-   args.str = fname;
-   args.loader = main_map;
--  args.is_preloaded = 1;
--  args.mode = 0;
-+  args.mode = __RTLD_SECURE;
- 
-   unsigned int old_nloaded = GL(dl_ns)[LM_ID_BASE]._ns_nloaded;
- 
-@@ -1054,7 +1053,6 @@ of this helper program; chances are you did not intend to run this program.\n\
- 
- 	  args.str = rtld_progname;
- 	  args.loader = NULL;
--	  args.is_preloaded = 0;
- 	  args.mode = __RTLD_OPENEXEC;
- 	  (void) _dl_catch_error (&objname, &err_str, &malloced, map_doit,
- 				  &args);
-@@ -1066,7 +1064,7 @@ of this helper program; chances are you did not intend to run this program.\n\
-       else
- 	{
- 	  HP_TIMING_NOW (start);
--	  _dl_map_object (NULL, rtld_progname, 0, lt_library, 0,
-+	  _dl_map_object (NULL, rtld_progname, lt_library, 0,
- 			  __RTLD_OPENEXEC, LM_ID_BASE);
- 	  HP_TIMING_NOW (stop);
- 
-diff --git a/include/dlfcn.h b/include/dlfcn.h
-index a67426d..af92483 100644
---- a/include/dlfcn.h
-+++ b/include/dlfcn.h
-@@ -9,6 +9,7 @@
- #define __RTLD_OPENEXEC	0x20000000
- #define __RTLD_CALLMAP	0x10000000
- #define __RTLD_AUDIT	0x08000000
-+#define __RTLD_SECURE	0x04000000 /* Apply additional security checks.  */
- 
- #define __LM_ID_CALLER	-2
- 
-diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
-index fcc943b..fa4b6b2 100644
---- a/sysdeps/generic/ldsodefs.h
-+++ b/sysdeps/generic/ldsodefs.h
-@@ -824,11 +824,9 @@ extern void _dl_receive_error (receiver_fct fct, void (*operate) (void *),
- 
- /* Open the shared object NAME and map in its segments.
-    LOADER's DT_RPATH is used in searching for NAME.
--   If the object is already opened, returns its existing map.
--   For preloaded shared objects PRELOADED is set to a non-zero
--   value to allow additional security checks.  */
-+   If the object is already opened, returns its existing map.  */
- extern struct link_map *_dl_map_object (struct link_map *loader,
--					const char *name, int preloaded,
-+					const char *name,
- 					int type, int trace_mode, int mode,
- 					Lmid_t nsid)
-      internal_function attribute_hidden;
--- 
-1.6.5.GIT
-
diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.12/common.nix
index 9b0d0ecab74..eb507afd82b 100644
--- a/pkgs/development/libraries/glibc-2.12/common.nix
+++ b/pkgs/development/libraries/glibc-2.12/common.nix
@@ -77,15 +77,9 @@ stdenv.mkDerivation ({
     /* Allow nixos and nix handle the locale-archive. */
     ./nix-locale-archive.patch
 
-    /* Fix for CVE-2010-3856. */
-    ./audit_suid.patch
-
     /* Fix for CVE-2010-3856. */
     ./ignore-origin.patch
 
-    /* Fix for CVE-2010-3856. */
-    ./strncasecmp_sse42.patch
-
   ];
 
   postPatch = ''
diff --git a/pkgs/development/libraries/glibc-2.12/strncasecmp_sse42.patch b/pkgs/development/libraries/glibc-2.12/strncasecmp_sse42.patch
deleted file mode 100644
index e5e4613d9d1..00000000000
--- a/pkgs/development/libraries/glibc-2.12/strncasecmp_sse42.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://bugzilla.redhat.com/show_bug.cgi?id=651638
-
-2010-11-09  H.J. Lu  <hongjiu.lu@intel.com>
-
-	[BZ #12205]
-	* string/test-strncasecmp.c (check_result): New function.
-	(do_one_test): Use it.
-	(check1): New function.
-	(test_main): Use it.
-
-	* sysdeps/i386/i686/multiarch/strcmp.S (nibble_ashr_use_sse4_2_exit):
-	Support strcasecmp and strncasecmp.
-
-diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S
-index 54e5bbc..1859289 100644
---- a/sysdeps/x86_64/multiarch/strcmp.S
-+++ b/sysdeps/x86_64/multiarch/strcmp.S
-@@ -1809,7 +1809,13 @@ LABEL(nibble_ashr_15_use_sse4_2):
- 	ja	LABEL(loop_ashr_15_use_sse4_2)
- 
- LABEL(nibble_ashr_use_sse4_2_exit):
-+# if !defined USE_AS_STRCASECMP_L && !defined USE_AS_STRNCASECMP_L
- 	pcmpistri      $0x1a,(%rsi,%rdx), %xmm0
-+# else
-+	movdqa	(%rsi,%rdx), %xmm1
-+	TOLOWER (%xmm0, %xmm1)
-+	pcmpistri $0x1a, %xmm1, %xmm0
-+# endif
- 	.p2align 4
- LABEL(use_sse4_2_exit):
- 	jnc	LABEL(strcmp_exitz_sse4_2)

From 8895565d45682befb47df1f68b3ff23f0d93afb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 13 Dec 2010 23:09:57 +0000
Subject: [PATCH 72/94] I think we had a *double* patch for the security
 problem CVE-2010-3856.

I had added the audit_suid.patch some time ago, and at some point niksnut added
this ignore-origin.patch. I think both fix the situation, the
ignore-origin.patch being released sooner than the audit_suid. As the
ignore-origin-patch is not in the recent glibc, it makes me think it was a quick
solution to the vulnerability, later properly fixed.

I remove, then, the ignore-origin.patch. We can check later if we remain
vulnerable.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25110
---
 .../libraries/glibc-2.12/common.nix           |  3 -
 .../libraries/glibc-2.12/ignore-origin.patch  | 85 -------------------
 2 files changed, 88 deletions(-)
 delete mode 100644 pkgs/development/libraries/glibc-2.12/ignore-origin.patch

diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.12/common.nix
index eb507afd82b..f398a618eaf 100644
--- a/pkgs/development/libraries/glibc-2.12/common.nix
+++ b/pkgs/development/libraries/glibc-2.12/common.nix
@@ -77,9 +77,6 @@ stdenv.mkDerivation ({
     /* Allow nixos and nix handle the locale-archive. */
     ./nix-locale-archive.patch
 
-    /* Fix for CVE-2010-3856. */
-    ./ignore-origin.patch
-
   ];
 
   postPatch = ''
diff --git a/pkgs/development/libraries/glibc-2.12/ignore-origin.patch b/pkgs/development/libraries/glibc-2.12/ignore-origin.patch
deleted file mode 100644
index ce3efca5859..00000000000
--- a/pkgs/development/libraries/glibc-2.12/ignore-origin.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Fix for CVE-2010-3847.
-
-2010-10-18  Andreas Schwab  <schwab@redhat.com>
-
-	* elf/dl-load.c (is_dst): Remove last parameter.
-	(_dl_dst_count): Ignore $ORIGIN in privileged programs.
-	(_dl_dst_substitute): Likewise.
----
- elf/dl-load.c |   30 +++++++++++++-----------------
- 1 files changed, 13 insertions(+), 17 deletions(-)
-
-diff --git a/elf/dl-load.c b/elf/dl-load.c
-index a7162eb..776f7e4 100644
---- a/elf/dl-load.c
-+++ b/elf/dl-load.c
-@@ -169,8 +169,7 @@ local_strdup (const char *s)
- 
- 
- static size_t
--is_dst (const char *start, const char *name, const char *str,
--	int is_path, int secure)
-+is_dst (const char *start, const char *name, const char *str, int is_path)
- {
-   size_t len;
-   bool is_curly = false;
-@@ -199,11 +198,6 @@ is_dst (const char *start, const char *name, const char *str,
- 	   && (!is_path || name[len] != ':'))
-     return 0;
- 
--  if (__builtin_expect (secure, 0)
--      && ((name[len] != '\0' && (!is_path || name[len] != ':'))
--	  || (name != start + 1 && (!is_path || name[-2] != ':'))))
--    return 0;
--
-   return len;
- }
- 
-@@ -218,13 +212,12 @@ _dl_dst_count (const char *name, int is_path)
-     {
-       size_t len;
- 
--      /* $ORIGIN is not expanded for SUID/GUID programs (except if it
--	 is $ORIGIN alone) and it must always appear first in path.  */
-+      /* $ORIGIN is not expanded for SUID/GUID programs.  */
-       ++name;
--      if ((len = is_dst (start, name, "ORIGIN", is_path,
--			 INTUSE(__libc_enable_secure))) != 0
--	  || (len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0
--	  || (len = is_dst (start, name, "LIB", is_path, 0)) != 0)
-+      if (((len = is_dst (start, name, "ORIGIN", is_path)) != 0
-+	   && !INTUSE(__libc_enable_secure))
-+	  || (len = is_dst (start, name, "PLATFORM", is_path)) != 0
-+	  || (len = is_dst (start, name, "LIB", is_path)) != 0)
- 	++cnt;
- 
-       name = strchr (name + len, '$');
-@@ -256,9 +249,12 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result,
- 	  size_t len;
- 
- 	  ++name;
--	  if ((len = is_dst (start, name, "ORIGIN", is_path,
--			     INTUSE(__libc_enable_secure))) != 0)
-+	  if ((len = is_dst (start, name, "ORIGIN", is_path)) != 0)
- 	    {
-+	      /* Ignore this path element in SUID/SGID programs.  */
-+	      if (INTUSE(__libc_enable_secure))
-+		repl = (const char *) -1;
-+	      else
- #ifndef SHARED
- 	      if (l == NULL)
- 		repl = _dl_get_origin ();
-@@ -266,9 +262,9 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result,
- #endif
- 		repl = l->l_origin;
- 	    }
--	  else if ((len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0)
-+	  else if ((len = is_dst (start, name, "PLATFORM", is_path)) != 0)
- 	    repl = GLRO(dl_platform);
--	  else if ((len = is_dst (start, name, "LIB", is_path, 0)) != 0)
-+	  else if ((len = is_dst (start, name, "LIB", is_path)) != 0)
- 	    repl = DL_DST_LIB;
- 
- 	  if (repl != NULL && repl != (const char *) -1)
--- 
-1.7.2.3

From a8a01a54ab2e405ee5440465cd1c8bc879bb3968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 14 Dec 2010 07:32:07 +0000
Subject: [PATCH 73/94] Removing another glibc patch already upstream.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25111
---
 .../libraries/glibc-2.12/common.nix           |  3 ---
 .../libraries/glibc-2.12/gnu89-inline.patch   | 26 -------------------
 2 files changed, 29 deletions(-)
 delete mode 100644 pkgs/development/libraries/glibc-2.12/gnu89-inline.patch

diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.12/common.nix
index f398a618eaf..0ffc8d7a0e8 100644
--- a/pkgs/development/libraries/glibc-2.12/common.nix
+++ b/pkgs/development/libraries/glibc-2.12/common.nix
@@ -71,9 +71,6 @@ stdenv.mkDerivation ({
     /* Have rpcgen(1) look for cpp(1) in $PATH.  */
     ./rpcgen-path.patch
 
-    /* Fix for the check of -fgnu89-inline compiler flag */
-    ./gnu89-inline.patch
-
     /* Allow nixos and nix handle the locale-archive. */
     ./nix-locale-archive.patch
 
diff --git a/pkgs/development/libraries/glibc-2.12/gnu89-inline.patch b/pkgs/development/libraries/glibc-2.12/gnu89-inline.patch
deleted file mode 100644
index 16d8f914a19..00000000000
--- a/pkgs/development/libraries/glibc-2.12/gnu89-inline.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/configure b/configure
-index ce76653..fba6de2 100755
---- a/configure
-+++ b/configure
-@@ -6891,7 +6891,7 @@ fi
- $as_echo "$libc_cv_gnu89_inline" >&6; }
- if test $libc_cv_gnu89_inline = yes; then
-   libc_cv_gnu89_inline=-fgnu89-inline
--else
-+elif test $libc_cv_gnu89_inline = no; then
-   libc_cv_gnu89_inline=
- fi
- 
-diff --git a/configure.in b/configure.in
-index 182c683..b867371 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1777,7 +1777,7 @@ fi
- rm -f conftest*])
- if test $libc_cv_gnu89_inline = yes; then
-   libc_cv_gnu89_inline=-fgnu89-inline
--else
-+elif test $libc_cv_gnu89_inline = no; then
-   libc_cv_gnu89_inline=
- fi
- AC_SUBST(libc_cv_gnu89_inline)

From e930a7385b87d84d25d1882c11e441d43cde983b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 14 Dec 2010 15:22:25 +0000
Subject: [PATCH 74/94] Fix about the order of -rpath and -L in the ld-wrapper

svn path=/nixpkgs/branches/stdenv-updates/; revision=25128
---
 pkgs/build-support/gcc-wrapper/ld-wrapper.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
index ec09e758daf..74b6273848e 100644
--- a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
@@ -122,11 +122,13 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then
     # Second, for each directory in the library search path (-L...),
     # see if it contains a dynamic library used by a -l... flag.  If
     # so, add the directory to the rpath.
+    # It's important to add the rpath in the order of -L..., so
+    # the link time chosen objects will be those of runtime linking.
     
-    for i in $libs; do
-        for j in $libPath; do
-            if test -f "$j/lib$i.so"; then
-                addToRPath $j
+    for i in $libPath; do
+        for j in $libs; do
+            if test -f "$i/lib$j.so"; then
+                addToRPath $i
                 break
             fi
         done

From fff4a6c8b40ec08b0921948976aa4bf7f02e69de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 14 Dec 2010 17:08:43 +0000
Subject: [PATCH 75/94] GCC 4.5: Fix the `GLIBC_DYNAMIC_LINKER' macro on NixOS
 and in cross builds.

Among others, this should fix the dynamic linker path reported by
"gcc --help --verbose".

svn path=/nixpkgs/branches/stdenv-updates/; revision=25131
---
 pkgs/development/compilers/gcc-4.5/default.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix
index 91fbc666008..77e3cbfa3ed 100644
--- a/pkgs/development/compilers/gcc-4.5/default.nix
+++ b/pkgs/development/compilers/gcc-4.5/default.nix
@@ -176,6 +176,21 @@ stdenv.mkDerivation ({
            sed -i "${gnu_h}" \
                -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g'
         ''
+    else if cross != null || stdenv.gcc.libc != null then
+      # On NixOS, use the right path to the dynamic linker instead of
+      # `/lib/ld*.so'.
+      let
+        libc = if cross != null then libcCross else stdenv.gcc.libc;
+      in
+        '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."
+           for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
+           do
+             grep -q LIBC_DYNAMIC_LINKER "$header" || continue
+             echo "  fixing \`$header'..."
+             sed -i "$header" \
+                 -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc}\3"|g'
+           done
+        ''
     else null;
 
   inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic

From e60ba9135a90808a3443d09fbd92f2259e9deea8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 17 Dec 2010 17:48:12 +0000
Subject: [PATCH 76/94] SimGrid 3.5.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25180
---
 .../science/misc/simgrid/default.nix          | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix
index 10d5798b331..5ba30a0f830 100644
--- a/pkgs/applications/science/misc/simgrid/default.nix
+++ b/pkgs/applications/science/misc/simgrid/default.nix
@@ -1,11 +1,11 @@
-{ fetchurl, stdenv, cmake, ruby }:
+{ fetchurl, stdenv, cmake, perl, ruby }:
 
 stdenv.mkDerivation rec {
-  name = "simgrid-3.4.1";
+  name = "simgrid-3.5";
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/26944/${name}.tar.bz2";
-    sha256 = "acd2bb2c1abf59e9b190279b1c38582b7c1edd4b6ef4c6a9b01100740f1a6b28";
+    url = "https://gforge.inria.fr/frs/download.php/28017/${name}.tar.gz";
+    sha256 = "1vd4pvrcyii1nfwyca3kpbwshbc965lfpn083zd8rigg6ydchq8y";
   };
 
   /* FIXME: Ruby currently disabled because of this:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
      ld: cannot find -lruby-1.8.7-p72
 
    */
-  buildInputs = [ cmake /* ruby */ ];
+  buildInputs = [ cmake perl /* ruby */ ];
 
   preConfigure =
     # Make it so that libsimgrid.so will be found when running programs from
@@ -28,14 +28,31 @@ stdenv.mkDerivation rec {
 
   makeFlags = "VERBOSE=1";
 
+  preBuild =
+    /* Work around this:
+
+      [ 20%] Generating _msg_handle_simulator.c, _msg_handle_client.c, _msg_handle_server.c
+      cd /tmp/nix-build-7yc8ghmf2yb8zi3bsri9b6qadwmfpzhr-simgrid-3.5.drv-0/simgrid-3.5/build/teshsuite/gras/msg_handle && ../../../bin/gras_stub_generator msg_handle /tmp/nix-build-7yc8ghmf2yb8zi3bsri9b6qadwmfpzhr-simgrid-3.5.drv-0/simgrid-3.5/teshsuite/gras/msg_handle/msg_handle.xml
+      ../../../bin/gras_stub_generator: error while loading shared libraries: libsimgrid.so.3.5: cannot open shared object file: No such file or directory
+      make[2]: *** [teshsuite/gras/msg_handle/_msg_handle_simulator.c] Error 127
+      make[2]: Leaving directory `/tmp/nix-build-7yc8ghmf2yb8zi3bsri9b6qadwmfpzhr-simgrid-3.5.drv-0/simgrid-3.5/build'
+
+    */
+    '' export LD_LIBRARY_PATH="$PWD/lib:$LD_LIBRARY_PATH"
+       echo "\$LD_LIBRARY_PATH is \`$LD_LIBRARY_PATH'"
+    '';
+
   patchPhase =
     '' for i in "src/smpi/"*
        do
          sed -i "$i" -e's|/bin/bash|/bin/sh|g'
        done
-    '';
 
-  installPhase = "make install-simgrid";
+       for i in $(grep -rl /usr/bin/perl .)
+       do
+         sed -i "$i" -e's|/usr/bin/perl|${perl}/bin/perl|g'
+       done
+    '';
 
   # Fixing the few tests that fail is left as an exercise to the reader.
   doCheck = false;

From cd6de2880faab0475af10898772d92dd79c89cf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 17 Dec 2010 20:41:25 +0000
Subject: [PATCH 77/94] Fixing the build of spidermonkey (on -fPIC) for mips.
 They enable automatically the -fPIC only on x86_64, while I think most
 non-i686 needs it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25189
---
 pkgs/development/interpreters/spidermonkey/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/interpreters/spidermonkey/default.nix b/pkgs/development/interpreters/spidermonkey/default.nix
index b63b38ebf29..e8d548df548 100644
--- a/pkgs/development/interpreters/spidermonkey/default.nix
+++ b/pkgs/development/interpreters/spidermonkey/default.nix
@@ -21,5 +21,7 @@ stdenv.mkDerivation rec {
       sed -e 's/ -ltermcap/ -lncurses/' -i ${makefile}
     '';
 
+  CFLAGS = "-DPIC -fPIC -DJS_C_STRINGS_ARE_UTF8";
+
   makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1";
 }

From 22253677b33c5e6afeb22975562bcf6269d742b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 19 Dec 2010 20:12:10 +0000
Subject: [PATCH 78/94] Merging from trunk. The previous merge took the firefox
 3.6 in a bad state.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25202
---
 .../networking/browsers/firefox/3.6.nix             |  4 ----
 pkgs/applications/video/kmplayer/default.nix        |  6 +++---
 pkgs/tools/misc/memtest86/default.nix               | 13 +++++--------
 .../package-management/disnix/disnixos/default.nix  |  4 ++--
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/3.6.nix b/pkgs/applications/networking/browsers/firefox/3.6.nix
index 1aa9ba437d7..f119f301dbb 100644
--- a/pkgs/applications/networking/browsers/firefox/3.6.nix
+++ b/pkgs/applications/networking/browsers/firefox/3.6.nix
@@ -111,10 +111,6 @@ rec {
 
     inherit src;
 
-    # To be removed when the change gets upstream. I don't know if the patch
-    # affects xulrunner or firefox.
-    patches = [ ./symlinks-bug551152.patch ];
-
     buildInputs =
       [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
         dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix
index a665670d9c9..a762bed0e28 100644
--- a/pkgs/applications/video/kmplayer/default.nix
+++ b/pkgs/applications/video/kmplayer/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, lib, cmake, qt4, perl, gettext, pango, gtk, dbus_glib, kdelibs, automoc4, phonon}:
 
 stdenv.mkDerivation {
-  name = "kmplayer-0.11.2b";
+  name = "kmplayer-0.11.2c";
   src = fetchurl {
-    url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.2b.tar.bz2;
-    sha256 = "00a1pw31p849cbgskyfi8jni9ar6yi2ivr625vza2za6apdxvkr7";
+    url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.2c.tar.bz2;
+    sha256 = "1qhafq865bzpz6m9k7cjdv4884qfpn481ak77ly0nidpq2ab0l9m";
   };
   builder = ./builder.sh;
   buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc pango gtk dbus_glib kdelibs automoc4 phonon ];
diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix
index 5df5fd31382..480a29c63c9 100644
--- a/pkgs/tools/misc/memtest86/default.nix
+++ b/pkgs/tools/misc/memtest86/default.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "memtest86+-4.00";
+  name = "memtest86+-4.10";
   
   src = fetchurl {
-    url = http://www.memtest.org/download/4.00/memtest86+-4.00.tar.gz;
-    sha256 = "193chqvwmcxsrvpcfy3mbz1vakvpfhxvjmawzidp26x8kma2zi3f";
+    url = http://www.memtest.org/download/4.10/memtest86+-4.10.tar.gz;
+    sha256 = "0kxa2m7vfcm543wp53fv16sjjf5p12mzdz5rm87mrrr6hw43a6gq";
   };
 
   preBuild = ''
@@ -17,10 +17,7 @@ stdenv.mkDerivation {
     fi
   '';
 
-  # Override the default optimisation setting (`-Os') to prevent lots
-  # of spurious errors.  See
-  # https://bugs.launchpad.net/fedora/+source/memtest86+/+bug/246412.
-  NIX_CFLAGS_COMPILE = "-O1 -I.";
+  NIX_CFLAGS_COMPILE = "-I.";
   
   installPhase = ''
     ensureDir $out
diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index 5572ffe6797..317a47e0783 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -3,8 +3,8 @@
 stdenv.mkDerivation {
   name = "disnixos";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/811135/download/1/disnixos-0.1pre25150.tar.gz;
-    sha256 = "004i4k0c9lfvfmmv5iqwnqk3h2lip166dp8vpn3k3mvmpl17cn3j";
+    url = http://hydra.nixos.org/build/812999/download/1/disnixos-0.1pre25200.tar.gz;
+    sha256 = "1cw0wg5x65nanrjfj67nk1jxngaqh2l7msx03s536hssm9g2mv7r";
   };
   buildInputs = [ socat pkgconfig disnix ];
   dontStrip = true;

From b8bda4fec01c302fd8c3900924d6ce0e7cdd9172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 20 Dec 2010 17:34:49 +0000
Subject: [PATCH 79/94] Adding another game to instead.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25214
---
 pkgs/games/instead/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix
index 344daca2a0d..d7fcb7a3f4e 100644
--- a/pkgs/games/instead/default.nix
+++ b/pkgs/games/instead/default.nix
@@ -21,6 +21,10 @@ let
       url = http://instead-games.googlecode.com/files/instead-vinny-0.1.zip;
       sha256 = "15qdbg82zp3a8vz4qxminr0xbzbdpnsciliy2wm3raz4hnadawg1";
     })
+    (fetchurl {
+      url = http://instead-games.googlecode.com/files/instead-toilet-1.1.zip;
+      sha256 = "17mlkr93y77pxhimq0v9f0w78fz8alkxwjwsr8z67p458iw6s1wr";
+    })
   ];
 in
 

From a360198627e363428bf3b1b65a7a1ed05aa22e23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 20 Dec 2010 17:35:34 +0000
Subject: [PATCH 80/94] Fixing the gcc postPatch, for the static stage of the
 cross-compiler

svn path=/nixpkgs/branches/stdenv-updates/; revision=25215
---
 pkgs/development/compilers/gcc-4.5/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix
index 77e3cbfa3ed..19efa57af8e 100644
--- a/pkgs/development/compilers/gcc-4.5/default.nix
+++ b/pkgs/development/compilers/gcc-4.5/default.nix
@@ -180,7 +180,7 @@ stdenv.mkDerivation ({
       # On NixOS, use the right path to the dynamic linker instead of
       # `/lib/ld*.so'.
       let
-        libc = if cross != null then libcCross else stdenv.gcc.libc;
+        libc = if (cross != null && libcCross != null) then libcCross else stdenv.gcc.libc;
       in
         '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."
            for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h

From c7de6bfeb39ecc84244dd25ad2038a7ba91c874a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 21 Dec 2010 14:27:48 +0000
Subject: [PATCH 81/94] Updating cromfs to 1.5.9.1, as the previous did not
 build with glibc 2.12. Thanks to Bisqwit for the quick reaction.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25224
---
 pkgs/tools/archivers/cromfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix
index feed8bbda9f..943525d3853 100644
--- a/pkgs/tools/archivers/cromfs/default.nix
+++ b/pkgs/tools/archivers/cromfs/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, pkgconfig, fuse, perl}:
 
 stdenv.mkDerivation rec {
-  name = "cromfs-1.5.9";
+  name = "cromfs-1.5.9.1";
   src = fetchurl {
     url = "http://bisqwit.iki.fi/src/arch/${name}.tar.bz2";
-    sha256 = "0vdpgx0g6yrhqsg50fhksdaaid4gf2gifrxd0xs3idhwg4jmg4ik";
+    sha256 = "02k0nd7zvcksn7vjxlynsdgdvkayfzzhv622n9zkka94756lr0fk";
   };
 
   patchPhase = ''sed -i 's@/bin/bash@/bin/sh@g' configure; set -x'';

From bd311de25c3d0f1099ea34c59765e01a2e884d85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 21 Dec 2010 16:26:34 +0000
Subject: [PATCH 82/94] GNU Recutils 1.0.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25227
---
 pkgs/tools/misc/recutils/default.nix | 32 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/misc/recutils/default.nix

diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix
new file mode 100644
index 00000000000..47536778f88
--- /dev/null
+++ b/pkgs/tools/misc/recutils/default.nix
@@ -0,0 +1,32 @@
+{ fetchurl, stdenv, gettext, emacs, curl, check, bc }:
+
+stdenv.mkDerivation rec {
+  name = "recutils-1.0";
+
+  src = fetchurl {
+    url = "mirror://gnu/recutils/${name}.tar.gz";
+    sha256 = "1m8ir31wjybm9x8bv73f330kb2hkmc8lrpwgd5h9avva4x5b7g5d";
+  };
+
+  doCheck = true;
+
+  buildInputs = [ curl emacs ] ++ (stdenv.lib.optionals doCheck [ check bc ]);
+
+  meta = {
+    description = "GNU Recutils, tools and libraries to access human-editable, text-based databases";
+
+    longDescription =
+      '' GNU Recutils is a set of tools and libraries to access
+         human-editable, text-based databases called recfiles.  The data is
+         stored as a sequence of records, each record containing an arbitrary
+         number of named fields.
+      '';
+
+    homepage = http://www.gnu.org/software/recutils/;
+
+    license = "GPLv3+";
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb50dbeb3af..d2842ad37d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1122,6 +1122,8 @@ let
 
   rtmpdump = callPackage ../tools/video/rtmpdump { };
 
+  recutils = callPackage ../tools/misc/recutils { };
+
   reiser4progs = callPackage ../tools/filesystems/reiser4progs { };
 
   reiserfsprogs = callPackage ../tools/filesystems/reiserfsprogs { };

From 569ae5fe130d5834fa3fbe8175fff00b5a8004f4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 22 Dec 2010 18:34:21 +0000
Subject: [PATCH 83/94] * Get dev86 to compile.  Apparantly it has trouble with
 the latest   gcc/binutils.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25246
---
 pkgs/development/compilers/dev86/default.nix  | 23 +++++++++++--------
 .../dev86/dev86-0.16.17-noelks-1.patch        | 22 ------------------
 2 files changed, 14 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/development/compilers/dev86/dev86-0.16.17-noelks-1.patch

diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix
index aa44b14d844..0dfb0be96f9 100644
--- a/pkgs/development/compilers/dev86/default.nix
+++ b/pkgs/development/compilers/dev86/default.nix
@@ -1,18 +1,23 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "dev86-0.16.17";
+  name = "dev86-0.16.18";
+  
   src = fetchurl {
-    url = http://homepage.ntlworld.com/robert.debath/dev86/Dev86src-0.16.17.tar.gz;
-    md5 = "e7bbfdbe61c2fb964994a087e29b0087";
+    url = http://www.debath.co.uk/dev86/Dev86src-0.16.18.tar.gz;
+    sha256 = "1wcg2x8i2fq7kqgazx2il3qfmikyi4kfb23vm45yxlwq72l55604";
   };
 
-  patches = [ ./dev86-0.16.17-noelks-1.patch ];
-  
-  preBuild = "
-    makeFlags=\"PREFIX=$out\"
-  ";
+  makeFlags = "PREFIX=$(out)";
 
+  # Awful hackery to get dev86 to compile with recent gcc/binutils.
+  # See http://bugs.gentoo.org/214964 for some inconclusive
+  # discussion.
+  preBuild =
+    ''
+      substituteInPlace makefile.in --replace "-O2" "" --replace "-O" ""
+    '';
+      
   meta = {
     description = "Linux 8086 development environment";
     homepage = http://www.debath.co.uk/;
diff --git a/pkgs/development/compilers/dev86/dev86-0.16.17-noelks-1.patch b/pkgs/development/compilers/dev86/dev86-0.16.17-noelks-1.patch
deleted file mode 100644
index fd0d9dfae31..00000000000
--- a/pkgs/development/compilers/dev86/dev86-0.16.17-noelks-1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Submitted By: Andrew "Weibullguy" Rowland <darowland_at_ieee_dot_org>
-Date: 2007-10-23
-Initial Package Version: 0.16.17
-Origin: Fedora Project
-Description: Suppresses elksemu
-Upstream Status: Unknown
-
---- dev86-0.16.17/makefile.in.noelks	2006-01-25 17:03:02.000000000 -0500
-+++ dev86-0.16.17/makefile.in	2006-01-25 17:03:19.000000000 -0500
-@@ -89,10 +89,10 @@
- 
- #ifdef GNUMAKE
- all: check_config bcc86 cpp unproto copt as86 ar86 ld86 objdump86 \
--     library lib-bsd alt-libs elksemu
-+     library lib-bsd alt-libs 
- 
- install: check_config install-bcc install-man \
--     install-lib install-emu
-+     install-lib
- 
- install-all: install install-other
- 

From 770ca317ba85b81f5d854bcf72f0fea515ccc99d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 22 Dec 2010 19:38:26 +0000
Subject: [PATCH 84/94] * Get Xen to build with GCC 4.5 and Glibc 2.12.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25247
---
 .../virtualization/xen/default.nix            |  7 ++++
 .../virtualization/xen/gcc-4.5.patch          | 39 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/applications/virtualization/xen/gcc-4.5.patch

diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix
index b7a7d1ed31f..4c93a277e98 100644
--- a/pkgs/applications/virtualization/xen/default.nix
+++ b/pkgs/applications/virtualization/xen/default.nix
@@ -44,6 +44,9 @@ stdenv.mkDerivation {
     [ # Xen looks for headers in /usr/include and for libraries using
       # ldconfig.  Don't do that.
       ./has-header.patch
+
+      # GCC 4.5 compatibility.
+      ./gcc-4.5.patch
     ];
 
   buildInputs =
@@ -101,6 +104,10 @@ stdenv.mkDerivation {
       ${flip concatMapStrings stubdomSrcs (x: let src = fetchurl x; in ''
         cp ${src} stubdom/${src.name}
       '')}
+
+      # Hack to get `gcc -m32' to work without having 32-bit Glibc headers.
+      mkdir -p tools/include/gnu
+      touch tools/include/gnu/stubs-32.h
     '';
 
   postBuild =
diff --git a/pkgs/applications/virtualization/xen/gcc-4.5.patch b/pkgs/applications/virtualization/xen/gcc-4.5.patch
new file mode 100644
index 00000000000..a8412d69fd3
--- /dev/null
+++ b/pkgs/applications/virtualization/xen/gcc-4.5.patch
@@ -0,0 +1,39 @@
+http://lists.xensource.com/archives/html/xen-devel/2010-07/msg01276.html
+
+diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/arch/x86/mm.c xen-4.0.1//extras/mini-os/arch/x86/mm.c
+--- xen-4.0.1-orig//extras/mini-os/arch/x86/mm.c	2010-08-25 12:22:07.000000000 +0200
++++ xen-4.0.1//extras/mini-os/arch/x86/mm.c	2010-12-22 20:10:05.000000000 +0100
+@@ -281,7 +281,7 @@
+ /*
+  * Mark portion of the address space read only.
+  */
+-extern void shared_info;
++extern char shared_info[PAGE_SIZE]; 
+ static void set_readonly(void *text, void *etext)
+ {
+     unsigned long start_address =
+diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/minios.mk xen-4.0.1//extras/mini-os/minios.mk
+--- xen-4.0.1-orig//extras/mini-os/minios.mk	2010-08-25 12:22:07.000000000 +0200
++++ xen-4.0.1//extras/mini-os/minios.mk	2010-12-22 20:03:11.000000000 +0100
+@@ -10,6 +10,7 @@
+ DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
+ DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
+ DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
++DEF_CFLAGS += -Wno-uninitialized
+ DEF_CPPFLAGS += -D__XEN_INTERFACE_VERSION__=$(XEN_INTERFACE_VERSION)
+ 
+ DEF_ASFLAGS += -D__ASSEMBLY__
+diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/netfront.c xen-4.0.1//extras/mini-os/netfront.c
+--- xen-4.0.1-orig//extras/mini-os/netfront.c	2010-08-25 12:22:07.000000000 +0200
++++ xen-4.0.1//extras/mini-os/netfront.c	2010-12-22 19:56:59.000000000 +0100
+@@ -25,8 +25,8 @@
+ 
+ 
+ 
+-#define NET_TX_RING_SIZE __RING_SIZE((struct netif_tx_sring *)0, PAGE_SIZE)
+-#define NET_RX_RING_SIZE __RING_SIZE((struct netif_rx_sring *)0, PAGE_SIZE)
++#define NET_TX_RING_SIZE __CONST_RING_SIZE(netif_tx, PAGE_SIZE)
++#define NET_RX_RING_SIZE __CONST_RING_SIZE(netif_rx, PAGE_SIZE)
+ #define GRANT_INVALID_REF 0
+ 
+ 

From 597ee95f996171141840179e432e8e2984eb0c9d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Dec 2010 11:40:11 +0000
Subject: [PATCH 85/94] * Fix "Unknown HZ value" warnings.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25250
---
 pkgs/os-specific/linux/procps/builder.sh      |  6 -----
 pkgs/os-specific/linux/procps/default.nix     | 22 ++++++++++++++----
 .../linux/procps/linux-ver-init.patch         | 23 +++++++++++++++++++
 3 files changed, 41 insertions(+), 10 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/procps/builder.sh
 create mode 100644 pkgs/os-specific/linux/procps/linux-ver-init.patch

diff --git a/pkgs/os-specific/linux/procps/builder.sh b/pkgs/os-specific/linux/procps/builder.sh
deleted file mode 100644
index 436df18fef5..00000000000
--- a/pkgs/os-specific/linux/procps/builder.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-source $stdenv/setup
-
-export DESTDIR=$out
-
-genericBuild
-
diff --git a/pkgs/os-specific/linux/procps/default.nix b/pkgs/os-specific/linux/procps/default.nix
index 9270e4c6c0e..dce0e36edb4 100644
--- a/pkgs/os-specific/linux/procps/default.nix
+++ b/pkgs/os-specific/linux/procps/default.nix
@@ -1,12 +1,26 @@
-{stdenv, fetchurl, ncurses}:
+{ stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation {
   name = "procps-3.2.8";
-  builder = ./builder.sh;
+  
   src = fetchurl {
     url = http://procps.sourceforge.net/procps-3.2.8.tar.gz;
     sha256 = "0d8mki0q4yamnkk4533kx8mc0jd879573srxhg6r2fs3lkc6iv8i";
   };
-  patches = [./makefile.patch ./procps-build.patch ./gnumake3.82.patch];
-  buildInputs = [ncurses];
+  
+  patches =
+    [ ./makefile.patch
+      ./procps-build.patch
+      ./gnumake3.82.patch
+      ./linux-ver-init.patch
+    ];
+    
+  buildInputs = [ ncurses ];
+  
+  makeFlags = "DESTDIR=$(out)";
+
+  meta = {
+    homepage = http://procps.sourceforge.net/;
+    description = "Utilities that give information about processes using the /proc filesystem";
+  };
 }
diff --git a/pkgs/os-specific/linux/procps/linux-ver-init.patch b/pkgs/os-specific/linux/procps/linux-ver-init.patch
new file mode 100644
index 00000000000..9f93784a1fd
--- /dev/null
+++ b/pkgs/os-specific/linux/procps/linux-ver-init.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/303120
+
+make sure the linux version constructor runs before the libproc constructor
+since the latter uses variables setup by the former
+
+fix by Chris Coleman
+
+Index: proc/version.c
+===================================================================
+RCS file: /cvsroot/procps/procps/proc/version.c,v
+retrieving revision 1.7
+diff -u -p -r1.7 version.c
+--- a/proc/version.c	9 Feb 2003 07:27:16 -0000	1.7
++++ b/proc/version.c	14 Nov 2010 00:22:44 -0000
+@@ -33,7 +33,7 @@ void display_version(void) {
+ 
+ int linux_version_code;
+ 
+-static void init_Linux_version(void) __attribute__((constructor));
++static void init_Linux_version(void) __attribute__((constructor(100)));
+ static void init_Linux_version(void) {
+     static struct utsname uts;
+     int x = 0, y = 0, z = 0;	/* cleared in case sscanf() < 3 */

From 4837b70d27399137ac2f48e3cb91a379786c5ef4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Dec 2010 17:07:07 +0000
Subject: [PATCH 86/94] * Restore MPlayer's default font.  This got lost
 somewhere.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25260
---
 pkgs/applications/video/MPlayer/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix
index 47c68df1ba3..2eca645ed9c 100644
--- a/pkgs/applications/video/MPlayer/default.nix
+++ b/pkgs/applications/video/MPlayer/default.nix
@@ -12,7 +12,7 @@
 , lameSupport ? true, lame ? null
 , screenSaverSupport ? true, libXScrnSaver
 , pulseSupport ? false, pulseaudio
-, mesa, pkgconfig, unzip, yasm
+, mesa, pkgconfig, unzip, yasm, freefont_ttf
 }:
 
 assert alsaSupport -> alsaLib != null;
@@ -104,6 +104,13 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = if x11Support then "-lX11 -lXext" else "";
 
+  # Provide a reasonable standard font.  Maybe we should symlink here.
+  postInstall =
+    ''
+      mkdir -p $out/share/mplayer
+      cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf
+    '';
+
   crossAttrs = {
     preConfigure = ''
       configureFlags="`echo $configureFlags |

From a85502fa0d2523f542bcc3648c1a8fa00007e926 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 24 Dec 2010 05:47:55 +0000
Subject: [PATCH 87/94] Fixing gnuchess build

svn path=/nixpkgs/branches/stdenv-updates/; revision=25270
---
 pkgs/games/gnuchess/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix
index db4961eaaf6..24556d83148 100644
--- a/pkgs/games/gnuchess/default.nix
+++ b/pkgs/games/gnuchess/default.nix
@@ -1,4 +1,6 @@
-a :  
+{builderDefsPackage, flex} @ x:
+builderDefsPackage 
+(a :  
 let 
   fetchurl = a.fetchurl;
 
@@ -31,4 +33,4 @@ rec {
   meta = {
     description = "GNU Chess playing program";
   };
-}
+}) x
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eddced94b89..45ca9ed66e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6818,7 +6818,7 @@ let
 
   gltron = callPackage ../games/gltron { };
 
-  gnuchess = builderDefsPackage (import ../games/gnuchess) { };
+  gnuchess = callPackage ../games/gnuchess { };
 
   gnugo = callPackage ../games/gnugo { };
 

From 1f5b61713e7e08d1aac73e87d7e368eadf92d468 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Dec 2010 18:30:52 +0000
Subject: [PATCH 88/94] * Added libvdpau and vdpauinfo.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25296
---
 .../development/libraries/libvdpau/default.nix | 18 ++++++++++++++++++
 pkgs/tools/X11/vdpauinfo/default.nix           | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix                |  4 ++++
 3 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/libraries/libvdpau/default.nix
 create mode 100644 pkgs/tools/X11/vdpauinfo/default.nix

diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix
new file mode 100644
index 00000000000..b6f8260bc19
--- /dev/null
+++ b/pkgs/development/libraries/libvdpau/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, xlibs }:
+
+stdenv.mkDerivation rec {
+  name = "libvdpau-0.4.1";
+  
+  src = fetchurl {
+    url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz";
+    sha256 = "16zmmbawfnvrxjqvgfwxjfd1wh3vyz2cmvxza6cgf4j9qs36y6q6";
+  };
+
+  buildInputs = [ pkgconfig xlibs.libX11 ];
+
+  meta = {
+    homepage = http://people.freedesktop.org/~aplattner/vdpau/;
+    description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)";
+    license = "bsd";
+  };
+}
diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix
new file mode 100644
index 00000000000..23233861a06
--- /dev/null
+++ b/pkgs/tools/X11/vdpauinfo/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, xlibs, libvdpau }:
+
+stdenv.mkDerivation rec {
+  name = "vdpauinfo-0.0.6";
+  
+  src = fetchurl {
+    url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz";
+    sha256 = "0m2llqjnwh3x6y56hik3znym2mfk1haq81a15p54m60ngf0mvfsj";
+  };
+
+  buildInputs = [ pkgconfig xlibs.libX11 libvdpau ];
+
+  meta = {
+    homepage = http://people.freedesktop.org/~aplattner/vdpau/;
+    description = "Tool to query the Video Decode and Presentation API for Unix (VDPAU) abilities of the system";
+    license = "bsd";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45ca9ed66e5..c295934c1ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3603,6 +3603,8 @@ let
 
   libv4l = callPackage ../development/libraries/libv4l { };
 
+  libvdpau = callPackage ../development/libraries/libvdpau { };
+
   libvirt = callPackage ../development/libraries/libvirt { };
 
   libvncserver = builderDefsPackage (import ../development/libraries/libvncserver) {
@@ -6539,6 +6541,8 @@ let
     qt = qt3;
   };
 
+  vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
+
   veracity = callPackage ../applications/version-management/veracity {};
 
   viewMtn = builderDefsPackage (import ../applications/version-management/viewmtn/0.10.nix)

From 90f485f268f3a34406f0a911a9ecf7e91391722e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Dec 2010 18:48:16 +0000
Subject: [PATCH 89/94] * MPlayer updated to the latest SVN snapshot. *
 MPlayer: add VDPAU support.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25297
---
 pkgs/applications/video/MPlayer/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix
index 2eca645ed9c..11391cea975 100644
--- a/pkgs/applications/video/MPlayer/default.nix
+++ b/pkgs/applications/video/MPlayer/default.nix
@@ -13,6 +13,7 @@
 , screenSaverSupport ? true, libXScrnSaver
 , pulseSupport ? false, pulseaudio
 , mesa, pkgconfig, unzip, yasm, freefont_ttf
+, vdpauSupport ? false, libvdpau ? null
 }:
 
 assert alsaSupport -> alsaLib != null;
@@ -27,6 +28,7 @@ assert cddaSupport -> cdparanoia != null;
 assert jackaudioSupport -> jackaudio != null;
 assert amrSupport -> (amrnb != null && amrwb != null);
 assert screenSaverSupport -> libXScrnSaver != null;
+assert vdpauSupport -> libvdpau != null;
 
 let
 
@@ -63,11 +65,11 @@ let
 in  
 
 stdenv.mkDerivation rec {
-  name = "MPlayer-1.0-pre31984";
+  name = "MPlayer-1.0-pre20101227";
 
   src = fetchurl {
-    url = "http://www.loegria.net/misc/${name}.tar.bz2";
-    sha256 = "0mg6kggja113rsvvsk05gk50xl5qwzsms6pmb4ylc99mflh7m9km";
+    url = http://nixos.org/tarballs/mplayer-snapshot-20101227.tar.bz2;
+    sha256 = "0q9rvjz3byvs0qlnb9jbnw3qs6c3vdcqaqxm1rnql8kqic442hv2";
   };
 
   buildInputs =
@@ -87,7 +89,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional xvidSupport xvidcore
     ++ stdenv.lib.optional pulseSupport pulseaudio
     ++ stdenv.lib.optional screenSaverSupport libXScrnSaver
-    ++ stdenv.lib.optional lameSupport lame;
+    ++ stdenv.lib.optional lameSupport lame
+    ++ stdenv.lib.optional vdpauSupport libvdpau;
 
   buildNativeInputs = [ yasm ];
 

From 9d617d90d0a16d70ef46b67d0e3312f75f4f220d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Dec 2010 19:22:30 +0000
Subject: [PATCH 90/94] * Put libvdpau_nvidia.so in a place where libvdpau can
 find it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25298
---
 pkgs/os-specific/linux/nvidia-x11/builder.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index bad0d8aabd2..830745ea6b7 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -28,9 +28,7 @@ installPhase() {
 
     # Install libGL and friends.
     ensureDir $out/lib
-    cp -prd libcuda.* libGL.* libnvidia-cfg.* libnvidia-compiler.* libnvidia-tls.* libnvidia-glcore.* libOpenCL.* libvdpau.* libXv* tls $out/lib/
-    ensureDir $out/lib/vdpau
-    cp -p libvdpau_* $out/lib/vdpau
+    cp -prd libcuda.* libGL.* libnvidia-cfg.* libnvidia-compiler.* libnvidia-tls.* libnvidia-glcore.* libOpenCL.* libXv* libvdpau_nvidia* tls $out/lib/
     
     ln -snf libnvidia-glcore.so.$versionNumber $out/lib/libnvidia-glcore.so
     ln -snf libnvidia-glcore.so.$versionNumber $out/lib/libnvidia-glcore.so.1
@@ -41,9 +39,11 @@ installPhase() {
     ln -snf libnvidia-tls.so.$versionNumber $out/lib/tls/libnvidia-tls.so.1
     ln -snf libXvMCNVIDIA.so.$versionNumber $out/lib/libXvMCNVIDIA_dynamic.so.1
     ln -snf libcuda.so.$versionNumber $out/lib/libcuda.so.1
+    ln -snf libvdpau_nvidia.so.$versionNumber $out/lib/libvdpau_nvidia.so
 
     patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*
     patchelf --set-rpath $out/lib:$glPath $out/lib/libXvMCNVIDIA.so.*.*
+    patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.*
     patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*
     
     if test -z "$libsOnly"; then

From 8739052716f92c761c0c9d5c9845fdbf96fa724d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Dec 2010 17:22:31 +0000
Subject: [PATCH 91/94] * stdenv2 -> stdenv.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25309
---
 pkgs/top-level/all-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3297d3e900..dc99a6a1411 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6936,7 +6936,6 @@ let
   ultimatestunts = callPackage ../games/ultimatestunts { };
 
   ultrastardx = callPackage ../games/ultrastardx {
-    stdenv = stdenv2;
     lua = lua5;
   };
 
@@ -7047,7 +7046,6 @@ let
         pkgs_for_46 = (applyGlobalOverrides (p: { kde4 = p.kde46; }));
       in
         pkgs_for_46.newScope pkgs_for_46.kde46;
-    stdenv = pkgs.stdenv2;
   };
 
   xfce = xfce4;

From 5bb40967636c22f45b03dbbda9cc3b896ee76b27 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Dec 2010 17:25:17 +0000
Subject: [PATCH 92/94] * Fix an evaluation error in xburst-tools.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25311
---
 pkgs/tools/misc/xburst-tools/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix
index 2408a1cd35c..685307bb022 100644
--- a/pkgs/tools/misc/xburst-tools/default.nix
+++ b/pkgs/tools/misc/xburst-tools/default.nix
@@ -1,5 +1,5 @@
-{stdenv, fetchgit, libusb, autoconf, automake, confuse
-, gccCross ? null}:
+{ stdenv, fetchgit, libusb, autoconf, automake, confuse
+, gccCross ? null }:
 
 let
   version = "2010-07-29";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc99a6a1411..c8588aa435f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1384,7 +1384,7 @@ let
 
   x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { };
 
-  xbursttools = import ../tools/misc/xburst-tools {
+  xbursttools = assert stdenv ? glibc; import ../tools/misc/xburst-tools {
     inherit stdenv fetchgit autoconf automake libusb confuse;
     # It needs a cross compiler for mipsel to build the firmware it will
     # load into the Ben Nanonote

From 35fe5dadb15b431df9224442deb32a8024c7aff7 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 28 Dec 2010 18:47:41 +0000
Subject: [PATCH 93/94] splix-2.0.0: fix compilation with gcc-4.5

svn path=/nixpkgs/branches/stdenv-updates/; revision=25312
---
 pkgs/misc/cups/drivers/splix/default.nix       |  2 ++
 .../cups/drivers/splix/splix-2.0.0-gcc45.patch | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch

diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix
index 02970073b11..b832e928bef 100644
--- a/pkgs/misc/cups/drivers/splix/default.nix
+++ b/pkgs/misc/cups/drivers/splix/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0bwivrwwvh6hzvnycpzqs7a0capgycahc4s3v9ihx552fgy07xwp";
   };
 
+  patches = [ ./splix-2.0.0-gcc45.patch ];
+
   preBuild=''
     makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model"
   '';
diff --git a/pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch b/pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch
new file mode 100644
index 00000000000..5ccdcb2514c
--- /dev/null
+++ b/pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch
@@ -0,0 +1,18 @@
+Fixing build with gcc 4.5
+
+http://bugs.gentoo.org/show_bug.cgi?id=318581
+
+downloaded from
+http://gentoo-overlays.zugaina.org/gentoo/portage/net-print/splix/files/splix-2.0.0-gcc45.patch
+
+--- splix-old/src/ppdfile.cpp
++++ splix-new/src/ppdfile.cpp
+@@ -282,7 +282,7 @@
+  * Opérateur d'assignation
+  * Assignment operator
+  */
+-void PPDFile::Value::operator = (const PPDFile::Value::Value &val)
++void PPDFile::Value::operator = (const PPDFile::Value &val)
+ {
+     if (_preformatted)
+         delete[] _preformatted;

From 302d783310383a6ad6383957a6e60892ab1d0a64 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 28 Dec 2010 18:47:57 +0000
Subject: [PATCH 94/94] Make filelight compile with gcc-4.5

svn path=/nixpkgs/branches/stdenv-updates/; revision=25313
---
 pkgs/applications/misc/filelight/default.nix |  1 +
 pkgs/applications/misc/filelight/gcc45.diff  | 26 ++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/misc/filelight/gcc45.diff

diff --git a/pkgs/applications/misc/filelight/default.nix b/pkgs/applications/misc/filelight/default.nix
index c91fb13c862..087c3ea045c 100644
--- a/pkgs/applications/misc/filelight/default.nix
+++ b/pkgs/applications/misc/filelight/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation {
     url = http://www.kde-apps.org/CONTENT/content-files/99561-filelight-1.9rc3.tgz;
     sha256 = "0ljyx23j4cvrsi1dvmxila82q2cd26barmcvc8qmr74kz6pj78sq";
   };
+  patches = [ ./gcc45.diff ];
   buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon 
     qimageblitz ];
   meta = {
diff --git a/pkgs/applications/misc/filelight/gcc45.diff b/pkgs/applications/misc/filelight/gcc45.diff
new file mode 100644
index 00000000000..dcce2edaf16
--- /dev/null
+++ b/pkgs/applications/misc/filelight/gcc45.diff
@@ -0,0 +1,26 @@
+diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp
+index 68ec189..feb0e53 100644
+--- a/src/app/mainWindow.cpp
++++ b/src/app/mainWindow.cpp
+@@ -222,7 +222,7 @@ inline void MainWindow::slotComboScan()
+ 
+ inline bool MainWindow::slotScanPath(const QString &path)
+ {
+-    return slotScanUrl(KUrl::KUrl(path));
++    return slotScanUrl(KUrl(path));
+ }
+ 
+ bool MainWindow::slotScanUrl(const KUrl &url)
+diff --git a/src/part/radialMap/widget.cpp b/src/part/radialMap/widget.cpp
+index d48a673..762f74e 100644
+--- a/src/part/radialMap/widget.cpp
++++ b/src/part/radialMap/widget.cpp
+@@ -64,7 +64,7 @@ RadialMap::Widget::path() const
+ KUrl
+ RadialMap::Widget::url(File const * const file) const
+ {
+-    return KUrl::KUrl(file ? file->fullPath() : m_tree->fullPath());
++    return KUrl(file ? file->fullPath() : m_tree->fullPath());
+ }
+ 
+ void