From da8c9de5a8076cc762bda13e6bfd53275f5fe774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 9 Mar 2010 14:14:30 +0000
Subject: [PATCH 01/10] Updating the hydra builds for release-cross.nix

Now the attributes listed as Jobs will look even uglier - very long names, too much repeating.


svn path=/nixpkgs/trunk/; revision=20492
---
 pkgs/top-level/release-cross.nix | 79 ++++++++++++++------------------
 pkgs/top-level/release-lib.nix   |  2 +-
 2 files changed, 35 insertions(+), 46 deletions(-)

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 8d96ad00921..52fa7b09fe6 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -1,5 +1,31 @@
 with (import ./release-lib.nix);
+let
+  nativePlatforms = linux;
 
+  /* Basic list of packages to cross-build */
+  basicHostDrv = {
+    bison.hostDrv = nativePlatforms;
+    tightvnc.hostDrv = nativePlatforms;
+    #openoffice.hostDrv = nativePlatforms;
+    wxGTK.hostDrv = nativePlatforms;
+    #firefox = nativePlatforms;
+    xorg = {
+      #xorgserver.hostDrv = nativePlatforms;
+    };
+    nixUnstable.hostDrv = nativePlatforms;
+    linuxPackages_2_6_32.kernel.hostDrv = linux;
+    linuxPackages_2_6_33.kernel.hostDrv = linux;
+  };
+
+  /* Basic list of packages to be natively built,
+     but need a crossSystem defined to get meaning */
+  basicBuildDrv = {
+    gdbCross = nativePlatforms;
+  };
+
+  basic = basicHostDrv // basicBuildDrv;
+
+in
 (
 
 /* Test some cross builds to the Sheevaplug */
@@ -13,22 +39,13 @@ let
     platform = pkgs.platforms.sheevaplug;
     openssl.system = "linux-generic32";
   };
-  nativePlatforms = linux;
+
 in {
-  crossSheevaplugLinux = mapTestOnCross crossSystem (rec {
-    bison = nativePlatforms;
-    tightvnc = nativePlatforms;
-    #openoffice = nativePlatforms;
-    wxGTK = nativePlatforms;
-    #firefox = nativePlatforms;
-    xorg = {
-      #xorgserver = nativePlatforms;
-    };
-    nixUnstable = linux;
-    linuxPackages_2_6_32.kernel = linux;
-    linuxPackages_2_6_33.kernel = linux;
-    gdbCross = nativePlatforms;
-  });
+  crossSheevaplugLinux = mapTestOnCross crossSystem (
+    basic //
+    {
+      ubootSheevaplug.hostDrv = nativePlatforms;
+    });
 }) // (
 
 /* Test some cross builds to the mipsel */
@@ -50,22 +67,8 @@ let
     };
     openssl.system = "linux-generic32";
   };
-  nativePlatforms = linux;
 in {
-  crossMipselLinux = mapTestOnCross crossSystem (rec {
-    bison = nativePlatforms;
-    tightvnc = nativePlatforms;
-    #openoffice = nativePlatforms;
-    wxGTK = nativePlatforms;
-    #firefox = nativePlatforms;
-    xorg = {
-      #xorgserver = nativePlatforms;
-    };
-    nixUnstable = linux;
-    linuxPackages_2_6_32.kernel = linux;
-    linuxPackages_2_6_33.kernel = linux;
-    gdbCross = nativePlatforms;
-  });
+  crossMipselLinux = mapTestOnCross crossSystem basic;
 }) // (
 
 /* Test some cross builds to the ultrasparc */
@@ -88,20 +91,6 @@ let
     };
     openssl.system = "linux64-sparcv9";
   };
-  nativePlatforms = linux;
 in {
-  crossUltraSparcLinux = mapTestOnCross crossSystem (rec {
-    bison = nativePlatforms;
-    tightvnc = nativePlatforms;
-    #openoffice = nativePlatforms;
-    wxGTK = nativePlatforms;
-    #firefox = nativePlatforms;
-    xorg = {
-      #xorgserver = nativePlatforms;
-    };
-    nixUnstable = linux;
-    linuxPackages_2_6_32.kernel = linux;
-    linuxPackages_2_6_33.kernel = linux;
-    gdbCross = nativePlatforms;
-  });
+  crossUltraSparcLinux = mapTestOnCross crossSystem basic;
 })
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index b65296b5ea2..1f88684d633 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -54,7 +54,7 @@ rec {
         job = toJob value;
         getPkg = pkgs: setCrossMaintainers
           (pkgs.lib.addMetaAttrs { schedulingPriority = toString job.schedulingPriority; }
-          (pkgs.lib.getAttrFromPath (path ++ ["hostDrv"]) pkgs));
+          (pkgs.lib.getAttrFromPath path pkgs));
       in testOnCross crossSystem job.systems getPkg);
 
   setCrossMaintainers = pkg: pkg // { meta.maintainers = crossMaintainers; };

From 570759c288f16e28a6a12f5b54514d5e29dd7e0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 9 Mar 2010 14:49:30 +0000
Subject: [PATCH 02/10] Getting the hydra cross-trunk builds have proper low
 priority (that of toJob)

svn path=/nixpkgs/trunk/; revision=20495
---
 pkgs/top-level/release-lib.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 1f88684d633..88d4e1fedd5 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -57,7 +57,12 @@ rec {
           (pkgs.lib.getAttrFromPath path pkgs));
       in testOnCross crossSystem job.systems getPkg);
 
-  setCrossMaintainers = pkg: pkg // { meta.maintainers = crossMaintainers; };
+  setCrossMaintainers = pkg:
+    pkg //
+    {
+      meta = (if pkg ? meta then pkg.meta else {})
+        // { maintainers = crossMaintainers; };
+    };
 
   /* Find all packages that have a meta.platforms field listing the
      supported platforms. */

From c7b9e45e761eb33b3882ea4a1ec190277af2f87f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Mar 2010 15:12:15 +0000
Subject: [PATCH 03/10] * Added s3sync.

svn path=/nixpkgs/trunk/; revision=20496
---
 pkgs/tools/networking/s3sync/default.nix | 29 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  4 ++++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/networking/s3sync/default.nix

diff --git a/pkgs/tools/networking/s3sync/default.nix b/pkgs/tools/networking/s3sync/default.nix
new file mode 100644
index 00000000000..8ed71c34523
--- /dev/null
+++ b/pkgs/tools/networking/s3sync/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, ruby, makeWrapper }:
+
+stdenv.mkDerivation {
+  name = "s3sync-1.2.6";
+  
+  src = fetchurl {
+    url = http://s3.amazonaws.com/ServEdge_pub/s3sync/s3sync.tar.gz; # !!!
+    sha256 = "19467mgym0da0hifhkcbivccdima7gkaw3k8q760ilfbwgwxcn7f";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase =
+    ''
+      ensureDir $out/libexec/s3sync
+      cp *.rb $out/libexec/s3sync
+      makeWrapper "${ruby}/bin/ruby $out/libexec/s3sync/s3cmd.rb" $out/bin/s3cmd
+      makeWrapper "${ruby}/bin/ruby $out/libexec/s3sync/s3sync.rb" $out/bin/s3sync
+
+      ensureDir $out/share/doc/s3sync
+      cp README* $out/share/doc/s3sync/
+    ''; # */
+
+  meta = {
+    homepage = http://s3sync.net/;
+    description = "Command-line tools to manipulate Amazon S3 buckets";
+    license = "free-non-copyleft";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9098162664a..158cd928266 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1491,6 +1491,10 @@ let
     inherit fetchurl stdenv pkgconfig fuse curl expat;
   };
 
+  s3sync = import ../tools/networking/s3sync {
+    inherit fetchurl stdenv ruby makeWrapper;
+  };
+
   sablotron = import ../tools/text/xml/sablotron {
     inherit fetchurl stdenv expat;
   };

From 04f73b29d69f95ecdff7fe3925a52ef285dab854 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Mar 2010 15:35:46 +0000
Subject: [PATCH 04/10] * Force a rebuild of the X server, because the current
 build got   corrupted in a crash.

svn path=/nixpkgs/trunk/; revision=20497
---
 pkgs/servers/x11/xorg/overrides.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 4e8466f2621..e8a311a651a 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -144,7 +144,7 @@ in
       [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto ];
     postInstall =
       ''
-        rm -rf $out/share/X11/xkb/compiled
+        rm -fr $out/share/X11/xkb/compiled
         ln -s /var/tmp $out/share/X11/xkb/compiled
       '';
   };

From 387216d7fa9196105a3ce3fc7a4e8153c54368a5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Mar 2010 15:40:58 +0000
Subject: [PATCH 05/10] * Duplicity updated to 0.6.07.

svn path=/nixpkgs/trunk/; revision=20498
---
 pkgs/tools/backup/duplicity/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index 007241d0e82..c939692ee86 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, librsync, gnupg, boto, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "duplicity-0.6.06";
+  name = "duplicity-0.6.07";
 
   src = fetchurl {
-    url = http://code.launchpad.net/duplicity/0.6-series/0.6.06/+download/duplicity-0.6.06.tar.gz;
-    sha256 = "1g284y24061krigs386x5s7vs7cnwhah7g1mfk9jfn3gzsidv70g";
+    url = http://code.launchpad.net/duplicity/0.6-series/0.6.07/+download/duplicity-0.6.07.tar.gz;
+    sha256 = "11rwr47cgr652m3qb583qlhfjbagnhsidbn8y09fyfi75iifqrjs";
   };
 
   installPhase = ''

From 67e7ad56d7c2239f204cf6df308cff13007c222c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Mar 2010 15:46:22 +0000
Subject: [PATCH 06/10] * So there is an even newer version of duplicity :-)

svn path=/nixpkgs/trunk/; revision=20499
---
 pkgs/tools/backup/duplicity/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index c939692ee86..e811f961117 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, librsync, gnupg, boto, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "duplicity-0.6.07";
+  name = "duplicity-0.6.08";
 
   src = fetchurl {
-    url = http://code.launchpad.net/duplicity/0.6-series/0.6.07/+download/duplicity-0.6.07.tar.gz;
-    sha256 = "11rwr47cgr652m3qb583qlhfjbagnhsidbn8y09fyfi75iifqrjs";
+    url = http://code.launchpad.net/duplicity/0.6-series/0.6.08/+download/duplicity-0.6.08.tar.gz;
+    sha256 = "1qvaa61j8614wy2fv02f47dp58pry2j958gnd2c73flj2n0n1919";
   };
 
   installPhase = ''

From 1522caa55692809fd855a8fb9b39283df48d7e13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 9 Mar 2010 15:48:25 +0000
Subject: [PATCH 07/10] Enabling cross-builds with uclibc again (I had that too
 much abandoned). Hydra now should even test it.

svn path=/nixpkgs/trunk/; revision=20500
---
 pkgs/os-specific/linux/uclibc/default.nix | 26 +++++++++++------------
 pkgs/top-level/all-packages.nix           | 16 +++++++++-----
 pkgs/top-level/release-cross.nix          | 24 +++++++++++++++++++++
 pkgs/top-level/release-lib.nix            | 13 ++++--------
 4 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix
index 3390469545f..75fa6a701de 100644
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/pkgs/os-specific/linux/uclibc/default.nix
@@ -1,17 +1,17 @@
-{stdenv, fetchurl, linuxHeaders, gccCross ? null}:
+{stdenv, fetchurl, linuxHeaders, cross ? null, gccCross ? null}:
 
 assert stdenv.isLinux;
+assert cross != null -> gccCross != null;
 
 let
-    target = if (gccCross != null) then gccCross.target else null;
-    enableArmEABI = (target == null && stdenv.system "armv5tel-linux")
-      || (target != null && target.arch == "arm");
+    enableArmEABI = (cross == null && stdenv.platform.kernelArch == "arm")
+      || (cross != null && cross.arch == "arm");
 
     configArmEABI = if enableArmEABI then
         ''-e 's/.*CONFIG_ARM_OABI.*//' \
         -e 's/.*CONFIG_ARM_EABI.*/CONFIG_ARM_EABI=y/' '' else "";
 
-    enableBigEndian = (target != null && target.bigEndian);
+    enableBigEndian = (cross != null && cross.bigEndian);
     
     configBigEndian = if enableBigEndian then ""
       else
@@ -19,12 +19,12 @@ let
         -e 's/.*ARCH_WANTS_BIG_ENDIAN.*/#ARCH_WANTS_BIG_ENDIAN=y/' \
         -e 's/.*ARCH_WANTS_LITTLE_ENDIAN.*/ARCH_WANTS_LITTLE_ENDIAN=y/' '';
 
-    archMakeFlag = if (target != null) then "ARCH=${target.arch}" else "";
-    crossMakeFlag = if (target != null) then "CROSS=${target.config}-" else "";
+    archMakeFlag = if (cross != null) then "ARCH=${cross.arch}" else "";
+    crossMakeFlag = if (cross != null) then "CROSS=${cross.config}-" else "";
 in
 stdenv.mkDerivation {
-  name = "uclibc-0.9.30.1" + stdenv.lib.optionalString (target != null)
-    ("-" + target.config);
+  name = "uclibc-0.9.30.1" + stdenv.lib.optionalString (cross != null)
+    ("-" + cross.config);
 
   src = fetchurl {
     url = http://www.uclibc.org/downloads/uClibc-0.9.30.1.tar.bz2;
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
   '';
 
   # Cross stripping hurts.
-  dontStrip = if (target != null) then true else false;
+  dontStrip = if (cross != null) then true else false;
 
   makeFlags = [ crossMakeFlag "VERBOSE=1" ];
 
@@ -54,13 +54,13 @@ stdenv.mkDerivation {
 
   patches = [ ./unifdef-getline.patch ];
 
-  # This will allow the usual gcc-cross-wrapper strip phase work as usual
-  crossConfig = if (target != null) then target.config else null;
+#  # This will allow the usual gcc-cross-wrapper strip phase work as usual
+#  crossConfig = if (cross != null) then cross.config else null;
 
   installPhase = ''
     mkdir -p $out
     make PREFIX=$out VERBOSE=1 install ${crossMakeFlag}
-    (cd $out/include && ln -s ${linuxHeaders}/include/* .) || exit 1
+    (cd $out/include && ln -s $(ls -d ${linuxHeaders}/include/* | grep -v "scsi$") .)
     sed -i s@/lib/@$out/lib/@g $out/lib/libc.so
   '';
   
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 158cd928266..04f2d450f1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3740,9 +3740,14 @@ let
     installLocales = getPkgConfig "glibc" "locales" false;
   });
 
+  glibcCross = glibc211Cross;
+
   # We can choose:
-  libcCross = glibc211Cross;
-  # libcCross = uclibcCross;
+  libcCrossChooser = name : if (name == "glibc") then glibcCross
+    else if (name == "uclibc") then uclibcCross
+    else throw "Unknown libc";
+
+  libcCross = libcCrossChooser crossSystem.libc;
 
   eglibc = import ../development/libraries/eglibc {
     inherit fetchsvn stdenv;
@@ -6395,10 +6400,11 @@ let
   };
 */
 
-  uclibcCross = target: import ../os-specific/linux/uclibc {
+  uclibcCross = import ../os-specific/linux/uclibc {
     inherit fetchurl stdenv;
-    linuxHeaders = linuxHeadersCross target;
-    gccCross = gccCrossStageStatic target;
+    linuxHeaders = linuxHeadersCross;
+    gccCross = gccCrossStageStatic;
+    cross = assert crossSystem != null; crossSystem;
   };
 
   udev = makeOverridable (import ../os-specific/linux/udev) {
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 52fa7b09fe6..fdac71e2da3 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -37,6 +37,7 @@ let
     float = "soft";
     withTLS = true;
     platform = pkgs.platforms.sheevaplug;
+    libc = "glibc";
     openssl.system = "linux-generic32";
   };
 
@@ -48,6 +49,27 @@ in {
     });
 }) // (
 
+/* Test some cross builds to the Sheevaplug - uclibc*/
+let
+  crossSystem = {
+    config = "armv5tel-unknown-linux-gnueabi";  
+    bigEndian = false;
+    arch = "arm";
+    float = "soft";
+    withTLS = true;
+    platform = pkgs.platforms.sheevaplug;
+    libc = "uclibc";
+    openssl.system = "linux-generic32";
+  };
+
+in {
+  crossSheevaplugLinuxUclibc = mapTestOnCross crossSystem (
+    basic //
+    {
+      ubootSheevaplug.hostDrv = nativePlatforms;
+    });
+}) // (
+
 /* Test some cross builds to the mipsel */
 let
   crossSystem = {
@@ -56,6 +78,7 @@ let
     arch = "mips";
     float = "soft";
     withTLS = true;
+    libc = "glibc";
     platform = {
       name = "malta";
       kernelBaseConfig = "malta_defconfig";
@@ -80,6 +103,7 @@ let
     float = "hard";
     withTLS = true;
     cpu = "ultrasparc";
+    libc = "glibc";
     platform = {
         name = "ultrasparc";
         kernelHeadersBaseConfig = "sparc64_defconfig";
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 88d4e1fedd5..7350c4cc1b6 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -52,18 +52,13 @@ rec {
     (path: value:
       let
         job = toJob value;
-        getPkg = pkgs: setCrossMaintainers
-          (pkgs.lib.addMetaAttrs { schedulingPriority = toString job.schedulingPriority; }
+        getPkg = pkgs: (pkgs.lib.addMetaAttrs {
+            schedulingPriority = toString job.schedulingPriority;
+            maintainers = crossMaintainers; 
+          }
           (pkgs.lib.getAttrFromPath path pkgs));
       in testOnCross crossSystem job.systems getPkg);
 
-  setCrossMaintainers = pkg:
-    pkg //
-    {
-      meta = (if pkg ? meta then pkg.meta else {})
-        // { maintainers = crossMaintainers; };
-    };
-
   /* Find all packages that have a meta.platforms field listing the
      supported platforms. */
   packagesWithMetaPlatform = attrSet: 

From 5fc076193cf8c60027b8c07221265968bcce4242 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 9 Mar 2010 15:51:45 +0000
Subject: [PATCH 08/10] Updating uclibc

svn path=/nixpkgs/trunk/; revision=20501
---
 pkgs/os-specific/linux/uclibc/default.nix     | 11 ++-----
 .../linux/uclibc/unifdef-getline.patch        | 31 -------------------
 2 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/uclibc/unifdef-getline.patch

diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix
index 75fa6a701de..0811e8e3e80 100644
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/pkgs/os-specific/linux/uclibc/default.nix
@@ -23,12 +23,12 @@ let
     crossMakeFlag = if (cross != null) then "CROSS=${cross.config}-" else "";
 in
 stdenv.mkDerivation {
-  name = "uclibc-0.9.30.1" + stdenv.lib.optionalString (cross != null)
+  name = "uclibc-0.9.30.2" + stdenv.lib.optionalString (cross != null)
     ("-" + cross.config);
 
   src = fetchurl {
-    url = http://www.uclibc.org/downloads/uClibc-0.9.30.1.tar.bz2;
-    sha256 = "132cf27hkgi0q4qlwbiyj4ffj76sja0jcxm0aqzzgks65jh6k5rd";
+    url = http://www.uclibc.org/downloads/uClibc-0.9.30.2.tar.bz2;
+    sha256 = "0wr4hlybssiyswdc73wdcxr31xfbss3lnqiv5lcav3rg3v4r4vmb";
   };
 
   configurePhase = ''
@@ -52,11 +52,6 @@ stdenv.mkDerivation {
 
   buildInputs = stdenv.lib.optional (gccCross != null) gccCross;
 
-  patches = [ ./unifdef-getline.patch ];
-
-#  # This will allow the usual gcc-cross-wrapper strip phase work as usual
-#  crossConfig = if (cross != null) then cross.config else null;
-
   installPhase = ''
     mkdir -p $out
     make PREFIX=$out VERBOSE=1 install ${crossMakeFlag}
diff --git a/pkgs/os-specific/linux/uclibc/unifdef-getline.patch b/pkgs/os-specific/linux/uclibc/unifdef-getline.patch
deleted file mode 100644
index 7e6a50014a3..00000000000
--- a/pkgs/os-specific/linux/uclibc/unifdef-getline.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/extra/scripts/unifdef.c b/extra/scripts/unifdef.c
-index 552025e..977e682 100644
---- a/extra/scripts/unifdef.c
-+++ b/extra/scripts/unifdef.c
-@@ -206,7 +206,7 @@ static void             done(void);
- static void             error(const char *);
- static int              findsym(const char *);
- static void             flushline(bool);
--static Linetype         getline(void);
-+static Linetype         parseline(void);
- static Linetype         ifeval(const char **);
- static void             ignoreoff(void);
- static void             ignoreon(void);
-@@ -512,7 +512,7 @@ process(void)
- 
- 	for (;;) {
- 		linenum++;
--		lineval = getline();
-+		lineval = parseline();
- 		trans_table[ifstate[depth]][lineval]();
- 		debug("process %s -> %s depth %d",
- 		    linetype_name[lineval],
-@@ -526,7 +526,7 @@ process(void)
-  * help from skipcomment().
-  */
- static Linetype
--getline(void)
-+parseline(void)
- {
- 	const char *cp;
- 	int cursym;

From 6961831c73ff0148efd9b1dfb203159f6ece6f34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 9 Mar 2010 15:57:33 +0000
Subject: [PATCH 09/10] TeXLive: Try again building the format files.

svn path=/nixpkgs/trunk/; revision=20503
---
 pkgs/misc/tex/texlive/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/tex/texlive/default.nix b/pkgs/misc/tex/texlive/default.nix
index 7a14ba90887..eadabb9b339 100644
--- a/pkgs/misc/tex/texlive/default.nix
+++ b/pkgs/misc/tex/texlive/default.nix
@@ -60,11 +60,9 @@ rec {
     HOME=. PATH=$PATH:$out/bin updmap-sys --syncwithtrees
 
     # Prebuild the format files, as it used to be done with TeXLive 2007.
-    # Note the funny argument parser of `mktexfmt', which wants something
-    # ending in `.fmt' as its first argument.
+    echo "building format files..."
     ensureDir "$out/texmf-var/web2c"
-    PATH="$PATH:$out/bin" mktexfmt does-not-matter.fmt \
-                             --fmtdir="$out/texmf-var/web2c" --all
+    PATH="$PATH:$out/bin" fmtutil-sys --all
 
     PATH=$PATH:$out/bin mktexlsr $out/texmf*
  '') ["minInit" "defEnsureDir" "doUnpack" "doMakeInstall"];

From 5b90cc5b6288f5ce3ae4e478bc07038e00d221f9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Mar 2010 16:22:43 +0000
Subject: [PATCH 10/10] * Revert to 0.6.06: 0.6.08 is broken (fails with
 "AttributeError:   'module' object has no attribute 'gpg_options'").

svn path=/nixpkgs/trunk/; revision=20505
---
 pkgs/tools/backup/duplicity/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index e811f961117..007241d0e82 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, librsync, gnupg, boto, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "duplicity-0.6.08";
+  name = "duplicity-0.6.06";
 
   src = fetchurl {
-    url = http://code.launchpad.net/duplicity/0.6-series/0.6.08/+download/duplicity-0.6.08.tar.gz;
-    sha256 = "1qvaa61j8614wy2fv02f47dp58pry2j958gnd2c73flj2n0n1919";
+    url = http://code.launchpad.net/duplicity/0.6-series/0.6.06/+download/duplicity-0.6.06.tar.gz;
+    sha256 = "1g284y24061krigs386x5s7vs7cnwhah7g1mfk9jfn3gzsidv70g";
   };
 
   installPhase = ''