From 19ebc883e177cc11d41f607e6ed013012f729b41 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Oct 2008 12:41:36 +0000
Subject: [PATCH 01/60] * pcre 7.8.

svn path=/nixpkgs/branches/stdenv-updates/; revision=12984
---
 pkgs/development/libraries/pcre/7.8.nix     | 14 --------------
 pkgs/development/libraries/pcre/default.nix | 15 +++++++--------
 2 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/development/libraries/pcre/7.8.nix

diff --git a/pkgs/development/libraries/pcre/7.8.nix b/pkgs/development/libraries/pcre/7.8.nix
deleted file mode 100644
index a9afb0c7cef..00000000000
--- a/pkgs/development/libraries/pcre/7.8.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, unicodeSupport ? false, cplusplusSupport ? true}:
-
-stdenv.mkDerivation {
-  name = "pcre-7.8";
-  src = fetchurl {
-    url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.8.tar.bz2;
-    sha256 = "1zsqk352mx2zklf9bgpg9d88ckfdssbbbiyslhrycfckw8m3qpvr";
-  };
-  configureFlags =
-    (if unicodeSupport then
-      "--enable-unicode-properties --enable-shared --disable-static"
-    else "") +
-    (if !cplusplusSupport then "--disable-cpp" else "");
-}
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 6baea4b6ff5..0ca141fc528 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -1,14 +1,13 @@
 {stdenv, fetchurl, unicodeSupport ? false, cplusplusSupport ? true}:
 
 stdenv.mkDerivation {
-  name = "pcre-7.4";
+  name = "pcre-7.8";
   src = fetchurl {
-    url = mirror://sourceforge/pcre/pcre-7.4.tar.bz2;
-    sha256 = "1rdks2h5f3p2d71c4jnxaic1c9gmgsfky80djnafcdbdrhzkiyx5";
+    url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.8.tar.bz2;
+    sha256 = "1zsqk352mx2zklf9bgpg9d88ckfdssbbbiyslhrycfckw8m3qpvr";
   };
-  configureFlags =
-    (if unicodeSupport then
-      "--enable-unicode-properties --enable-shared --disable-static"
-    else "") +
-    (if !cplusplusSupport then "--disable-cpp" else "");
+  configureFlags = ''
+    ${if unicodeSupport then "--enable-unicode-properties --enable-shared --disable-static" else ""}
+    ${if !cplusplusSupport then "--disable-cpp" else ""}
+  '';
 }

From 648b6f663186ce2a93826b2c0c515139901fc515 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Oct 2008 16:55:20 +0000
Subject: [PATCH 02/60] * Use Glibc 2.8.

svn path=/nixpkgs/branches/stdenv-updates/; revision=12988
---
 .../libraries/glibc-2.8/default.nix           | 23 ++++++++++++-------
 pkgs/top-level/all-packages.nix               | 19 +++++++--------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/glibc-2.8/default.nix b/pkgs/development/libraries/glibc-2.8/default.nix
index ca86a9527d7..6f39ebbf8d4 100644
--- a/pkgs/development/libraries/glibc-2.8/default.nix
+++ b/pkgs/development/libraries/glibc-2.8/default.nix
@@ -3,14 +3,14 @@
 , profilingLibraries ? false
 }:
 
-stdenv.mkDerivation rec
-{
-  name = "glibc-2.8-20080707";
+stdenv.mkDerivation rec {
+  name = "glibc-2.8-20081006";
+  
   builder = ./builder.sh;
-  src = fetchurl
-  {
+  
+  src = fetchurl {
     url = "ftp://sources.redhat.com/pub/glibc/snapshots/${name}.tar.bz2";
-    sha256 = "e317b854807f52cd539ed9b6bf8b1c2977e650e27e90baa787444bd3b74f5e72";
+    sha256 = "e32021c14f0bda55b6a5d2a98ac878a03b2c6f78a1ab4a11f0386a51eda1d58e";
   };
 
   inherit kernelHeaders installLocales;
@@ -45,9 +45,11 @@ stdenv.mkDerivation rec
   # `--with-tls --without-__thread' enables support for TLS but causes
   # it not to be used.  Required if we don't want to barf on 2.4
   # kernels.  Or something.
-  configureFlags="--enable-add-ons
+  configureFlags = ''
+    --enable-add-ons
     --with-headers=${kernelHeaders}/include
-    ${if profilingLibraries then "--enable-profile" else "--disable-profile"}";
+    ${if profilingLibraries then "--enable-profile" else "--disable-profile"}
+  '';
 
   # Workaround for this bug:
   #   http://sourceware.org/bugzilla/show_bug.cgi?id=411
@@ -55,4 +57,9 @@ stdenv.mkDerivation rec
   # preprocessor symbol `__i686' will be defined to `1'.  This causes
   # the symbol __i686.get_pc_thunk.dx to be mangled.
   NIX_CFLAGS_COMPILE = "-U__i686";
+
+  meta = {
+    homepage = http://www.gnu.org/software/libc/;
+    description = "The GNU C Library";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16b6a9f1c73..b93855cabd0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2806,16 +2806,17 @@ let
     inherit fetchurl stdenv pkgconfig gettext;
   };
 
-  glibc = useFromStdenv "glibc"
-    (import ../development/libraries/glibc-2.7 {
-      inherit fetchurl stdenv kernelHeaders;
-      #installLocales = false;
-    });
+  glibc = useFromStdenv "glibc" glibc28;
 
-  glibcUnstable = lowPrio (import ../development/libraries/glibc-2.8 {
-      inherit fetchurl stdenv kernelHeaders;
-      installLocales = getPkgConfig "glibc" "locales" false;
-    });
+  glibc27 = import ../development/libraries/glibc-2.7 {
+    inherit fetchurl stdenv kernelHeaders;
+    #installLocales = false;
+  };
+
+  glibc28 = import ../development/libraries/glibc-2.8 {
+    inherit fetchurl stdenv kernelHeaders;
+    installLocales = getPkgConfig "glibc" "locales" false;
+  };
 
   glibc_multi =
     assert system == "x86_64-linux";

From 387cbc1c922e1364112149737261252848384c5c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Oct 2008 16:55:58 +0000
Subject: [PATCH 03/60] * Enable the backwards compatibility patch (I guess it
 doesn't hurt on   new kernels).

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

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index a23f20bb244..2def6c8d4e8 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -8,11 +8,13 @@ stdenv.mkDerivation {
     sha256 = "12pi7i2mxff5jab48pqpwlz2pi0j6sp9p7bgrcl663iiw81zglj9";
   };
 
+  buildInputs = stdenv.lib.optional aclSupport acl;
+  
+  # Support older Linux kernels.
+  patches = [ ./setting-time-backward-compatibility.patch ];
+  
   meta = {
     homepage = http://www.gnu.org/software/coreutils/;
     description = "The basic file, shell and text manipulation utilities of the GNU operating system";
   };
-
-  buildInputs = stdenv.lib.optional aclSupport acl;
-  # Older kernels: patches = ./setting-time-backward-compatibility.patch;
 }

From 76e82546893b7c011e6fc35d5a25a914701091f8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Oct 2008 17:03:52 +0000
Subject: [PATCH 04/60] svn path=/nixpkgs/branches/stdenv-updates/;
 revision=12990

---
 pkgs/build-support/gcc-wrapper/add-flags      |  24 ---
 pkgs/build-support/gcc-wrapper/builder.sh     | 121 ---------------
 pkgs/build-support/gcc-wrapper/default.nix    |  46 ------
 pkgs/build-support/gcc-wrapper/gcc-wrapper.sh | 144 -----------------
 pkgs/build-support/gcc-wrapper/ld-wrapper.sh  | 145 ------------------
 pkgs/build-support/gcc-wrapper/setup-hook.sh  |  29 ----
 pkgs/build-support/gcc-wrapper/utils.sh       |  23 ---
 7 files changed, 532 deletions(-)
 delete mode 100644 pkgs/build-support/gcc-wrapper/add-flags
 delete mode 100644 pkgs/build-support/gcc-wrapper/builder.sh
 delete mode 100644 pkgs/build-support/gcc-wrapper/default.nix
 delete mode 100644 pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
 delete mode 100644 pkgs/build-support/gcc-wrapper/ld-wrapper.sh
 delete mode 100644 pkgs/build-support/gcc-wrapper/setup-hook.sh
 delete mode 100644 pkgs/build-support/gcc-wrapper/utils.sh

diff --git a/pkgs/build-support/gcc-wrapper/add-flags b/pkgs/build-support/gcc-wrapper/add-flags
deleted file mode 100644
index ace0a789628..00000000000
--- a/pkgs/build-support/gcc-wrapper/add-flags
+++ /dev/null
@@ -1,24 +0,0 @@
-# `-B@out@/bin' forces gcc to use ld-wrapper.sh when calling ld.
-export NIX_CFLAGS_COMPILE="-B@out@/bin/ $NIX_CFLAGS_COMPILE"
-
-if test -e @out@/nix-support/libc-cflags; then
-    export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE"
-fi
-
-if test -e @out@/nix-support/libc-ldflags; then
-    export NIX_LDFLAGS="$(cat @out@/nix-support/libc-ldflags) $NIX_LDFLAGS"
-fi
-
-if test -e @out@/nix-support/gcc-cflags; then
-    export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/gcc-cflags) $NIX_CFLAGS_COMPILE"
-fi
-
-if test -e @out@/nix-support/gcc-ldflags; then
-    export NIX_LDFLAGS="$(cat @out@/nix-support/gcc-ldflags) $NIX_LDFLAGS"
-fi
-
-if test -e @out@/nix-support/libc-ldflags-before; then
-    export NIX_LDFLAGS_BEFORE="$(cat @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE"
-fi
-
-export NIX_GCC_WRAPPER_FLAGS_SET=1
diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh
deleted file mode 100644
index 7a2f9c20f27..00000000000
--- a/pkgs/build-support/gcc-wrapper/builder.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-source $stdenv/setup
-
-
-ensureDir $out/bin
-ensureDir $out/nix-support
-
-
-if test -z "$nativeLibc"; then
-    dynamicLinker="$libc/lib/$dynamicLinker"
-    echo $dynamicLinker > $out/nix-support/dynamic-linker
-
-    # The "-B$libc/lib/" flag is a quick hack to force gcc to link
-    # against the crt1.o from our own glibc, rather than the one in
-    # /usr/lib.  (This is only an issue when using an `impure'
-    # compiler/linker, i.e., one that searches /usr/lib and so on.)
-    echo "-B$libc/lib/ -isystem $libc/include" > $out/nix-support/libc-cflags
-    
-    echo "-L$libc/lib" > $out/nix-support/libc-ldflags
-
-    # The dynamic linker is passed in `ldflagsBefore' to allow
-    # explicit overrides of the dynamic linker by callers to gcc/ld
-    # (the *last* value counts, so ours should come first).
-    echo "-dynamic-linker $dynamicLinker" > $out/nix-support/libc-ldflags-before
-fi
-
-if test -n "$nativeTools"; then
-    gccPath="$nativePrefix/bin"
-    ldPath="$nativePrefix/bin"
-else
-    if test -e "$gcc/lib64"; then
-        gccLDFlags="$gccLDFlags -L$gcc/lib64"
-    fi
-    gccLDFlags="$gccLDFlags -L$gcc/lib"
-    echo "$gccLDFlags" > $out/nix-support/gcc-ldflags
-
-    # GCC shows $gcc/lib in `gcc -print-search-dirs', but not
-    # $gcc/lib64 (even though it does actually search there...)..
-    # This confuses libtool.  So add it to the compiler tool search
-    # path explicitly.
-    if test -e "$gcc/lib64"; then
-        gccCFlags="$gccCFlags -B$gcc/lib64"
-    fi
-    echo "$gccCFlags" > $out/nix-support/gcc-cflags
-    
-    gccPath="$gcc/bin"
-    ldPath="$binutils/bin"
-fi
-
-
-doSubstitute() {
-    local src=$1
-    local dst=$2
-    # Can't use substitute() here, because replace may not have been
-    # built yet (in the bootstrap).
-    sed \
-        -e "s^@out@^$out^g" \
-        -e "s^@shell@^$shell^g" \
-        -e "s^@gcc@^$gcc^g" \
-        -e "s^@gccProg@^$gccProg^g" \
-        -e "s^@binutils@^$binutils^g" \
-        -e "s^@libc@^$libc^g" \
-        -e "s^@ld@^$ldPath/ld^g" \
-        < "$src" > "$dst" 
-}
-
-
-# Make wrapper scripts around gcc, g++, and g77.  Also make symlinks
-# cc, c++, and f77.
-mkGccWrapper() {
-    local dst=$1
-    local src=$2
-
-    if ! test -f "$src"; then
-        echo "$src does not exist (skipping)"
-        return
-    fi
-
-    gccProg="$src"
-    doSubstitute "$gccWrapper" "$dst"
-    chmod +x "$dst"
-}
-
-mkGccWrapper $out/bin/gcc $gccPath/gcc
-ln -s gcc $out/bin/cc
-
-mkGccWrapper $out/bin/g++ $gccPath/g++
-ln -s g++ $out/bin/c++
-
-mkGccWrapper $out/bin/g77 $gccPath/g77
-ln -s g77 $out/bin/f77
-
-
-# Create a symlink to as (the assembler).  This is useful when a
-# gcc-wrapper is installed in a user environment, as it ensures that
-# the right assembler is called.
-ln -s $ldPath/as $out/bin/as
-
-
-# Make a wrapper around the linker.
-doSubstitute "$ldWrapper" "$out/bin/ld"
-chmod +x "$out/bin/ld"
-
-
-# Emit a setup hook.  Also store the path to the original GCC and
-# Glibc.
-test -n "$gcc" && echo $gcc > $out/nix-support/orig-gcc
-test -n "$libc" && echo $libc > $out/nix-support/orig-libc
-
-doSubstitute "$addFlags" "$out/nix-support/add-flags.sh"
-
-doSubstitute "$setupHook" "$out/nix-support/setup-hook"
-
-cp -p $utils $out/nix-support/utils.sh
-
-
-# Propagate the wrapped gcc so that if you install the wrapper, you get
-# tools like gcov, the manpages, etc. as well (including for binutils
-# and Glibc).
-if test -z "$nativeTools"; then
-    echo $gcc $binutils $libc > $out/nix-support/propagated-user-env-packages
-fi
diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix
deleted file mode 100644
index 1cd84d77547..00000000000
--- a/pkgs/build-support/gcc-wrapper/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-# The Nix `gcc' stdenv.mkDerivation is not directly usable, since it doesn't
-# know where the C library and standard header files are.  Therefore
-# the compiler produced by that package cannot be installed directly
-# in a user environment and used from the command line.  This
-# stdenv.mkDerivation provides a wrapper that sets up the right environment
-# variables so that the compiler and the linker just "work".
-
-{ name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? ""
-, gcc ? null, libc ? null, binutils ? null, shell ? ""
-}:
-
-assert nativeTools -> nativePrefix != "";
-assert !nativeTools -> gcc != null && binutils != null;
-assert !nativeLibc -> libc != null;
-
-stdenv.mkDerivation {
-  builder = ./builder.sh;
-  setupHook = ./setup-hook.sh;
-  gccWrapper = ./gcc-wrapper.sh;
-  ldWrapper = ./ld-wrapper.sh;
-  utils = ./utils.sh;
-  addFlags = ./add-flags;
-  
-  inherit nativeTools nativeLibc nativePrefix gcc;
-  libc = if nativeLibc then null else libc;
-  binutils = if nativeTools then null else binutils;
-  
-  name = if name == "" then gcc.name else name;
-  langC = if nativeTools then true else gcc.langC;
-  langCC = if nativeTools then true else gcc.langCC;
-  langF77 = if nativeTools then false else gcc.langF77;
-  shell = if shell == "" then stdenv.shell else shell;
-  
-  meta = if gcc != null && (gcc ? meta) then removeAttrs gcc.meta ["priority"] else
-    { description = "System C compiler wrapper";
-    };
-
-  # The dynamic linker has different names on different Linux platforms.
-  dynamicLinker =
-    if !nativeLibc then
-      (if stdenv.system == "i686-linux" then "ld-linux.so.2" else
-       if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else
-       if stdenv.system == "powerpc-linux" then "ld.so.1" else
-       abort "don't know the name of the dynamic linker for this platform")
-    else "";
-}
diff --git a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
deleted file mode 100644
index a76684806b8..00000000000
--- a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
+++ /dev/null
@@ -1,144 +0,0 @@
-#! @shell@ -e
-
-if test -n "$NIX_GCC_WRAPPER_START_HOOK"; then
-    source "$NIX_GCC_WRAPPER_START_HOOK"
-fi
-
-if test -z "$NIX_GCC_WRAPPER_FLAGS_SET"; then
-    source @out@/nix-support/add-flags.sh
-fi
-
-source @out@/nix-support/utils.sh
-
-
-# Figure out if linker flags should be passed.  GCC prints annoying
-# warnings when they are not needed.
-dontLink=0
-getVersion=0
-nonFlagArgs=0
-
-for i in "$@"; do
-    if test "$i" = "-c"; then
-        dontLink=1
-    elif test "$i" = "-S"; then
-        dontLink=1
-    elif test "$i" = "-E"; then
-        dontLink=1
-    elif test "$i" = "-E"; then
-        dontLink=1
-    elif test "$i" = "-M"; then
-        dontLink=1
-    elif test "$i" = "-MM"; then
-        dontLink=1
-    elif test "${i:0:1}" != "-"; then
-        nonFlagArgs=1
-    fi
-done
-
-# If we pass a flag like -Wl, then gcc will call the linker unless it
-# can figure out that it has to do something else (e.g., because of a
-# "-c" flag).  So if no non-flag arguments are given, don't pass any
-# linker flags.  This catches cases like "gcc" (should just print
-# "gcc: no input files") and "gcc -v" (should print the version).
-if test "$nonFlagArgs" = "0"; then
-    dontLink=1
-fi
-
-
-# Optionally filter out paths not refering to the store.
-params=("$@")
-if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then
-    rest=()
-    n=0
-    while test $n -lt ${#params[*]}; do
-        p=${params[n]}
-        p2=${params[$((n+1))]}
-        if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then
-            skip $p
-        elif test "$p" = "-L" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        elif test "${p:0:3}" = "-I/" && badPath "${p:2}"; then
-            skip $p
-        elif test "$p" = "-I" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        elif test "$p" = "-isystem" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        else
-            rest=("${rest[@]}" "$p")
-        fi
-        n=$((n + 1))
-    done
-    params=("${rest[@]}")
-fi
-
-
-# Add the flags for the C compiler proper.
-extraAfter=($NIX_CFLAGS_COMPILE)
-extraBefore=()
-
-if test "$dontLink" != "1"; then
-
-    # Add the flags that should only be passed to the compiler when
-    # linking.
-    extraAfter=(${extraAfter[@]} $NIX_CFLAGS_LINK)
-
-    # Add the flags that should be passed to the linker (and prevent
-    # `ld-wrapper' from adding NIX_LDFLAGS again).
-    for i in $NIX_LDFLAGS_BEFORE; do
-        extraBefore=(${extraBefore[@]} "-Wl,$i")
-    done
-    for i in $NIX_LDFLAGS; do
-	if test "${i:0:3}" = "-L/"; then
-	    extraAfter=(${extraAfter[@]} "$i")
-	else
-	    extraAfter=(${extraAfter[@]} "-Wl,$i")
-	fi
-    done
-    export NIX_LDFLAGS_SET=1
-
-    if test "$NIX_STRIP_DEBUG" = "1"; then
-        # Add executable-stripping flags.
-        extraAfter=(${extraAfter[@]} $NIX_CFLAGS_STRIP)
-    fi
-fi
-
-# As a very special hack, if the arguments are just `-v', then don't
-# add anything.  This is to prevent `gcc -v' (which normally prints
-# out the version number and returns exit code 0) from printing out
-# `No input files specified' and returning exit code 1.
-if test "$*" = "-v"; then
-    extraAfter=()
-    extraBefore=()
-fi    
-
-# Optionally print debug info.
-if test "$NIX_DEBUG" = "1"; then
-  echo "original flags to @gccProg@:" >&2
-  for i in "${params[@]}"; do
-      echo "  $i" >&2
-  done
-  echo "extraBefore flags to @gccProg@:" >&2
-  for i in ${extraBefore[@]}; do
-      echo "  $i" >&2
-  done
-  echo "extraAfter flags to @gccProg@:" >&2
-  for i in ${extraAfter[@]}; do
-      echo "  $i" >&2
-  done
-fi
-
-if test -n "$NIX_GCC_WRAPPER_EXEC_HOOK"; then
-    source "$NIX_GCC_WRAPPER_EXEC_HOOK"
-fi
-
-
-# Call the real `gcc'.  Filter out warnings from stderr about unused
-# `-B' flags, since they confuse some programs.  Deep bash magic to
-# apply grep to stderr (by swapping stdin/stderr twice).
-if test -z "$NIX_GCC_NEEDS_GREP"; then
-    @gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]}
-else
-    (@gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \
-        | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3-
-    exit $?
-fi    
diff --git a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
deleted file mode 100644
index 94241e42ce9..00000000000
--- a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
+++ /dev/null
@@ -1,145 +0,0 @@
-#! @shell@ -e
-
-if test -n "$NIX_LD_WRAPPER_START_HOOK"; then
-    source "$NIX_LD_WRAPPER_START_HOOK"
-fi
-
-if test -z "$NIX_GCC_WRAPPER_FLAGS_SET"; then
-    source @out@/nix-support/add-flags.sh
-fi
-
-source @out@/nix-support/utils.sh
-
-
-# Optionally filter out paths not refering to the store.
-params=("$@")
-if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \
-        -a \( -z "$NIX_IGNORE_LD_THROUGH_GCC" -o -z "$NIX_LDFLAGS_SET" \); then
-    rest=()
-    n=0
-    while test $n -lt ${#params[*]}; do
-        p=${params[n]}
-        p2=${params[$((n+1))]}
-        if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then
-            skip $p
-        elif test "$p" = "-L" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        elif test "$p" = "-rpath" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        elif test "$p" = "-dynamic-linker" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        elif test "${p:0:1}" = "/" && badPath "$p"; then
-            # We cannot skip this; barf.
-            echo "impure path \`$p' used in link" >&2
-            exit 1
-        else
-            rest=("${rest[@]}" "$p")
-        fi
-        n=$((n + 1))
-    done
-    params=("${rest[@]}")
-fi
-
-
-extra=()
-extraBefore=()
-
-if test -z "$NIX_LDFLAGS_SET"; then
-    extra=(${extra[@]} $NIX_LDFLAGS)
-    extraBefore=(${extraBefore[@]} $NIX_LDFLAGS_BEFORE)
-fi
-
-
-# Add all used dynamic libraries to the rpath.
-if test "$NIX_DONT_SET_RPATH" != "1"; then
-
-    # First, find all -L... switches.
-    allParams=("${params[@]}" ${extra[@]})
-    libPath=""
-    addToLibPath() {
-        local path="$1"
-        if test "${path:0:1}" != "/"; then return 0; fi
-        case "$path" in
-            *..*|*./*|*/.*|*//*)
-                local path2
-                if path2=$(readlink -f "$path"); then
-                    path="$path2"
-                fi
-                ;;
-        esac
-        case $libPath in
-            *\ $path\ *) return 0 ;;
-        esac
-        libPath="$libPath $path "
-    }
-    n=0
-    while test $n -lt ${#allParams[*]}; do
-        p=${allParams[n]}
-        p2=${allParams[$((n+1))]}
-        if test "${p:0:3}" = "-L/"; then
-            addToLibPath ${p:2}
-        elif test "$p" = "-L"; then
-            addToLibPath ${p2}
-            n=$((n + 1))
-        fi
-        n=$((n + 1))
-    done
-
-    # Second, for each -l... switch, find the directory containing the
-    # library and add it to the rpath.
-    rpath=""
-    addToRPath() {
-        # If the path is not in the store, don't add it to the rpath.
-        # This typically happens for libraries in /tmp that are later
-        # copied to $out/lib.  If not, we're screwed.
-        if test "${1:0:${#NIX_STORE}}" != "$NIX_STORE"; then return 0; fi
-        case $rpath in
-            *\ $1\ *) return 0 ;;
-        esac
-        rpath="$rpath $1 "
-    }
-    findLib() {
-        for i in $libPath; do
-            if test -f $i/lib$1.so; then
-                addToRPath $i
-            fi
-        done
-    }
-    n=0
-    while test $n -lt ${#allParams[*]}; do
-        p=${allParams[n]}
-        p2=${allParams[$((n+1))]}
-        if test "${p:0:2}" = "-l"; then
-            findLib ${p:2}
-        elif test "$p" = "-l"; then
-            # I haven't seen `-l foo', but you never know...
-            findLib ${p2}
-            n=$((n + 1))
-        fi
-        n=$((n + 1))
-    done
-
-    # Finally, add `-rpath' switches.
-    for i in $rpath; do
-        extra=(${extra[@]} -rpath $i)
-    done
-fi
-
-
-# Optionally print debug info.
-if test "$NIX_DEBUG" = "1"; then
-  echo "original flags to @ld@:" >&2
-  for i in "${params[@]}"; do
-      echo "  $i" >&2
-  done
-  echo "extra flags to @ld@:" >&2
-  for i in ${extra[@]}; do
-      echo "  $i" >&2
-  done
-fi
-
-if test -n "$NIX_LD_WRAPPER_EXEC_HOOK"; then
-    source "$NIX_LD_WRAPPER_EXEC_HOOK"
-fi
-
-exec @ld@ ${extraBefore[@]} "${params[@]}" ${extra[@]}
diff --git a/pkgs/build-support/gcc-wrapper/setup-hook.sh b/pkgs/build-support/gcc-wrapper/setup-hook.sh
deleted file mode 100644
index 60aad0fe4dc..00000000000
--- a/pkgs/build-support/gcc-wrapper/setup-hook.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-addCVars () {
-    if test -d $1/include; then
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$1/include"
-    fi
-
-    if test -d $1/lib64; then
-        export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib64"
-    fi
-
-    if test -d $1/lib; then
-        export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib"
-    fi
-}
-
-envHooks=(${envHooks[@]} addCVars)
-
-# Note: these come *after* $out in the PATH (see setup.sh).
-
-if test -n "@gcc@"; then
-    PATH=$PATH:@gcc@/bin
-fi
-
-if test -n "@binutils@"; then
-    PATH=$PATH:@binutils@/bin
-fi
-
-if test -n "@libc@"; then
-    PATH=$PATH:@libc@/bin
-fi
diff --git a/pkgs/build-support/gcc-wrapper/utils.sh b/pkgs/build-support/gcc-wrapper/utils.sh
deleted file mode 100644
index 9a664e1d1e6..00000000000
--- a/pkgs/build-support/gcc-wrapper/utils.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-skip () {
-    if test "$NIX_DEBUG" = "1"; then
-        echo "skipping impure path $1" >&2
-    fi
-}
-
-
-# Checks whether a path is impure.  E.g., `/lib/foo.so' is impure, but
-# `/nix/store/.../lib/foo.so' isn't.
-badPath() {
-    local p=$1
-    
-    # Relative paths are okay (since they're presumably relative to
-    # the temporary build directory).
-    if test "${p:0:1}" != "/"; then return 1; fi
-    
-    # Otherwise, the path should refer to the store or some temporary
-    # directory (including the build directory).
-    test \
-        "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \
-        "${p:0:4}" != "/tmp" -a \
-        "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP"
-}

From 69b538fde3dee891450ad5809ad91e353b34130e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Oct 2008 17:33:20 +0000
Subject: [PATCH 05/60] * gcc-wrapper-new -> gcc-wrapper, setup-new -> setup.

svn path=/nixpkgs/branches/stdenv-updates/; revision=12991
---
 .../add-flags                                 |   0
 .../builder.sh                                |   0
 .../default.nix                               |   0
 .../gcc-wrapper.sh                            |   0
 .../ld-wrapper.sh                             |   0
 .../setup-hook.sh                             |   0
 .../{gcc-wrapper-new => gcc-wrapper}/utils.sh |   0
 pkgs/stdenv/generic/setup-new.sh              | 829 ------------------
 pkgs/stdenv/generic/setup.sh                  | 112 +--
 pkgs/top-level/all-packages.nix               |  14 +-
 10 files changed, 27 insertions(+), 928 deletions(-)
 rename pkgs/build-support/{gcc-wrapper-new => gcc-wrapper}/add-flags (100%)
 rename pkgs/build-support/{gcc-wrapper-new => gcc-wrapper}/builder.sh (100%)
 rename pkgs/build-support/{gcc-wrapper-new => gcc-wrapper}/default.nix (100%)
 rename pkgs/build-support/{gcc-wrapper-new => gcc-wrapper}/gcc-wrapper.sh (100%)
 rename pkgs/build-support/{gcc-wrapper-new => gcc-wrapper}/ld-wrapper.sh (100%)
 rename pkgs/build-support/{gcc-wrapper-new => gcc-wrapper}/setup-hook.sh (100%)
 rename pkgs/build-support/{gcc-wrapper-new => gcc-wrapper}/utils.sh (100%)
 delete mode 100644 pkgs/stdenv/generic/setup-new.sh

diff --git a/pkgs/build-support/gcc-wrapper-new/add-flags b/pkgs/build-support/gcc-wrapper/add-flags
similarity index 100%
rename from pkgs/build-support/gcc-wrapper-new/add-flags
rename to pkgs/build-support/gcc-wrapper/add-flags
diff --git a/pkgs/build-support/gcc-wrapper-new/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh
similarity index 100%
rename from pkgs/build-support/gcc-wrapper-new/builder.sh
rename to pkgs/build-support/gcc-wrapper/builder.sh
diff --git a/pkgs/build-support/gcc-wrapper-new/default.nix b/pkgs/build-support/gcc-wrapper/default.nix
similarity index 100%
rename from pkgs/build-support/gcc-wrapper-new/default.nix
rename to pkgs/build-support/gcc-wrapper/default.nix
diff --git a/pkgs/build-support/gcc-wrapper-new/gcc-wrapper.sh b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
similarity index 100%
rename from pkgs/build-support/gcc-wrapper-new/gcc-wrapper.sh
rename to pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
diff --git a/pkgs/build-support/gcc-wrapper-new/ld-wrapper.sh b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
similarity index 100%
rename from pkgs/build-support/gcc-wrapper-new/ld-wrapper.sh
rename to pkgs/build-support/gcc-wrapper/ld-wrapper.sh
diff --git a/pkgs/build-support/gcc-wrapper-new/setup-hook.sh b/pkgs/build-support/gcc-wrapper/setup-hook.sh
similarity index 100%
rename from pkgs/build-support/gcc-wrapper-new/setup-hook.sh
rename to pkgs/build-support/gcc-wrapper/setup-hook.sh
diff --git a/pkgs/build-support/gcc-wrapper-new/utils.sh b/pkgs/build-support/gcc-wrapper/utils.sh
similarity index 100%
rename from pkgs/build-support/gcc-wrapper-new/utils.sh
rename to pkgs/build-support/gcc-wrapper/utils.sh
diff --git a/pkgs/stdenv/generic/setup-new.sh b/pkgs/stdenv/generic/setup-new.sh
deleted file mode 100644
index 5c8d935c799..00000000000
--- a/pkgs/stdenv/generic/setup-new.sh
+++ /dev/null
@@ -1,829 +0,0 @@
-exitHandler() {
-    exitCode=$?
-    set +e
-
-    closeNest
-
-    if test -n "$showBuildStats"; then
-        times > $NIX_BUILD_TOP/.times
-        local -a times=($(cat $NIX_BUILD_TOP/.times))
-        # Print the following statistics:
-        # - user time for the shell
-        # - system time for the shell
-        # - user time for all child processes
-        # - system time for all child processes
-        echo "build time elapsed: " ${times[*]}
-    fi
-    
-    if test $exitCode != 0; then
-        eval "$failureHook"
-    
-        # If the builder had a non-zero exit code and
-        # $succeedOnFailure is set, create the file
-        # `$out/nix-support/failed' to signal failure, and exit
-        # normally.  Otherwise, return the original exit code.
-        if test -n "$succeedOnFailure"; then
-            echo "build failed with exit code $exitCode (ignored)"
-            ensureDir "$out/nix-support"
-            echo -n $exitCode > "$out/nix-support/failed"
-            exit 0
-        fi
-        
-    else
-        eval "$exitHook"
-    fi
-    
-    exit $exitCode
-}
-
-trap "exitHandler" EXIT
-
-
-######################################################################
-# Helper functions that might be useful in setup hooks.
-
-
-addToSearchPathWithCustomDelimiter() {
-    local delimiter=$1
-    local varName=$2
-    local needDir=$3
-    local addDir=${4:-$needDir}
-    local prefix=$5
-    if [ -d $prefix$needDir ]; then
-        if [ -z ${!varName} ]; then
-            eval export ${varName}=${prefix}$addDir
-        else
-            eval export ${varName}=${!varName}${delimiter}${prefix}$addDir
-        fi
-    fi
-}
-
-addToSearchPath() {
-    addToSearchPathWithCustomDelimiter "${PATH_DELIMITER}" "$@"
-}
-
-
-######################################################################
-# Initialisation.
-
-set -e
-
-test -z $NIX_GCC && NIX_GCC=@gcc@
-
-
-# Set up the initial path.
-PATH=
-for i in $NIX_GCC @initialPath@; do
-    if test "$i" = /; then i=; fi
-    PATH=$PATH${PATH:+:}$i/bin
-done
-
-if test "$NIX_DEBUG" = "1"; then
-    echo "initial path: $PATH"
-fi
-
-
-# Execute the pre-hook.
-export SHELL=@shell@
-PATH_DELIMITER=':'
-if test -z "$shell"; then
-    export shell=@shell@
-fi
-param1=@param1@
-param2=@param2@
-param3=@param3@
-param4=@param4@
-param5=@param5@
-if test -n "@preHook@"; then source @preHook@; fi
-eval "$preHook"
-
-
-# Check that the pre-hook initialised SHELL.
-if test -z "$SHELL"; then echo "SHELL not set"; exit 1; fi
-
-
-# Hack: run gcc's setup hook.
-envHooks=()
-if test -f $NIX_GCC/nix-support/setup-hook; then
-    source $NIX_GCC/nix-support/setup-hook
-fi
-
-
-# Ensure that the given directories exists.
-ensureDir() {
-    local dir
-    for dir in "$@"; do
-        if ! test -x "$dir"; then mkdir -p "$dir"; fi
-    done
-}
-
-installBin() {
-  ensureDir $out/bin
-  cp "$@" $out/bin
-}
-
-assertEnvExists(){
-  if test -z "${!1}"; then
-      msg=${2:-error: assertion failed: env var $1 is required}
-      echo $msg >&2; exit 1
-  fi
-}
-
-
-# Allow the caller to augment buildInputs (it's not always possible to
-# do this before the call to setup.sh, since the PATH is empty at that
-# point; here we have a basic Unix environment).
-eval "$addInputsHook"
-
-
-# Recursively find all build inputs.
-findInputs() {
-    local pkg=$1
-
-    case $pkgs in
-        *\ $pkg\ *)
-            return 0
-            ;;
-    esac
-
-    pkgs="$pkgs $pkg "
-
-    if test -f $pkg/nix-support/setup-hook; then
-        source $pkg/nix-support/setup-hook
-    fi
-
-    if test -f $pkg/nix-support/propagated-build-inputs; then
-        for i in $(cat $pkg/nix-support/propagated-build-inputs); do
-            findInputs $i
-        done
-    fi
-}
-
-pkgs=""
-for i in $buildInputs $propagatedBuildInputs; do
-    findInputs $i
-done
-
-
-# Set the relevant environment variables to point to the build inputs
-# found above.
-addToEnv() {
-    local pkg=$1
-
-    if test "$ignoreFailedInputs" != "1" -a -e $1/nix-support/failed; then
-        echo "failed input $1" >&2
-        exit 1
-    fi
-
-    if test -d $1/bin; then
-        export _PATH=$_PATH${_PATH:+:}$1/bin
-    fi
-
-    for i in "${envHooks[@]}"; do
-        $i $pkg
-    done
-}
-
-for i in $pkgs; do
-    addToEnv $i
-done
-
-
-# Add the output as an rpath.
-if test "$NIX_NO_SELF_RPATH" != "1"; then
-    export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS"
-fi
-
-
-# Strip debug information by default.
-if test -z "$NIX_STRIP_DEBUG"; then
-    export NIX_STRIP_DEBUG=1
-    export NIX_CFLAGS_STRIP="-g0 -Wl,--strip-debug"
-fi
-
-
-assertEnvExists NIX_STORE \
-    "Error: you have an old version of Nix that does not set the
-     NIX_STORE variable. This is required for purity checking.
-     Please upgrade."
-
-assertEnvExists NIX_BUILD_TOP \
-    "Error: you have an old version of Nix that does not set the
-     NIX_BUILD_TOP variable. This is required for purity checking.
-     Please upgrade."
-
-
-# Set the TZ (timezone) environment variable, otherwise commands like
-# `date' will complain (e.g., `Tue Mar 9 10:01:47 Local time zone must
-# be set--see zic manual page 2004').
-export TZ=UTC
-
-
-# Set the prefix.  This is generally $out, but it can be overriden,
-# for instance if we just want to perform a test build/install to a
-# temporary location and write a build report to $out.
-if test -z "$prefix"; then
-    prefix="$out";
-fi
-
-if test "$useTempPrefix" = "1"; then
-    prefix="$NIX_BUILD_TOP/tmp_prefix";
-fi
-
-
-PATH=$_PATH${_PATH:+:}$PATH
-if test "$NIX_DEBUG" = "1"; then
-    echo "final path: $PATH"
-fi
-
-
-######################################################################
-# Misc. helper functions.
-
-
-stripDirs() {
-    local dirs="$1"
-    local stripFlags="$2"
-    local dirsNew=
-
-    for d in ${dirs}; do
-        if test -d "$prefix/$d"; then
-            dirsNew="${dirsNew} $prefix/$d "
-        fi
-    done
-    dirs=${dirsNew}
-
-    if test -n "${dirs}"; then
-        header "stripping (with flags $stripFlags) in $dirs"
-        find $dirs -type f -print0 | xargs -0 strip $stripFlags || true
-        stopNest
-    fi
-}
-
-
-######################################################################
-# Textual substitution functions.
-
-
-substitute() {
-    local input="$1"
-    local output="$2"
-
-    local -a params=("$@")
-    local -a args=()
-
-    local n p pattern replacement varName
-
-    for ((n = 2; n < ${#params[*]}; n += 1)); do
-        p=${params[$n]}
-
-        if test "$p" = "--replace"; then
-            pattern="${params[$((n + 1))]}"
-            replacement="${params[$((n + 2))]}"
-            n=$((n + 2))
-        fi
-
-        if test "$p" = "--subst-var"; then
-            varName="${params[$((n + 1))]}"
-            pattern="@$varName@"
-            replacement="${!varName}"
-            n=$((n + 1))
-        fi
-
-        if test "$p" = "--subst-var-by"; then
-            pattern="@${params[$((n + 1))]}@"
-            replacement="${params[$((n + 2))]}"
-            n=$((n + 2))
-        fi
-
-        if test ${#args[@]} != 0; then
-            args[${#args[@]}]="-a"
-        fi
-        args[${#args[@]}]="$pattern"
-        args[${#args[@]}]="$replacement"
-    done
-
-    replace-literal -e -s -- "${args[@]}" < "$input" > "$output".tmp
-    if test -x "$output"; then
-        chmod +x "$output".tmp
-    fi
-    mv -f "$output".tmp "$output"
-}
-
-
-substituteInPlace() {
-    local fileName="$1"
-    shift
-    substitute "$fileName" "$fileName" "$@"
-}
-
-
-substituteAll() {
-    local input="$1"
-    local output="$2"
-
-    # Select all environment variables that start with a lowercase character.
-    for envVar in $(env | sed "s/^[^a-z].*//" | sed "s/^\([^=]*\)=.*/\1/"); do
-        if test "$NIX_DEBUG" = "1"; then
-            echo "$envVar -> ${!envVar}"
-        fi
-        args="$args --subst-var $envVar"
-    done
-
-    substitute "$input" "$output" $args
-}
-
-
-######################################################################
-# What follows is the generic builder.
-
-
-nestingLevel=0
-
-startNest() {
-    nestingLevel=$(($nestingLevel + 1))
-    echo -en "\e[$1p"
-}
-
-stopNest() {
-    nestingLevel=$(($nestingLevel - 1))
-    echo -en "\e[q"
-}
-
-header() {
-    startNest "$2"
-    echo "$1"
-}
-
-# Make sure that even when we exit abnormally, the original nesting
-# level is properly restored.
-closeNest() {
-    while test $nestingLevel -gt 0; do
-        stopNest
-    done
-}
-
-
-# This function is useful for debugging broken Nix builds.  It dumps
-# all environment variables to a file `env-vars' in the build
-# directory.  If the build fails and the `-K' option is used, you can
-# then go to the build directory and source in `env-vars' to reproduce
-# the environment used for building.
-dumpVars() {
-    if test "$noDumpEnvVars" != "1"; then
-        export > $NIX_BUILD_TOP/env-vars
-    fi
-}
-
-
-# Redirect stdout/stderr to a named pipe connected to a `tee' process
-# that writes the specified file (and also to our original stdout).
-# The original stdout is saved in descriptor 3.
-startLog() {
-    local logFile=${logNr}_$1
-    logNr=$((logNr + 1))
-    if test "$logPhases" = 1; then
-        ensureDir $logDir
-
-        exec 3>&1
-
-        if test "$dontLogThroughTee" != 1; then
-            # This required named pipes (fifos).
-            logFifo=$NIX_BUILD_TOP/log_fifo
-            test -p $logFifo || mkfifo $logFifo
-            startLogWrite "$logDir/$logFile" "$logFifo"
-            exec > $logFifo 2>&1
-        else
-            exec > $logDir/$logFile 2>&1
-        fi
-    fi
-}
-
-# Factored into a separate function so that it can be overriden.
-startLogWrite() {
-    tee "$1" < "$2" &
-    logWriterPid=$!
-}
-
-
-if test -z "$logDir"; then
-    logDir=$out/log
-fi
-
-logNr=0
-
-# Restore the original stdout/stderr.
-stopLog() {
-    if test "$logPhases" = 1; then
-        exec >&3 2>&1
-
-        # Wait until the tee process has died.  Otherwise output from
-        # different phases may be mixed up.
-        if test -n "$logWriterPid"; then
-            wait $logWriterPid
-            logWriterPid=
-            rm $logFifo
-        fi
-    fi
-}
-
-
-# Utility function: return the base name of the given path, with the
-# prefix `HASH-' removed, if present.
-stripHash() {
-    strippedName=$(basename $1);
-    if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then
-        strippedName=$(echo "$strippedName" | cut -c34-)
-    fi
-}
-
-
-unpackFile() {
-    curSrc="$1"
-    local cmd
-
-    header "unpacking source archive $curSrc" 3
-
-    case "$curSrc" in
-        *.tar)
-            tar xvf $curSrc
-            ;;
-        *.tar.gz | *.tgz | *.tar.Z)
-            gzip -d < $curSrc | tar xvf -
-            ;;
-        *.tar.bz2 | *.tbz2)
-            bzip2 -d < $curSrc | tar xvf -
-            ;;
-        *.zip)
-            unzip $curSrc
-            ;;
-        *)
-            if test -d "$curSrc"; then
-                stripHash $curSrc
-                cp -prvd $curSrc $strippedName
-            else
-                if test -z "$unpackCmd"; then
-                    echo "source archive $curSrc has unknown type"
-                    exit 1
-                fi
-                eval "$unpackCmd"
-            fi
-            ;;
-    esac
-
-    stopNest
-}
-
-
-unpackPhase() {
-    eval "$preUnpack"
-    
-    if test -z "$srcs"; then
-        if test -z "$src"; then
-            echo 'variable $src or $srcs should point to the source'
-            exit 1
-        fi
-        srcs="$src"
-    fi
-
-    # To determine the source directory created by unpacking the
-    # source archives, we record the contents of the current
-    # directory, then look below which directory got added.  Yeah,
-    # it's rather hacky.
-    local dirsBefore=""
-    for i in *; do
-        if test -d "$i"; then
-            dirsBefore="$dirsBefore $i "
-        fi
-    done
-
-    # Unpack all source archives.
-    for i in $srcs; do
-        unpackFile $i
-    done
-
-    # Find the source directory.
-    if test -n "$setSourceRoot"; then
-        eval "$setSourceRoot"
-    elif test -z "$sourceRoot"; then
-        sourceRoot=
-        for i in *; do
-            if test -d "$i"; then
-                case $dirsBefore in
-                    *\ $i\ *)
-                        ;;
-                    *)
-                        if test -n "$sourceRoot"; then
-                            echo "unpacker produced multiple directories"
-                            exit 1
-                        fi
-                        sourceRoot=$i
-                        ;;
-                esac
-            fi
-        done
-    fi
-
-    if test -z "$sourceRoot"; then
-        echo "unpacker appears to have produced no directories"
-        exit 1
-    fi
-
-    echo "source root is $sourceRoot"
-
-    # By default, add write permission to the sources.  This is often
-    # necessary when sources have been copied from other store
-    # locations.
-    if test "dontMakeSourcesWritable" != 1; then
-        chmod -R u+w $sourceRoot
-    fi
-
-    eval "$postUnpack"
-}
-
-
-patchPhase() {
-    eval "$prePatch"
-    
-    if test -z "$patchPhase" -a -z "$patches"; then return; fi
-    
-    for i in $patches; do
-        header "applying patch $i" 3
-        local uncompress=cat
-        case $i in
-            *.gz)
-                uncompress="gzip -d"
-                ;;
-            *.bz2)
-                uncompress="bzip2 -d"
-                ;;
-        esac
-        $uncompress < $i | patch ${patchFlags:--p1}
-        stopNest
-    done
-
-    eval "$postPatch"
-}
-
-
-fixLibtool() {
-    sed -i -e 's^eval sys_lib_.*search_path=.*^^' "$1"
-}
-
-
-configurePhase() {
-    eval "$preConfigure"
-
-    if test -z "$configureScript"; then
-        configureScript=./configure
-        if ! test -x $configureScript; then
-            echo "no configure script, doing nothing"
-            return
-        fi
-    fi
-
-    if test -z "$dontFixLibtool"; then
-        for i in $(find . -name "ltmain.sh"); do
-            echo "fixing libtool script $i"
-            fixLibtool $i
-        done
-    fi
-
-    if test -z "$dontAddPrefix"; then
-        configureFlags="${prefixKey:---prefix=}$prefix $configureFlags"
-    fi
-
-    # Add --disable-dependency-tracking to speed up some builds.
-    if test -z "$dontAddDisableDepTrack"; then
-        if grep -q dependency-tracking $configureScript; then
-            configureFlags="--disable-dependency-tracking $configureFlags"
-        fi
-    fi
-
-    echo "configure flags: $configureFlags ${configureFlagsArray[@]}"
-    $configureScript $configureFlags"${configureFlagsArray[@]}"
-
-    eval "$postConfigure"
-}
-
-
-buildPhase() {
-    eval "$preBuild"
-
-    if test -z "$makeFlags" && ! test -n "$makefile" -o -e "Makefile" -o -e "makefile" -o -e "GNUmakefile"; then
-        echo "no Makefile, doing nothing"
-        return
-    fi
-
-    echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}"
-    make ${makefile:+-f $makefile} \
-        $makeFlags "${makeFlagsArray[@]}" \
-        $buildFlags "${buildFlagsArray[@]}"
-
-    eval "$postBuild"
-}
-
-
-checkPhase() {
-    eval "$preCheck"
-
-    echo "check flags: $makeFlags ${makeFlagsArray[@]} $checkFlags ${checkFlagsArray[@]}"
-    make ${makefile:+-f $makefile} \
-        $makeFlags "${makeFlagsArray[@]}" \
-        $checkFlags "${checkFlagsArray[@]}" ${checkTarget:-check}
-
-    eval "$postCheck"
-}
-
-
-patchELF() {
-    # Patch all ELF executables and shared libraries.
-    header "patching ELF executables and libraries"
-    if test -e "$prefix"; then
-        find "$prefix" \( \
-            \( -type f -a -name "*.so*" \) -o \
-            \( -type f -a -perm +0100 \) \
-            \) -print -exec patchelf --shrink-rpath {} \;
-    fi
-    stopNest
-}
-
-
-patchShebangs() {
-    # Rewrite all script interpreter file names (`#! /path') under the
-    # specified  directory tree to paths found in $PATH.  E.g.,
-    # /bin/sh will be rewritten to /nix/store/<hash>-some-bash/bin/sh.
-    # Interpreters that are already in the store are left untouched.
-    header "patching script interpreter paths"
-    local dir="$1"
-    local f
-    for f in $(find "$dir" -type f -perm +0100); do
-        local oldPath=$(sed -ne '1 s,^#![ ]*\([^ ]*\).*$,\1,p' "$f")
-        if test -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE"; then
-            local newPath=$(type -P $(basename $oldPath) || true)
-            if test -n "$newPath" -a "$newPath" != "$oldPath"; then
-                echo "$f: interpreter changed from $oldPath to $newPath"
-                sed -i -e "1 s,$oldPath,$newPath," "$f"
-            fi
-        fi
-    done
-    stopNest
-}
-
-
-installPhase() {
-    eval "$preInstall"
-
-    ensureDir "$prefix"
-
-    installTargets=${installTargets:-install}
-    echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}"
-    make ${makefile:+-f $makefile} $installTargets \
-        $makeFlags "${makeFlagsArray[@]}" \
-        $installFlags "${installFlagsArray[@]}"
-
-    eval "$postInstall"
-}
-
-
-# The fixup phase performs generic, package-independent, Nix-related
-# stuff, like running patchelf and setting the
-# propagated-build-inputs.  It should rarely be overriden.
-fixupPhase() {
-    eval "$preFixup"
-
-    # Put man/doc/info under $out/share.
-    forceShare=${forceShare:=man doc info}
-    if test -n "$forceShare"; then
-        for d in $forceShare; do
-            if test -d "$prefix/$d"; then
-                if test -d "$prefix/share/$d"; then
-                    echo "both $d/ and share/$d/ exists!"
-                else
-                    echo "fixing location of $d/ subdirectory"
-                    ensureDir $prefix/share
-                    if test -w $prefix/share; then
-                        mv -v $prefix/$d $prefix/share
-                        ln -sv share/$d $prefix
-                    fi
-                fi
-            fi
-        done;
-    fi
-
-    # TODO: strip _only_ ELF executables, and return || fail here...
-    if test -z "$dontStrip"; then
-        stripDebugList=${stripDebugList:-lib bin sbin}
-        if test -n "$stripDebugList"; then
-            stripDirs "$stripDebugList" "${stripDebugFlags:--S}"
-        fi
-        
-        stripAllList=${stripAllList:-}
-        if test -n "$stripAllList"; then
-            stripDirs "$stripAllList" "${stripAllFlags:--s}"
-        fi
-    fi
-
-    if test "$havePatchELF" = 1 -a -z "$dontPatchELF"; then
-        patchELF "$prefix"
-    fi
-
-    if test -z "$dontPatchShebangs"; then
-        patchShebangs "$prefix"
-    fi
-
-    if test -n "$propagatedBuildInputs"; then
-        ensureDir "$out/nix-support"
-        echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
-    fi
-
-    if test -n "$setupHook"; then
-        ensureDir "$out/nix-support"
-        substituteAll "$setupHook" "$out/nix-support/setup-hook"
-    fi
-
-    eval "$postFixup"
-}
-
-
-distPhase() {
-    eval "$preDist"
-
-    echo "dist flags: $distFlags ${distFlagsArray[@]}"
-    make ${makefile:+-f $makefile} $distFlags "${distFlagsArray[@]}" ${distTarget:-dist}
-
-    if test "$dontCopyDist" != 1; then
-        ensureDir "$out/tarballs"
-
-        # Note: don't quote $tarballs, since we explicitly permit
-        # wildcards in there.
-        cp -pvd ${tarballs:-*.tar.gz} $out/tarballs
-    fi
-
-    eval "$postDist"
-}
-
-
-showPhaseHeader() {
-    local phase="$1"
-    case $phase in
-        unpackPhase) header "unpacking sources";;
-        patchPhase) header "patching sources";;
-        configurePhase) header "configuring";;
-        buildPhase) header "building";;
-        checkPhase) header "running tests";;
-        installPhase) header "installing";;
-        fixupPhase) header "post-installation fixup";;
-        *) header "$phase";;
-    esac
-}
-
-
-genericBuild() {
-    header "building $out"
-
-    if test -n "$buildCommand"; then
-        eval "$buildCommand"
-        return
-    fi
-
-    if test -z "$phases"; then
-        phases="$prePhases unpackPhase patchPhase $preConfigurePhases \
-            configurePhase $preBuildPhases buildPhase checkPhase \
-            $preInstallPhases installPhase fixupPhase \
-            $preDistPhases distPhase $postPhases";
-    fi
-
-    for curPhase in $phases; do
-        if test "$curPhase" = buildPhase -a -n "$dontBuild"; then continue; fi
-        if test "$curPhase" = checkPhase -a -z "$doCheck"; then continue; fi
-        if test "$curPhase" = installPhase -a -n "$dontInstall"; then continue; fi
-        if test "$curPhase" = fixupPhase -a -n "$dontFixup"; then continue; fi
-        if test "$curPhase" = distPhase -a -z "$doDist"; then continue; fi
-        
-        showPhaseHeader "$curPhase"
-        startLog "$curPhase"
-        dumpVars
-        
-        # Evaluate the variable named $curPhase if it exists, otherwise the
-        # function named $curPhase.
-        eval "${!curPhase:-$curPhase}"
-
-        if test "$curPhase" = unpackPhase; then
-            cd "${sourceRoot:-.}"
-        fi
-        
-        stopLog
-        stopNest
-    done
-
-    stopNest
-}
-
-
-# Execute the post-hook.
-if test -n "@postHook@"; then source @postHook@; fi
-eval "$postHook"
-
-
-dumpVars
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index b4e499a53bc..5c8d935c799 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -160,9 +160,6 @@ findInputs() {
 }
 
 pkgs=""
-if test -n "$buildinputs"; then
-    buildInputs="$buildinputs" # compatibility
-fi
 for i in $buildInputs $propagatedBuildInputs; do
     findInputs $i
 done
@@ -442,34 +439,31 @@ stripHash() {
 
 
 unpackFile() {
-    local file="$1"
+    curSrc="$1"
     local cmd
 
-    header "unpacking source archive $file" 3
+    header "unpacking source archive $curSrc" 3
 
-    case "$file" in
+    case "$curSrc" in
         *.tar)
-            tar xvf $file
+            tar xvf $curSrc
             ;;
         *.tar.gz | *.tgz | *.tar.Z)
-            gzip -d < $file | tar xvf -
+            gzip -d < $curSrc | tar xvf -
             ;;
         *.tar.bz2 | *.tbz2)
-            bzip2 -d < $file | tar xvf -
+            bzip2 -d < $curSrc | tar xvf -
             ;;
         *.zip)
-            unzip $file
+            unzip $curSrc
             ;;
         *)
-            if test -d "$file"; then
-                stripHash $file
-                cp -prvd $file $strippedName
+            if test -d "$curSrc"; then
+                stripHash $curSrc
+                cp -prvd $curSrc $strippedName
             else
-                if test -n "$findUnpacker"; then
-                    $findUnpacker $1;
-                fi
                 if test -z "$unpackCmd"; then
-                    echo "source archive $file has unknown type"
+                    echo "source archive $curSrc has unknown type"
                     exit 1
                 fi
                 eval "$unpackCmd"
@@ -482,11 +476,6 @@ unpackFile() {
 
 
 unpackPhase() {
-    if test -n "$unpackPhase"; then
-        eval "$unpackPhase"
-        return
-    fi
-
     eval "$preUnpack"
     
     if test -z "$srcs"; then
@@ -516,7 +505,7 @@ unpackPhase() {
     # Find the source directory.
     if test -n "$setSourceRoot"; then
         eval "$setSourceRoot"
-    else
+    elif test -z "$sourceRoot"; then
         sourceRoot=
         for i in *; do
             if test -d "$i"; then
@@ -546,7 +535,7 @@ unpackPhase() {
     # necessary when sources have been copied from other store
     # locations.
     if test "dontMakeSourcesWritable" != 1; then
-        chmod -R +w $sourceRoot
+        chmod -R u+w $sourceRoot
     fi
 
     eval "$postUnpack"
@@ -554,19 +543,10 @@ unpackPhase() {
 
 
 patchPhase() {
-    if test -n "$patchPhase"; then
-        eval "$patchPhase"
-        return
-    fi
-
     eval "$prePatch"
     
     if test -z "$patchPhase" -a -z "$patches"; then return; fi
     
-    if test -z "$patchFlags"; then
-        patchFlags="-p1"
-    fi
-
     for i in $patches; do
         header "applying patch $i" 3
         local uncompress=cat
@@ -578,7 +558,7 @@ patchPhase() {
                 uncompress="bzip2 -d"
                 ;;
         esac
-        $uncompress < $i | patch $patchFlags
+        $uncompress < $i | patch ${patchFlags:--p1}
         stopNest
     done
 
@@ -592,11 +572,6 @@ fixLibtool() {
 
 
 configurePhase() {
-    if test -n "$configurePhase"; then
-        eval "$configurePhase"
-        return
-    fi
-
     eval "$preConfigure"
 
     if test -z "$configureScript"; then
@@ -633,11 +608,6 @@ configurePhase() {
 
 
 buildPhase() {
-    if test -n "$buildPhase"; then
-        eval "$buildPhase"
-        return
-    fi
-
     eval "$preBuild"
 
     if test -z "$makeFlags" && ! test -n "$makefile" -o -e "Makefile" -o -e "makefile" -o -e "GNUmakefile"; then
@@ -655,21 +625,12 @@ buildPhase() {
 
 
 checkPhase() {
-    if test -n "$checkPhase"; then
-        eval "$checkPhase"
-        return
-    fi
-
     eval "$preCheck"
 
-    if test -z "$checkTarget"; then
-        checkTarget="check"
-    fi
-
     echo "check flags: $makeFlags ${makeFlagsArray[@]} $checkFlags ${checkFlagsArray[@]}"
     make ${makefile:+-f $makefile} \
         $makeFlags "${makeFlagsArray[@]}" \
-        $checkFlags "${checkFlagsArray[@]}" $checkTarget
+        $checkFlags "${checkFlagsArray[@]}" ${checkTarget:-check}
 
     eval "$postCheck"
 }
@@ -711,26 +672,15 @@ patchShebangs() {
 
 
 installPhase() {
-    if test -n "$installPhase"; then
-        eval "$installPhase"
-        return
-    fi
-
     eval "$preInstall"
 
     ensureDir "$prefix"
 
-    if test -z "$installCommand"; then
-        if test -z "$installTargets"; then
-            installTargets=install
-        fi
-        echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}"
-        make ${makefile:+-f $makefile} $installTargets \
-            $makeFlags "${makeFlagsArray[@]}" \
-            $installFlags "${installFlagsArray[@]}"
-    else
-        eval "$installCommand"
-    fi
+    installTargets=${installTargets:-install}
+    echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}"
+    make ${makefile:+-f $makefile} $installTargets \
+        $makeFlags "${makeFlagsArray[@]}" \
+        $installFlags "${installFlagsArray[@]}"
 
     eval "$postInstall"
 }
@@ -740,11 +690,6 @@ installPhase() {
 # stuff, like running patchelf and setting the
 # propagated-build-inputs.  It should rarely be overriden.
 fixupPhase() {
-    if test -n "$fixupPhase"; then
-        eval "$fixupPhase"
-        return
-    fi
-
     eval "$preFixup"
 
     # Put man/doc/info under $out/share.
@@ -802,30 +747,17 @@ fixupPhase() {
 
 
 distPhase() {
-    if test -n "$distPhase"; then
-        eval "$distPhase"
-        return
-    fi
-
     eval "$preDist"
 
-    if test -z "$distTarget"; then
-        distTarget="dist"
-    fi
-
     echo "dist flags: $distFlags ${distFlagsArray[@]}"
-    make ${makefile:+-f $makefile} $distFlags "${distFlagsArray[@]}" $distTarget
+    make ${makefile:+-f $makefile} $distFlags "${distFlagsArray[@]}" ${distTarget:-dist}
 
     if test "$dontCopyDist" != 1; then
         ensureDir "$out/tarballs"
 
-        if test -z "$tarballs"; then
-            tarballs="*.tar.gz"
-        fi
-
         # Note: don't quote $tarballs, since we explicitly permit
         # wildcards in there.
-        cp -pvd $tarballs $out/tarballs
+        cp -pvd ${tarballs:-*.tar.gz} $out/tarballs
     fi
 
     eval "$postDist"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b93855cabd0..9986c311b10 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -130,8 +130,6 @@ let
   #   };
   overrideSetup = stdenv: setup: stdenv.regenerate setup;
 
-  stdenvNew = overrideSetup stdenv ../stdenv/generic/setup-new.sh;
-
   # Return a modified stdenv that uses dietlibc to create small
   # statically linked binaries.
   useDietLibC = stdenv: stdenv //
@@ -571,8 +569,7 @@ let
   };
 
   convertlit = import ../tools/text/convertlit {
-    inherit fetchurl unzip libtommath;
-    stdenv = stdenvNew;
+    inherit fetchurl stdenv unzip libtommath;
   };
 
   unifdef = import ../development/tools/misc/unifdef {
@@ -593,8 +590,7 @@ let
   };
 
   cron = import ../tools/system/cron {
-    inherit fetchurl;
-    stdenv = stdenvNew;
+    inherit fetchurl stdenv;
   };
 
   curl = import ../tools/networking/curl {
@@ -1428,7 +1424,7 @@ let
     inherit stdenv;
   };
 
-  gfortran = import ../build-support/gcc-wrapper-new {
+  gfortran = import ../build-support/gcc-wrapper {
     name = "gfortran";
     nativeTools = false;
     nativeLibc = false;
@@ -1479,12 +1475,12 @@ let
     profiledCompiler = true;
   }));
 
-  gcc43 = lowPrio (wrapGCCWith (import ../build-support/gcc-wrapper-new) glibc (import ../development/compilers/gcc-4.3 {
+  gcc43 = wrapGCC (import ../development/compilers/gcc-4.3 {
     inherit fetchurl stdenv texinfo gmp mpfr noSysDirs;
     profiledCompiler = false;
   }));
 
-  gcc43multi = lowPrio (wrapGCCWith (import ../build-support/gcc-wrapper-new) glibc_multi (import ../development/compilers/gcc-4.3 {
+  gcc43multi = lowPrio (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (import ../development/compilers/gcc-4.3 {
     stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc42);
     inherit fetchurl texinfo gmp mpfr noSysDirs;
     profiledCompiler = false;

From d09042b7d977a025fdf74c1bfb5a1391c5b64457 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Oct 2008 17:33:40 +0000
Subject: [PATCH 06/60] * GCC 4.3.2.

svn path=/nixpkgs/branches/stdenv-updates/; revision=12992
---
 pkgs/development/compilers/gcc-4.3/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/gcc-4.3/default.nix b/pkgs/development/compilers/gcc-4.3/default.nix
index 09d7ff7a807..fe1d98ce51d 100644
--- a/pkgs/development/compilers/gcc-4.3/default.nix
+++ b/pkgs/development/compilers/gcc-4.3/default.nix
@@ -13,7 +13,7 @@ assert langTreelang -> bison != null && flex != null;
 
 with import ../../../lib;
 
-let version = "4.3.1"; in
+let version = "4.3.2"; in
 
 stdenv.mkDerivation {
   name = "gcc-${version}";
@@ -22,15 +22,15 @@ stdenv.mkDerivation {
   src =
     optional /*langC*/ true (fetchurl {
       url = "mirror://gnu/gcc/gcc-${version}/gcc-core-${version}.tar.bz2";
-      sha256 = "18spk152j1vqa9bzhi93i7cgrmf7gncv0h1lm1mxxgn1ahrnnw67";
+      sha256 = "0np7cbqdaajarwwlkvq7d2ifkld1lsh0cfsaqcx9dsvqklkyg1q6";
     }) ++
     optional langCC (fetchurl {
       url = "mirror://gnu/gcc/gcc-${version}/gcc-g++-${version}.tar.bz2";
-      sha256 = "0r74s60hylr8xrnb2j3x0dmf3cnxxg609g4h07r6ida8vk33bd25";
+      sha256 = "105vhmq111l5zyzxdanhhv5lgvl4pr6pq9xj6jb5g5x3bk4jnki5";
     }) ++
     optional langFortran (fetchurl {
       url = "mirror://gnu/gcc/gcc-${version}/gcc-fortran-${version}.tar.bz2";
-      sha256 = "1fl76sajlz1ihnsmqsbs3i8g0h77w9hm35pwb1s2w6p4h5xy5dnb";
+      sha256 = "1kk3d2n68va5wxpi77cadn4s5b7s39qg1dqyrfppq1nrqwb77acl";
     });
     
   patches =

From 51aa939b218f1991023bc7944b813bba9c159a0d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Oct 2008 17:34:00 +0000
Subject: [PATCH 07/60] * GNU M4 1.4.11.

svn path=/nixpkgs/branches/stdenv-updates/; revision=12993
---
 pkgs/development/tools/misc/gnum4/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index fa3d93ac85d..af682ed9f13 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -1,8 +1,15 @@
 {stdenv, fetchurl}:
+
 stdenv.mkDerivation {
-  name = "gnum4-1.4.9";
+  name = "gnum4-1.4.11";
+  
   src = fetchurl {
-    url = mirror://gnu/m4/m4-1.4.9.tar.bz2;
-    sha256 = "0a9xgknp29zdhpp7xn3bfcxdc0wn2rzvjfdksz5ym82b6y397qm8";
+    url = mirror://gnu/m4/m4-1.4.11.tar.bz2;
+    sha256 = "1bcakymxddxykg5vbll3d9xq17m5sa3r6cprf1k27x5k4mjnhz0b";
+  };
+
+  meta = {
+    homepage = http://www.gnu.org/software/m4/;
+    description = "An implementation of the traditional Unix macro processor";
   };
 }

From 5af8b8cd26544eac8bb201ef8d52be9966ceb4cb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Oct 2008 17:34:35 +0000
Subject: [PATCH 08/60] svn path=/nixpkgs/branches/stdenv-updates/;
 revision=12994

---
 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 9986c311b10..b39ec884d46 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1478,7 +1478,7 @@ let
   gcc43 = wrapGCC (import ../development/compilers/gcc-4.3 {
     inherit fetchurl stdenv texinfo gmp mpfr noSysDirs;
     profiledCompiler = false;
-  }));
+  });
 
   gcc43multi = lowPrio (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (import ../development/compilers/gcc-4.3 {
     stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc42);

From 0d623346931a30b05bce89dfc6037e8619ce1b71 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 8 Oct 2008 08:47:20 +0000
Subject: [PATCH 09/60] * 1.4.11.nix -> default.nix.

svn path=/nixpkgs/branches/stdenv-updates/; revision=12997
---
 pkgs/development/tools/misc/gnum4/1.4.11.nix  | 42 -------------------
 pkgs/development/tools/misc/gnum4/default.nix | 37 +++++++++++++---
 pkgs/top-level/all-packages.nix               |  4 --
 3 files changed, 32 insertions(+), 51 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/gnum4/1.4.11.nix

diff --git a/pkgs/development/tools/misc/gnum4/1.4.11.nix b/pkgs/development/tools/misc/gnum4/1.4.11.nix
deleted file mode 100644
index bafa7f11a44..00000000000
--- a/pkgs/development/tools/misc/gnum4/1.4.11.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "m4-1.4.11";
-  src = fetchurl {
-    url = "mirror://gnu/m4/${name}.tar.bz2";
-    sha256 = "1bcakymxddxykg5vbll3d9xq17m5sa3r6cprf1k27x5k4mjnhz0b";
-  };
-
-  patches = [ ./SIGPIPE.patch ];
-
-  # XXX: Work around Gnulib bug.  See:
-  # http://thread.gmane.org/gmane.comp.gnu.m4.bugs/2478 .
-  configureFlags="gl_cv_func_strtod_works=no";
-
-  doCheck = true;
-
-  meta = {
-    homepage = http://www.gnu.org/software/m4/;
-    description = "GNU M4, a macro processor";
-
-    longDescription = ''
-      GNU M4 is an implementation of the traditional Unix macro
-      processor.  It is mostly SVR4 compatible although it has some
-      extensions (for example, handling more than 9 positional
-      parameters to macros).  GNU M4 also has built-in functions for
-      including files, running shell commands, doing arithmetic, etc.
-
-      GNU M4 is a macro processor in the sense that it copies its
-      input to the output expanding macros as it goes.  Macros are
-      either builtin or user-defined and can take any number of
-      arguments.  Besides just doing macro expansion, m4 has builtin
-      functions for including named files, running UNIX commands,
-      doing integer arithmetic, manipulating text in various ways,
-      recursion etc...  m4 can be used either as a front-end to a
-      compiler or as a macro processor in its own right.
-    '';
-
-    license = "GPLv3+";
-  };
-
-}
diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index af682ed9f13..4f1c2f8c362 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -1,15 +1,42 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "gnum4-1.4.11";
-  
+stdenv.mkDerivation rec {
+  name = "m4-1.4.11";
   src = fetchurl {
-    url = mirror://gnu/m4/m4-1.4.11.tar.bz2;
+    url = "mirror://gnu/m4/${name}.tar.bz2";
     sha256 = "1bcakymxddxykg5vbll3d9xq17m5sa3r6cprf1k27x5k4mjnhz0b";
   };
 
+  patches = [ ./SIGPIPE.patch ];
+
+  # XXX: Work around Gnulib bug.  See:
+  # http://thread.gmane.org/gmane.comp.gnu.m4.bugs/2478 .
+  configureFlags = "gl_cv_func_strtod_works=no";
+
+  doCheck = true;
+
   meta = {
     homepage = http://www.gnu.org/software/m4/;
-    description = "An implementation of the traditional Unix macro processor";
+    description = "GNU M4, a macro processor";
+
+    longDescription = ''
+      GNU M4 is an implementation of the traditional Unix macro
+      processor.  It is mostly SVR4 compatible although it has some
+      extensions (for example, handling more than 9 positional
+      parameters to macros).  GNU M4 also has built-in functions for
+      including files, running shell commands, doing arithmetic, etc.
+
+      GNU M4 is a macro processor in the sense that it copies its
+      input to the output expanding macros as it goes.  Macros are
+      either builtin or user-defined and can take any number of
+      arguments.  Besides just doing macro expansion, m4 has builtin
+      functions for including named files, running UNIX commands,
+      doing integer arithmetic, manipulating text in various ways,
+      recursion etc...  m4 can be used either as a front-end to a
+      compiler or as a macro processor in its own right.
+    '';
+
+    license = "GPLv3+";
   };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b39ec884d46..6d6dca60f48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2259,10 +2259,6 @@ let
     inherit fetchurl stdenv;
   };
 
-  gnum4_1411 = import ../development/tools/misc/gnum4/1.4.11.nix {
-    inherit fetchurl stdenv;
-  };
-
   gnumake = import ../development/tools/build-managers/gnumake {
     inherit fetchurl stdenv;
     log2xmlSupport = getConfig [ "gnuMake" "log2xmlSupport" ] true;

From b908adc778392251288307eb3c58deccec8f795e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 8 Oct 2008 16:55:55 +0000
Subject: [PATCH 10/60] * libpng 1.2.32.

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

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index ea194272fff..34e0dbfc5b3 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -3,11 +3,11 @@
 assert zlib != null;
 
 stdenv.mkDerivation {
-  name = "libpng-1.2.29";
+  name = "libpng-1.2.32";
   
   src = fetchurl {
-    url = mirror://sourceforge/libpng/libpng-1.2.29.tar.bz2;
-    md5 = "f588cb4ee39e3a333604096f937ea157";
+    url = mirror://sourceforge/libpng/libpng-1.2.32.tar.bz2;
+    md5 = "df4a20c6f24a6f642ae11c9a5a4ffa7f";
   };
   
   propagatedBuildInputs = [zlib];

From 643a16f6e2ed184c9716d409e5942a264ce079b4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 8 Oct 2008 16:56:23 +0000
Subject: [PATCH 11/60] * FreeType 2.3.7.

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

diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 9cdfe730c46..597ed1c5c6d 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -1,15 +1,15 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "freetype-2.3.6";
+  name = "freetype-2.3.7";
   
   src = fetchurl {
-    url = mirror://sourceforge/freetype/freetype-2.3.6.tar.bz2;
-    sha256 = "0xqf24d42qj5x8h6cmwpdqg455kpcbaxc3jlwqf4rlbn0g1ri9nm";
+    url = mirror://sourceforge/freetype/freetype-2.3.7.tar.bz2;
+    sha256 = "12787v5q083zwrpfh0sk87g4ac0yzzmjmw41k5k27hwznsg8gksf";
   };
 
   meta = {
-    description = "A font engine";
+    description = "A font rendering engine";
     homepage = http://www.freetype.org/;
   };
 }

From ee07abad6064ea777e1436aa36dfafb4b6822632 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 8 Oct 2008 16:56:52 +0000
Subject: [PATCH 12/60] * Mesa 7.2.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13004
---
 pkgs/development/libraries/mesa/default.nix | 33 ++++-----------------
 pkgs/tools/graphics/glxinfo/default.nix     |  6 ++--
 2 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 9b78d546371..c44ff082720 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm}:
+{stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat}:
 
 let
 
@@ -7,40 +7,19 @@ let
     if stdenv.system == "x86_64-linux" then "linux-dri-x86-64" else
     abort "unsupported platform for Mesa"; # !!! change to throw, remove all the mesa asserts in all-packages.nix
 
-  # Missing file in 7.0.2. Can be removed for >= 7.0.3.
-  missingPC = fetchurl {
-    url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/mesa/files/7.0.2-glw.pc.in?rev=1.1";
-    sha256 = "1z4d50pllwi8g6n567dk3zxq4qmam79n72wr55mdqx0jrdj4fj0v";
-  };
-    
 in
 
 stdenv.mkDerivation {
-  name = "mesa-7.0.2";
+  name = "mesa-7.2";
   
   src = fetchurl {
-    url = mirror://sourceforge/mesa3d/MesaLib-7.0.2.tar.bz2;
-    md5 = "93e6ed7924ff069a4f883b4fce5349dc";
+    url = mirror://sourceforge/mesa3d/MesaLib-7.2.tar.bz2;
+    md5 = "04d379292e023df0b0266825cb0dbde5";
   };
-/*    (fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/MesaGLUT-6.4.tar.bz2;
-      md5 = "1a8c4d4fc699233f5fdb902b8753099e";
-    })
-    (fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/MesaDemos-6.4.tar.bz2;
-      md5 = "1a8c4d4fc699233f5fdb902b8753099e";
-    }) */
-  
-  buildFlags = "${target}";
-  
-  preBuild = "
-    makeFlagsArray=(INSTALL_DIR=$out DRI_DRIVER_INSTALL_DIR=$out/lib/modules/dri SHELL=$SHELL)
-    cp ${missingPC} src/glw/glw.pc.in
-  ";
   
   buildInputs = [
-    pkgconfig x11 xlibs.makedepend libdrm xlibs.glproto xlibs.libXmu
-    xlibs.libXi xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage
+    pkgconfig expat x11 libdrm xlibs.glproto
+    xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage
   ];
   
   passthru = {inherit libdrm;};
diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix
index 0e2fa198a86..a0e05f878e2 100644
--- a/pkgs/tools/graphics/glxinfo/default.nix
+++ b/pkgs/tools/graphics/glxinfo/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, x11, mesa}:
 
 stdenv.mkDerivation {
-  name = "glxinfo-6.5.2";
+  name = "glxinfo-7.2";
   
   src = fetchurl {
-    url = mirror://sourceforge/mesa3d/MesaDemos-6.5.2.tar.bz2;
-    sha256 = "1shfwy0sy3kdk3nykp1gv6s0lafqgqnadwarw5cbpw7mkfap8kw0";
+    url = mirror://sourceforge/mesa3d/MesaDemos-7.2.tar.bz2;
+    md5 = "22e03dc4038cd63f32c21eb60994892b";
   };
 
   buildInputs = [x11 mesa];

From 0f0a43adf53ae310d52ffdf104b781c1b50eab3c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 8 Oct 2008 16:57:06 +0000
Subject: [PATCH 13/60] * Cairo 1.8.0.

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

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 7f9701fe3dc..57a2e0b386f 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -9,11 +9,11 @@ assert postscriptSupport -> zlib != null;
 assert pngSupport -> libpng != null;
 
 stdenv.mkDerivation {
-  name = "cairo-1.6.4";
+  name = "cairo-1.8.0";
   
   src = fetchurl {
-    url = http://cairographics.org/releases/cairo-1.6.4.tar.gz;
-    sha1 = "9d990fe39a125ceb07221623c237cd7015855d5c";
+    url = http://cairographics.org/releases/cairo-1.8.0.tar.gz;
+    sha1 = "8a689ca47c24216f37bb8cabae21ff08a7f47899";
   };
 
   buildInputs = [

From 9fa8276ae5d456b2a4153c39f5f1d8abcc1081bb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 8 Oct 2008 17:02:48 +0000
Subject: [PATCH 14/60] * X.org 7.4.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13006
---
 pkgs/development/libraries/libdrm/default.nix |   12 +-
 pkgs/servers/x11/xorg/default.nix             | 1928 +++++------------
 pkgs/servers/x11/xorg/extra.list              |    5 +
 .../x11/xorg/generate-expr-from-tarballs.pl   |   23 +-
 pkgs/servers/x11/xorg/old.list                |    4 +
 pkgs/servers/x11/xorg/tarballs                |  296 ---
 pkgs/servers/x11/xorg/tarballs-7.4.list       |  208 ++
 .../x11/xorg/xorgserver-dri-path.patch        |    7 +-
 .../x11/xorg/xorgserver-xkb-leds.patch        |   20 -
 pkgs/top-level/all-packages.nix               |    6 +-
 10 files changed, 800 insertions(+), 1709 deletions(-)
 create mode 100644 pkgs/servers/x11/xorg/extra.list
 create mode 100644 pkgs/servers/x11/xorg/old.list
 delete mode 100644 pkgs/servers/x11/xorg/tarballs
 create mode 100644 pkgs/servers/x11/xorg/tarballs-7.4.list
 delete mode 100644 pkgs/servers/x11/xorg/xorgserver-xkb-leds.patch

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 2622a9b3128..6f843549ce6 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,9 +1,15 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "libdrm-2.3.0";
+  name = "libdrm-2.3.1";
+  
   src = fetchurl {
-    url = http://dri.freedesktop.org/libdrm/libdrm-2.3.0.tar.bz2;
-    sha256 = "13l4ysid1raasmq18x1kjp5xmwqg6pv9431n25c88l7agx113izq";
+    url = http://dri.freedesktop.org/libdrm/libdrm-2.3.1.tar.bz2;
+    sha256 = "133iz3fma30diwn66ni59wp6gg5kmklqj5hzds20g5vjhf1kkzfx";
+  };
+
+  meta = {
+    homepage = http://dri.freedesktop.org/libdrm/;
+    description = "Library for accessing the kernel's Direct Rendering Manager";
   };
 }
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 85309902c43..8fc7110fccd 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -7,7 +7,7 @@ rec {
     name = "applewmproto-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/applewmproto-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/applewmproto-1.0.3.tar.bz2;
       sha256 = "0l2d3wmgprs5gl479ba2yw9vj1q3m8rhri82k0vryd9ildzc0f59";
     };
     buildInputs = [pkgconfig ];
@@ -17,7 +17,7 @@ rec {
     name = "appres-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/appres-1.0.1.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/appres-1.0.1.tar.bz2;
       sha256 = "0qmr5sdbj4alzf3p8lxb8348y7zdmsjdp20c8biwx39b40xgizhm";
     };
     buildInputs = [pkgconfig libX11 libXt ];
@@ -27,38 +27,28 @@ rec {
     name = "bdftopcf-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/bdftopcf-1.0.1.tar.bz2;
+      url = mirror://xorg/individual/app/bdftopcf-1.0.1.tar.bz2;
       sha256 = "1lq5x0kvgwlzdgfhi8sbbchzd1y1nmzdqgq9laysx08p6smlbama";
     };
     buildInputs = [pkgconfig libXfont ];
   }) // {inherit libXfont ;};
     
-  beforelight = (stdenv.mkDerivation {
-    name = "beforelight-1.0.2";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/beforelight-1.0.2.tar.bz2;
-      sha256 = "19s7n2rpq44mrqd3gd6nh4wql4dg41w02j6r9zh9yxwkkiaigqh0";
-    };
-    buildInputs = [pkgconfig libX11 libXaw libXScrnSaver libXt ];
-  }) // {inherit libX11 libXaw libXScrnSaver libXt ;};
-    
   bigreqsproto = (stdenv.mkDerivation {
     name = "bigreqsproto-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/bigreqsproto-1.0.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/bigreqsproto-1.0.2.tar.bz2;
       sha256 = "1vmda2412s5yvawx2xplrbzcghnmqin54r1l352ycy25lac01nih";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
     
   bitmap = (stdenv.mkDerivation {
-    name = "bitmap-1.0.2";
+    name = "bitmap-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/bitmap-1.0.2.tar.bz2;
-      sha256 = "1g0l9ip2yabz056aq58ijnf2xfnga9d15pmd7hpg82a3mhkrjwc3";
+      url = mirror://xorg/X11R7.4/src/everything/bitmap-1.0.3.tar.bz2;
+      sha256 = "0hawhldsa0647a5x2hy5frf6k2wcpwq1n8pf6npgj6dg30snfgw6";
     };
     buildInputs = [pkgconfig libXaw libX11 xbitmaps libXmu libXt ];
   }) // {inherit libXaw libX11 xbitmaps libXmu libXt ;};
@@ -67,7 +57,7 @@ rec {
     name = "compositeproto-0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/compositeproto-0.4.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/compositeproto-0.4.tar.bz2;
       sha256 = "00q0wc8skfjy7c9dzngvmi99i29bh68715wrdw7m9dxjcg5d24v0";
     };
     buildInputs = [pkgconfig ];
@@ -77,7 +67,7 @@ rec {
     name = "damageproto-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/damageproto-1.1.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/damageproto-1.1.0.tar.bz2;
       sha256 = "07b41ninycfm5sgzpjsa168dnm1g55c2mzzgigvwvs9mr3x889lx";
     };
     buildInputs = [pkgconfig ];
@@ -87,27 +77,17 @@ rec {
     name = "dmxproto-2.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/dmxproto-2.2.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/dmxproto-2.2.2.tar.bz2;
       sha256 = "1qpw6lp4925zwmkp48b6wsy84d21872i6x2dr8rzfn7csp4xk9ma";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
     
-  editres = (stdenv.mkDerivation {
-    name = "editres-1.0.2";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/editres-1.0.2.tar.bz2;
-      sha256 = "1pv7q44kzipjn735lhrbiyg3kmx3jhsfkjb3yfjshggg9q9vr3wp";
-    };
-    buildInputs = [pkgconfig libXaw libX11 libXmu libXt ];
-  }) // {inherit libXaw libX11 libXmu libXt ;};
-    
   encodings = (stdenv.mkDerivation {
     name = "encodings-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/encodings-1.0.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/encodings-1.0.2.tar.bz2;
       sha256 = "1b2fdxfvqb0gbg4pz8anp9rwnbg2xj3d4b8cbc46rjdvcrxi06bd";
     };
     buildInputs = [pkgconfig mkfontscale ];
@@ -117,7 +97,7 @@ rec {
     name = "evieext-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/evieext-1.0.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/evieext-1.0.2.tar.bz2;
       sha256 = "09fijha8ac0iw7lbc75912jwhm5k19ypm73zj8akf23hjwx1318b";
     };
     buildInputs = [pkgconfig ];
@@ -127,7 +107,7 @@ rec {
     name = "fixesproto-4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/fixesproto-4.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/fixesproto-4.0.tar.bz2;
       sha256 = "13xhrva17vcg1zdz6kba5g5jzkf43z1ifwfsg1ndnll1rhf9gzmk";
     };
     buildInputs = [pkgconfig ];
@@ -137,7 +117,7 @@ rec {
     name = "font-adobe-100dpi-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-adobe-100dpi-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-adobe-100dpi-1.0.0.tar.bz2;
       sha256 = "06cs5q4hy255i5b64q0cgcapv46kgc315b7jmwjs5j952qx1nv7i";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ];
@@ -147,7 +127,7 @@ rec {
     name = "font-adobe-75dpi-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-adobe-75dpi-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-adobe-75dpi-1.0.0.tar.bz2;
       sha256 = "0fb32yyqf4mf93bn9a0qbzm9zbl3sxkhc0ipy9az7r7mw2z4a9yn";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ];
@@ -157,7 +137,7 @@ rec {
     name = "font-adobe-utopia-100dpi-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-adobe-utopia-100dpi-1.0.1.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-adobe-utopia-100dpi-1.0.1.tar.bz2;
       sha256 = "1zmmm430rwgv0cr80ybl6bk9qzr697lwh253qwxv2sf1f2mf2hqr";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ];
@@ -167,7 +147,7 @@ rec {
     name = "font-adobe-utopia-75dpi-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-adobe-utopia-75dpi-1.0.1.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-adobe-utopia-75dpi-1.0.1.tar.bz2;
       sha256 = "12bhr82dsd9iz50kszppghf22fpyjcadrxd0plxpwwmw9ccy5m7b";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ];
@@ -177,7 +157,7 @@ rec {
     name = "font-adobe-utopia-type1-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-adobe-utopia-type1-1.0.1.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-adobe-utopia-type1-1.0.1.tar.bz2;
       sha256 = "1p604j44vqfp7iv4a7p38vi6d1qk26grmnkdsz1dapr7zz475ip9";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; 
@@ -187,7 +167,7 @@ rec {
     name = "font-alias-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-alias-1.0.1.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-alias-1.0.1.tar.bz2;
       sha256 = "1dl99xmdbgwssd4zgnipc4b4l5g9s2qc08wx29bdif946bb61nvp";
     };
     buildInputs = [pkgconfig ];
@@ -197,7 +177,7 @@ rec {
     name = "font-arabic-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-arabic-misc-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-arabic-misc-1.0.0.tar.bz2;
       sha256 = "155wyy6vsxha3lx9cvw22pscsdc3iljsgyh6zqpyl19qyfixzsch";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ];
@@ -207,7 +187,7 @@ rec {
     name = "font-bh-100dpi-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bh-100dpi-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-bh-100dpi-1.0.0.tar.bz2;
       sha256 = "0jpfrxwdx24ib784j6k6qbi6zvy6svyva6gda8pj98krfmvi32mf";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ];
@@ -217,7 +197,7 @@ rec {
     name = "font-bh-75dpi-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bh-75dpi-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-bh-75dpi-1.0.0.tar.bz2;
       sha256 = "1gq55j00g7fqnypxy6f0wvhz5l16056sdysmbp3qk4yc82s6g567";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ];
@@ -227,7 +207,7 @@ rec {
     name = "font-bh-lucidatypewriter-100dpi-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2;
       sha256 = "04vh9mccnh517q42w65k89pz3jd6szim3hazydm7n0wilp5pvm1n";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ];
@@ -237,7 +217,7 @@ rec {
     name = "font-bh-lucidatypewriter-75dpi-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2;
       sha256 = "0im03ms6bx1947fkdarrdzzm8lq69pz5502n89cccj9sadpz7wjh";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ];
@@ -247,7 +227,7 @@ rec {
     name = "font-bh-ttf-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bh-ttf-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-bh-ttf-1.0.0.tar.bz2;
       sha256 = "0i6nsw1i43ydljws2xzadvbmxs1p50jn9akhinwrh8z4yxr5w6ks";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; 
@@ -257,7 +237,7 @@ rec {
     name = "font-bh-type1-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bh-type1-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-bh-type1-1.0.0.tar.bz2;
       sha256 = "0nv4qdr8z68iczqic4gj492ln6y1xy04kxx08dhdaaf8y89mb2js";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; 
@@ -267,7 +247,7 @@ rec {
     name = "font-bitstream-100dpi-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bitstream-100dpi-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-bitstream-100dpi-1.0.0.tar.bz2;
       sha256 = "1lp260dwrrr4ll9rbdq38cnvlxq843q34rxay6hl2bmmsxs5lw0c";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ];
@@ -277,7 +257,7 @@ rec {
     name = "font-bitstream-75dpi-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bitstream-75dpi-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-bitstream-75dpi-1.0.0.tar.bz2;
       sha256 = "1yqv42gf4ksr5fr0b2szwfc8cczis0pppcsg1wdlwllprb6fmprd";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ];
@@ -287,7 +267,7 @@ rec {
     name = "font-bitstream-speedo-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bitstream-speedo-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-bitstream-speedo-1.0.0.tar.bz2;
       sha256 = "1rpn2j99cg5dnw3mjzff65darwaz5jwjgi7i0xscq064d9w03b4r";
     };
     buildInputs = [pkgconfig mkfontdir ];
@@ -297,7 +277,7 @@ rec {
     name = "font-bitstream-type1-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bitstream-type1-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-bitstream-type1-1.0.0.tar.bz2;
       sha256 = "00yrahjc884mghhbm713c41x7r2kbg1ply515qs3g20nrwnlkkjg";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; 
@@ -307,7 +287,7 @@ rec {
     name = "fontcacheproto-0.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/fontcacheproto-0.1.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/fontcacheproto-0.1.2.tar.bz2;
       sha256 = "1yfrldprqbxv587zd9lvsn2ayfdabzkgzya5cqvjf290kga3w1j8";
     };
     buildInputs = [pkgconfig ];
@@ -317,7 +297,7 @@ rec {
     name = "font-cronyx-cyrillic-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-cronyx-cyrillic-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-cronyx-cyrillic-1.0.0.tar.bz2;
       sha256 = "1vl4yk3sdvcqpym4d4r3lxrpyghxgjpq8yx2kdxygjpm6dq4xj86";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ];
@@ -327,7 +307,7 @@ rec {
     name = "font-cursor-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-cursor-misc-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-cursor-misc-1.0.0.tar.bz2;
       sha256 = "1igklmxc0bgbp5a2nbmbwii5d9mh71zsxay2sw0sa6sq2xqy4pcm";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ];
@@ -337,7 +317,7 @@ rec {
     name = "font-daewoo-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-daewoo-misc-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-daewoo-misc-1.0.0.tar.bz2;
       sha256 = "09l98sd8wwdhgjdafq8cr6ykki4imh5qi21jwaqkhfil5v4ym67i";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ];
@@ -347,7 +327,7 @@ rec {
     name = "font-dec-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-dec-misc-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-dec-misc-1.0.0.tar.bz2;
       sha256 = "1fcbnv0zlbzsn68z5as0k3id83ii9k67l6bxiv2ypcfs4l96sf43";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ];
@@ -357,7 +337,7 @@ rec {
     name = "font-ibm-type1-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-ibm-type1-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-ibm-type1-1.0.0.tar.bz2;
       sha256 = "07j6kk7wd0lbnjxn9a4kjahjniiwjyzc8lp1lvw46sahwg193l1h";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; 
@@ -367,7 +347,7 @@ rec {
     name = "font-isas-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-isas-misc-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-isas-misc-1.0.0.tar.bz2;
       sha256 = "18jfp92s6wmjs107rhdcz4acmzb2anhcb7s8bpd2kwhbrq9i7rlp";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ];
@@ -377,7 +357,7 @@ rec {
     name = "font-jis-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-jis-misc-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-jis-misc-1.0.0.tar.bz2;
       sha256 = "1fn75mqx6xjqffbd01a1wplc8cf7spwsrxv5h2accizw9zyyw89p";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ];
@@ -387,7 +367,7 @@ rec {
     name = "font-micro-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-micro-misc-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-micro-misc-1.0.0.tar.bz2;
       sha256 = "0wm52zgbly62vsbr5c4wz9rh1vk4y1viyv09r20r6bp175cppc8n";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ];
@@ -397,7 +377,7 @@ rec {
     name = "font-misc-cyrillic-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-misc-cyrillic-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-misc-cyrillic-1.0.0.tar.bz2;
       sha256 = "1zwh69k7id17jabwia6x43f520lbf8787nf71vs3p78j089sq2vw";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ];
@@ -407,7 +387,7 @@ rec {
     name = "font-misc-ethiopic-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-misc-ethiopic-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-misc-ethiopic-1.0.0.tar.bz2;
       sha256 = "0hficywkkzl4dpws9sg47d3m1igpb7m4myw8zabkf1na0648dljq";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; 
@@ -417,7 +397,7 @@ rec {
     name = "font-misc-meltho-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-misc-meltho-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-misc-meltho-1.0.0.tar.bz2;
       sha256 = "091ripcw30cs6032p12gwcy2hg8b1y24irgacwsky1dn4scjpqf7";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; 
@@ -427,7 +407,7 @@ rec {
     name = "font-misc-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-misc-misc-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-misc-misc-1.0.0.tar.bz2;
       sha256 = "1nqp7zhwmrh6ng8j4i4pscqj2xhh57sdmrkbqgklh5hzmmh2b816";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; postInstall = "ln -s ${fontalias}/lib/X11/fonts/misc/fonts.alias $out/lib/X11/fonts/misc/fonts.alias"; 
@@ -437,7 +417,7 @@ rec {
     name = "font-mutt-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-mutt-misc-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-mutt-misc-1.0.0.tar.bz2;
       sha256 = "1zzd3ba1i2ffqh8yyvyqyhcyxa7j474lb8x88b5cxf7js0xih6gj";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ];
@@ -447,7 +427,7 @@ rec {
     name = "font-schumacher-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-schumacher-misc-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-schumacher-misc-1.0.0.tar.bz2;
       sha256 = "0ypgas5hjwaad53hfpx2w5s1scybh953vb94rrlmaix4hpw6qkj5";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ];
@@ -457,7 +437,7 @@ rec {
     name = "font-screen-cyrillic-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-screen-cyrillic-1.0.1.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-screen-cyrillic-1.0.1.tar.bz2;
       sha256 = "07y52rm2m17ig6piynk9jgyhdv8a4s7jmn5ssa83a61a607mymyr";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ];
@@ -467,7 +447,7 @@ rec {
     name = "font-sony-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-sony-misc-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-sony-misc-1.0.0.tar.bz2;
       sha256 = "08rf8m9mqg9h0w67b5k55hs73v2s9lxz7aab0nq7rd90c3kkms8s";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ];
@@ -477,7 +457,7 @@ rec {
     name = "fontsproto-2.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/fontsproto-2.0.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/fontsproto-2.0.2.tar.bz2;
       sha256 = "0ywb783l7gwypq5nchfmysra0n6dqv9hc3vsf4ra44da65qm9gc3";
     };
     buildInputs = [pkgconfig ];
@@ -487,27 +467,17 @@ rec {
     name = "font-sun-misc-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-sun-misc-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-sun-misc-1.0.0.tar.bz2;
       sha256 = "1r99ayxfc1qqcg6zwfkkvbga3qwyf3h3xsh1ymw02zwf9n7jvh83";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ];
   }) // {inherit bdftopcf mkfontdir mkfontscale ;};
     
-  fonttosfnt = (stdenv.mkDerivation {
-    name = "fonttosfnt-1.0.3";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/fonttosfnt-1.0.3.tar.bz2;
-      sha256 = "0hsjzpj3hcmcm3qqlk7sz6c5x5zrdb002f2ndjmrg829x94h2awx";
-    };
-    buildInputs = [pkgconfig libfontenc freetype xproto ];
-  }) // {inherit libfontenc freetype xproto ;};
-    
   fontutil = (stdenv.mkDerivation {
     name = "font-util-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-util-1.0.1.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-util-1.0.1.tar.bz2;
       sha256 = "04h6c24q08d8ljajxzlfwyr1fxfhb88b3w21nfmy6bm3gsqj7304";
     };
     buildInputs = [pkgconfig ];
@@ -517,58 +487,28 @@ rec {
     name = "font-winitzki-cyrillic-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-winitzki-cyrillic-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/font-winitzki-cyrillic-1.0.0.tar.bz2;
       sha256 = "1qzf9f1irn4difbz2s6j8yhn4hdg95j35q89nhss7rpwh5l7z2j7";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ];
   }) // {inherit bdftopcf mkfontdir mkfontscale ;};
     
   fontxfree86type1 = (stdenv.mkDerivation {
-    name = "font-xfree86-type1-1.0.0";
+    name = "font-xfree86-type1-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-xfree86-type1-1.0.0.tar.bz2;
-      sha256 = "0kaaz2vyff4x679d0mv1y0lc1gabml2mj7ncfgzsknhv3nwx6xpg";
+      url = mirror://xorg/X11R7.4/src/everything/font-xfree86-type1-1.0.1.tar.bz2;
+      sha256 = "0hgksnwch59bxxxpmzlwrm2qqhnpj651m458bv1azn1026wgkncg";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; 
   }) // {inherit mkfontdir mkfontscale ;};
     
-  fslsfonts = (stdenv.mkDerivation {
-    name = "fslsfonts-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/fslsfonts-1.0.1.tar.bz2;
-      sha256 = "0bm6cgif31ghc04phxbiz5w2c5179gl9y9169s95cs7k4mm01srz";
-    };
-    buildInputs = [pkgconfig libFS libX11 ];
-  }) // {inherit libFS libX11 ;};
-    
-  fstobdf = (stdenv.mkDerivation {
-    name = "fstobdf-1.0.2";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/fstobdf-1.0.2.tar.bz2;
-      sha256 = "08mcwxn8fgsa4ryv0qnn9dny28xl9rigi6mqv5nh75ndaar4a3k9";
-    };
-    buildInputs = [pkgconfig libFS libX11 ];
-  }) // {inherit libFS libX11 ;};
-    
-  gccmakedep = (stdenv.mkDerivation {
-    name = "gccmakedep-1.0.2";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/gccmakedep-1.0.2.tar.bz2;
-      sha256 = "04dfamx3fvkvqfgs6xy2a6yqbxjrj4777ylxp38g60hhbdl4jg86";
-    };
-    buildInputs = [pkgconfig ];
-  }) // {inherit ;};
-    
   glproto = (stdenv.mkDerivation {
-    name = "glproto-1.4.8";
+    name = "glproto-1.4.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/glproto-1.4.8.tar.bz2;
-      sha256 = "0g05ixvi0nbpzgzhm0gpw6892jca23p6zij6pfvqidjk710q8p9g";
+      url = mirror://xorg/X11R7.4/src/everything/glproto-1.4.9.tar.bz2;
+      sha256 = "18v48zb3jfxlcvhi66zxk7mr4y37vj48qv3vlv9npxghwixzpmv9";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
@@ -577,38 +517,28 @@ rec {
     name = "iceauth-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/iceauth-1.0.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/iceauth-1.0.2.tar.bz2;
       sha256 = "1fxmpa9262b1iklxmy3ca72m34x11qixbqsm4b7w98jpvs8iah06";
     };
     buildInputs = [pkgconfig libICE xproto ];
   }) // {inherit libICE xproto ;};
     
-  ico = (stdenv.mkDerivation {
-    name = "ico-1.0.2";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/ico-1.0.2.tar.bz2;
-      sha256 = "19ca471c4yscqi0babvp4zpfnz66lxcbgrwx3fwjkk1bibhrcbnv";
-    };
-    buildInputs = [pkgconfig libX11 ];
-  }) // {inherit libX11 ;};
-    
   imake = (stdenv.mkDerivation {
     name = "imake-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/imake-1.0.2.tar.bz2;
+      url = mirror://xorg/individual/util/imake-1.0.2.tar.bz2;
       sha256 = "0yxca3hbz4hfk0fm385lbm89061p2nksr5klx2y3x1knmvsgzklp";
     };
     buildInputs = [pkgconfig xproto ]; inherit xorgcffiles; x11BuildHook = ./imake.sh; patches = [./imake.patch]; 
   }) // {inherit xproto ;};
     
   inputproto = (stdenv.mkDerivation {
-    name = "inputproto-1.4.2.1";
+    name = "inputproto-1.4.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/inputproto-1.4.2.1.tar.bz2;
-      sha256 = "1vgkmz6hdcj3r6pgbynkwlh5rg9mqjdvjqkql6wm4z6y6xqbfvcv";
+      url = mirror://xorg/X11R7.4/src/everything/inputproto-1.4.4.tar.bz2;
+      sha256 = "1rfz0x03iw18ji6728qnqmi56blqgak89vzs7sgbpfnnjbs8w9v3";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
@@ -617,38 +547,28 @@ rec {
     name = "kbproto-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/kbproto-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/kbproto-1.0.3.tar.bz2;
       sha256 = "1pqrrsag6njdrxpx5sm48gh68w64fv5jpmvp2jkjhynhpdg0003h";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
     
-  lbxproxy = (stdenv.mkDerivation {
-    name = "lbxproxy-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/lbxproxy-1.0.1.tar.bz2;
-      sha256 = "1hh1rb2cmfvsdd41n0k3wd2sz1cr7mm639ws57pd5994cyc5grz2";
-    };
-    buildInputs = [pkgconfig bigreqsproto libICE liblbxutil libX11 libXext xproxymanagementprotocol xtrans zlib ];
-  }) // {inherit bigreqsproto libICE liblbxutil libX11 libXext xproxymanagementprotocol xtrans zlib ;};
-    
   libAppleWM = (stdenv.mkDerivation {
     name = "libAppleWM-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libAppleWM-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/libAppleWM-1.0.0.tar.bz2;
       sha256 = "0zj0n0ykv3zy68d23xyf2c58ddn5m78b8j1zcynb93j1g90gzlpc";
     };
     buildInputs = [pkgconfig applewmproto libX11 libXext xextproto ];
   }) // {inherit applewmproto libX11 libXext xextproto ;};
     
   libFS = (stdenv.mkDerivation {
-    name = "libFS-1.0.0";
+    name = "libFS-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libFS-1.0.0.tar.bz2;
-      sha256 = "1ppxrhqa2lx5am054iz1ckinwp2bsq585fjlq6rym8qq1vxgj61g";
+      url = mirror://xorg/X11R7.4/src/everything/libFS-1.0.1.tar.bz2;
+      sha256 = "1x9cbaildzwi2ih5vylvdfqk7a7j040nq6ndh9vf0s8ynpyjzycv";
     };
     buildInputs = [pkgconfig fontsproto xproto xtrans ];
   }) // {inherit fontsproto xproto xtrans ;};
@@ -657,68 +577,58 @@ rec {
     name = "libICE-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libICE-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/libICE-1.0.4.tar.bz2;
       sha256 = "012ga4q5rxajnn3fd249xnirnvw6lms7jyp9bh9vsp349hpmw18k";
     };
     buildInputs = [pkgconfig xproto xtrans ];
   }) // {inherit xproto xtrans ;};
     
   libSM = (stdenv.mkDerivation {
-    name = "libSM-1.0.3";
+    name = "libSM-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libSM-1.0.3.tar.bz2;
-      sha256 = "017cbndj3c4cr8x3phl5k0063ylhzxvjjdj8scn4bzpgawsjvx2p";
+      url = mirror://xorg/X11R7.4/src/everything/libSM-1.1.0.tar.bz2;
+      sha256 = "10iap6ydxmk0g5qcfnsf9yc30fhvqshgppm0sca21y0z5qwaqdkm";
     };
-    buildInputs = [pkgconfig libICE xproto xtrans ];
-  }) // {inherit libICE xproto xtrans ;};
+    buildInputs = [pkgconfig libICE e2fsprogs xproto xtrans ];
+  }) // {inherit libICE e2fsprogs xproto xtrans ;};
     
   libWindowsWM = (stdenv.mkDerivation {
     name = "libWindowsWM-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libWindowsWM-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/libWindowsWM-1.0.0.tar.bz2;
       sha256 = "0shnxkg9ghihgyrl3dzhqdcgssa7146dn1j51rzbl89x2xk75n3a";
     };
     buildInputs = [pkgconfig windowswmproto libX11 libXext xextproto ];
   }) // {inherit windowswmproto libX11 libXext xextproto ;};
     
   libX11 = (stdenv.mkDerivation {
-    name = "libX11-1.1.3";
+    name = "libX11-1.1.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libX11-1.1.3.tar.bz2;
-      sha256 = "0ylip0df6hilh0yf5x2wzhj56wnx32fgmf2whxf9bpd55rp5cbsa";
+      url = mirror://xorg/X11R7.4/src/everything/libX11-1.1.5.tar.bz2;
+      sha256 = "10lbzi0d0anaim0l0k4gbipxlrl91drq8pf2bnf5wqa11s8754ns";
     };
     buildInputs = [pkgconfig bigreqsproto inputproto kbproto libXau libxcb xcmiscproto libXdmcp xextproto xf86bigfontproto xproto xtrans ];
   }) // {inherit bigreqsproto inputproto kbproto libXau libxcb xcmiscproto libXdmcp xextproto xf86bigfontproto xproto xtrans ;};
     
   libXScrnSaver = (stdenv.mkDerivation {
-    name = "libXScrnSaver-1.1.2";
+    name = "libXScrnSaver-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXScrnSaver-1.1.2.tar.bz2;
-      sha256 = "0ryckgkyx2zz4r5vvpja0p8h5bhkjq8wm9h84h60w1j6lyydwxbc";
+      url = mirror://xorg/X11R7.4/src/everything/libXScrnSaver-1.1.3.tar.bz2;
+      sha256 = "1269nbcrfyark3h4687pjkcsldsi0ygy1iigmym28nn1jd82942b";
     };
     buildInputs = [pkgconfig scrnsaverproto libX11 libXext xextproto ];
   }) // {inherit scrnsaverproto libX11 libXext xextproto ;};
     
-  libXTrap = (stdenv.mkDerivation {
-    name = "libXTrap-1.0.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXTrap-1.0.0.tar.bz2;
-      sha256 = "1filzv6z59rlrd0d8xglpr1r7ac1zr0jfn106yndwp5xfpk2rlfg";
-    };
-    buildInputs = [pkgconfig trapproto libX11 libXext xextproto libXt ];
-  }) // {inherit trapproto libX11 libXext xextproto libXt ;};
-    
   libXau = (stdenv.mkDerivation {
-    name = "libXau-1.0.3";
+    name = "libXau-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXau-1.0.3.tar.bz2;
-      sha256 = "0fwyq42q10k4cxar4nj73c7zd7jg6gh16zmxw2b0wwhafy40mhyn";
+      url = mirror://xorg/X11R7.4/src/everything/libXau-1.0.4.tar.bz2;
+      sha256 = "0b5jvqp0n9iz3qag4k7g2bwzs7d0vy5sd6rhhd00l30dy2jzzlqh";
     };
     buildInputs = [pkgconfig xproto ];
   }) // {inherit xproto ;};
@@ -727,17 +637,17 @@ rec {
     name = "libXaw-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXaw-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/libXaw-1.0.4.tar.bz2;
       sha256 = "1yaslcpj6sd6s8gx2hv60gfjf515gggd8f2jv4zqbp5q9wcapx0i";
     };
-    buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ];
-  }) // {inherit printproto libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ;};
+    buildInputs = [pkgconfig libX11 libXau libXext xextproto libXmu libXpm xproto libXt ];
+  }) // {inherit libX11 libXau libXext xextproto libXmu libXpm xproto libXt ;};
     
   libXcomposite = (stdenv.mkDerivation {
     name = "libXcomposite-0.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXcomposite-0.4.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/libXcomposite-0.4.0.tar.bz2;
       sha256 = "043m7jhqzqfb02g29v8k57xxm4vqbw15gln4wja81xni5pl5kdvx";
     };
     buildInputs = [pkgconfig compositeproto fixesproto libX11 libXext libXfixes ];
@@ -747,18 +657,18 @@ rec {
     name = "libXcursor-1.1.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXcursor-1.1.9.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/libXcursor-1.1.9.tar.bz2;
       sha256 = "1d6j2md25f6g45xjb2sqsqwvdidf9i3n3mb682bcxj3i49ab7zqx";
     };
     buildInputs = [pkgconfig fixesproto libX11 libXfixes libXrender ];
   }) // {inherit fixesproto libX11 libXfixes libXrender ;};
     
   libXdamage = (stdenv.mkDerivation {
-    name = "libXdamage-1.0.4";
+    name = "libXdamage-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXdamage-1.0.4.tar.bz2;
-      sha256 = "0dn64lv1nlc017nq11ixgafd15n8vw52p2knw7wxdqbpz870zyax";
+      url = mirror://xorg/X11R7.4/src/everything/libXdamage-1.1.1.tar.bz2;
+      sha256 = "0bmf5y9wwas5g40inghq7lzcm48z36zip27pmp1s2lirn96pa0h1";
     };
     buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes ];
   }) // {inherit damageproto fixesproto libX11 xextproto libXfixes ;};
@@ -767,28 +677,18 @@ rec {
     name = "libXdmcp-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXdmcp-1.0.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/libXdmcp-1.0.2.tar.bz2;
       sha256 = "1a4n1z0vfzw10pcj27g95rjn06c231cg38l44z14b4ar8wc0rrgk";
     };
     buildInputs = [pkgconfig xproto ];
   }) // {inherit xproto ;};
     
-  libXevie = (stdenv.mkDerivation {
-    name = "libXevie-1.0.2";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXevie-1.0.2.tar.bz2;
-      sha256 = "1nkls60q0zmrlrxxy08h4jnsv3b9rgpmqwq6sar2v4s5s4dbhw7z";
-    };
-    buildInputs = [pkgconfig evieext libX11 libXext xextproto xproto ];
-  }) // {inherit evieext libX11 libXext xextproto xproto ;};
-    
   libXext = (stdenv.mkDerivation {
-    name = "libXext-1.0.2";
+    name = "libXext-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXext-1.0.2.tar.bz2;
-      sha256 = "13lg78mlhvnip54yvifcmmqsa6dgnfbd0h7wwscdksvz27slr3in";
+      url = mirror://xorg/X11R7.4/src/everything/libXext-1.0.4.tar.bz2;
+      sha256 = "07yjxfg2m3757l8ky78l4h7786kpxgpmfp05nj3wrynaw6n8xz9d";
     };
     buildInputs = [pkgconfig libX11 libXau xextproto xproto ];
   }) // {inherit libX11 libXau xextproto xproto ;};
@@ -797,18 +697,18 @@ rec {
     name = "libXfixes-4.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXfixes-4.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/libXfixes-4.0.3.tar.bz2;
       sha256 = "1p99m3hdh9m6a59jyn4vgwbppabhppsjdkjkwrfbii1pa0y0jzjl";
     };
     buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ];
   }) // {inherit fixesproto libX11 xextproto xproto ;};
     
   libXfont = (stdenv.mkDerivation {
-    name = "libXfont-1.3.1";
+    name = "libXfont-1.3.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXfont-1.3.1.tar.bz2;
-      sha256 = "1cd9b10s30z4fcvxvlrp8s5ylr482hhq7fc4r65djsm1h34pvyyw";
+      url = mirror://xorg/X11R7.4/src/everything/libXfont-1.3.3.tar.bz2;
+      sha256 = "0nhxynfhljfwvpq9f867fvc15r78r363rinr3dhk6qxxljyfcwb1";
     };
     buildInputs = [pkgconfig fontcacheproto libfontenc fontsproto freetype xproto xtrans zlib ];
   }) // {inherit fontcacheproto libfontenc fontsproto freetype xproto xtrans zlib ;};
@@ -817,18 +717,18 @@ rec {
     name = "libXfontcache-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXfontcache-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/libXfontcache-1.0.4.tar.bz2;
       sha256 = "0770yg0b9vqqlsq34nxb7ri3pf0smlhx018vmxidikc1pz7lgrzz";
     };
     buildInputs = [pkgconfig fontcacheproto libX11 libXext xextproto ];
   }) // {inherit fontcacheproto libX11 libXext xextproto ;};
     
   libXft = (stdenv.mkDerivation {
-    name = "libXft-2.1.12";
+    name = "libXft-2.1.13";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXft-2.1.12.tar.bz2;
-      sha256 = "11l98adf5sxpi9ryhckmxrdpa9ac2jz3m65xfv4302xgra2nzd38";
+      url = mirror://xorg/X11R7.4/src/everything/libXft-2.1.13.tar.bz2;
+      sha256 = "136yrzxb5xmpd34plhfj4yvla0iish3b7kqv8api8k7ki8jqhxnf";
     };
     buildInputs = [pkgconfig fontconfig freetype libXrender ];
   }) // {inherit fontconfig freetype libXrender ;};
@@ -837,79 +737,49 @@ rec {
     name = "libXi-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXi-1.1.3.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/libXi-1.1.3.tar.bz2;
       sha256 = "0gqm2a4bplpidhzknqvr6b1ipadcayyz3z6y794sdl6hjyz5nyn7";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext xextproto xproto ];
   }) // {inherit inputproto libX11 libXext xextproto xproto ;};
     
   libXinerama = (stdenv.mkDerivation {
-    name = "libXinerama-1.0.2";
+    name = "libXinerama-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXinerama-1.0.2.tar.bz2;
-      sha256 = "0gfhwmz4bcfiqcsnp85sdlwdi641wzi6c9ncwp2cnvkn9jpdfifj";
+      url = mirror://xorg/X11R7.4/src/everything/libXinerama-1.0.3.tar.bz2;
+      sha256 = "068j31apk38dapqfs368h9jzwx2xm6vk0qmmh02w4m31sm65dcq7";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xineramaproto ];
   }) // {inherit libX11 libXext xextproto xineramaproto ;};
     
   libXmu = (stdenv.mkDerivation {
-    name = "libXmu-1.0.3";
+    name = "libXmu-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXmu-1.0.3.tar.bz2;
-      sha256 = "0rkd8qsqmi3a2346ln4mqvqv89jfs0gvip9khjs9r3fs6s730vmm";
+      url = mirror://xorg/X11R7.4/src/everything/libXmu-1.0.4.tar.bz2;
+      sha256 = "1w0qz8m8qq8nvamipzmry99sgxgn3xzjvk4xzbphhk4gxpb00g7q";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto libXt ];
   }) // {inherit libX11 libXext xextproto libXt ;};
     
-  libXp = (stdenv.mkDerivation {
-    name = "libXp-1.0.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXp-1.0.0.tar.bz2;
-      sha256 = "1blwrr5zhmwwy87j0svmhv3hc13acyn5j14n5rv0anz81iav2r3y";
-    };
-    buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto ];
-  }) // {inherit printproto libX11 libXau libXext xextproto ;};
-    
   libXpm = (stdenv.mkDerivation {
     name = "libXpm-3.5.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXpm-3.5.7.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/libXpm-3.5.7.tar.bz2;
       sha256 = "1aibr6y6hnlgc7m1a1y5s1qx7863praq4pdp0xrpkc75gkk1lw34";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
     patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in";
   }) // {inherit libX11 libXext xextproto xproto libXt ;};
     
-  libXprintAppUtil = (stdenv.mkDerivation {
-    name = "libXprintAppUtil-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXprintAppUtil-1.0.1.tar.bz2;
-      sha256 = "198ad7pmkp31vcs0iwd8z3vw08p69hlyjmzgk7sdny9k01368q14";
-    };
-    buildInputs = [pkgconfig printproto libX11 libXau libXp libXprintUtil ];
-  }) // {inherit printproto libX11 libXau libXp libXprintUtil ;};
-    
-  libXprintUtil = (stdenv.mkDerivation {
-    name = "libXprintUtil-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXprintUtil-1.0.1.tar.bz2;
-      sha256 = "0v3fh9fqgravl8xl509swwd9a2v7iw38szhlpraiyq5r402axdkj";
-    };
-    buildInputs = [pkgconfig printproto libX11 libXau libXp libXt ];
-  }) // {inherit printproto libX11 libXau libXp libXt ;};
-    
   libXrandr = (stdenv.mkDerivation {
-    name = "libXrandr-1.2.2";
+    name = "libXrandr-1.2.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXrandr-1.2.2.tar.bz2;
-      sha256 = "161aq7gf5h91jz9y9prxikxvh6zsz84yznvkzc9i4azia348svr0";
+      url = mirror://xorg/X11R7.4/src/everything/libXrandr-1.2.3.tar.bz2;
+      sha256 = "0ryj1v6127j0639by810jxiaspwsn2l837wl79x6ghy4p0kgxvgq";
     };
     buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto libXrender ];
   }) // {inherit randrproto renderproto libX11 libXext xextproto libXrender ;};
@@ -918,7 +788,7 @@ rec {
     name = "libXrender-0.9.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXrender-0.9.4.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/libXrender-0.9.4.tar.bz2;
       sha256 = "1v0p63g426x0hii0gynq05ccwihr6dn9azjpls8z4zjfvm1x70jn";
     };
     buildInputs = [pkgconfig renderproto libX11 ];
@@ -928,18 +798,18 @@ rec {
     name = "libXres-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXres-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/libXres-1.0.3.tar.bz2;
       sha256 = "0c02i8wnwdnzkiaviddc2h7xswg6s58ipw4m204hzv7mfdsvmmd6";
     };
     buildInputs = [pkgconfig resourceproto libX11 libXext xextproto ];
   }) // {inherit resourceproto libX11 libXext xextproto ;};
     
   libXt = (stdenv.mkDerivation {
-    name = "libXt-1.0.4";
+    name = "libXt-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXt-1.0.4.tar.bz2;
-      sha256 = "0ifklh82iq81vgjrwp8pdypyr384zc0kca15flbnrxg8zyr8hw7c";
+      url = mirror://xorg/X11R7.4/src/everything/libXt-1.0.5.tar.bz2;
+      sha256 = "1x4w7qdciwgjj0ccr1xn7v21pf1csi6cs99j8s54414slnnp5i23";
     };
     buildInputs = [pkgconfig kbproto libSM libX11 xproto ];
   }) // {inherit kbproto libSM libX11 xproto ;};
@@ -948,18 +818,18 @@ rec {
     name = "libXtst-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXtst-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/libXtst-1.0.3.tar.bz2;
       sha256 = "01f9b3386v3dzlvdg0ccpa2wyv0d6b9fbxy149rws17bkhyxva5l";
     };
     buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto ];
   }) // {inherit inputproto recordproto libX11 libXext xextproto ;};
     
   libXv = (stdenv.mkDerivation {
-    name = "libXv-1.0.3";
+    name = "libXv-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXv-1.0.3.tar.bz2;
-      sha256 = "06r66s92pxxr73y2yzsyihdszwns4s8rs5c77kf2cg4swddycypq";
+      url = mirror://xorg/X11R7.4/src/everything/libXv-1.0.4.tar.bz2;
+      sha256 = "1j18fif5mv1gsb7nswqw010impwi7aifqm3036bd79jddydw8g2d";
     };
     buildInputs = [pkgconfig videoproto libX11 libXext xextproto ];
   }) // {inherit videoproto libX11 libXext xextproto ;};
@@ -968,7 +838,7 @@ rec {
     name = "libXvMC-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXvMC-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/libXvMC-1.0.4.tar.bz2;
       sha256 = "1frshf8nfa81hz4q61qg1pc2sz93dl6nsc78dr39hqfnm1dq45qj";
     };
     buildInputs = [pkgconfig videoproto libX11 libXext xextproto libXv ];
@@ -978,7 +848,7 @@ rec {
     name = "libXxf86dga-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXxf86dga-1.0.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/libXxf86dga-1.0.2.tar.bz2;
       sha256 = "09cs62bvnv1wwjqcqyckhj0b0v7wa3dyldlg2icv67qal0q545sr";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ];
@@ -988,18 +858,18 @@ rec {
     name = "libXxf86misc-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXxf86misc-1.0.1.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/libXxf86misc-1.0.1.tar.bz2;
       sha256 = "128jm6nssp5wfic17rb54ssz6j3hibm77c9xxgm6x85a95yxc8i1";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86miscproto xproto ];
   }) // {inherit libX11 libXext xextproto xf86miscproto xproto ;};
     
   libXxf86vm = (stdenv.mkDerivation {
-    name = "libXxf86vm-1.0.1";
+    name = "libXxf86vm-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXxf86vm-1.0.1.tar.bz2;
-      sha256 = "0ni8r5im508i3yhn5mq78am7zgs53d4i0a6h3rsjyhhwc70w53z0";
+      url = mirror://xorg/X11R7.4/src/everything/libXxf86vm-1.0.2.tar.bz2;
+      sha256 = "1pji77kksdjn3n1hi6970dqs58jbdvmxphm6ddlbqkraap3c7crw";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ];
   }) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;};
@@ -1008,7 +878,7 @@ rec {
     name = "libdmx-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libdmx-1.0.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/libdmx-1.0.2.tar.bz2;
       sha256 = "1i5r4spy5s9s5nfxzpxlx06j6xcf865z821cfq2flz1zahdg6gzs";
     };
     buildInputs = [pkgconfig dmxproto libX11 libXext xextproto ];
@@ -1018,31 +888,21 @@ rec {
     name = "libfontenc-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libfontenc-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/libfontenc-1.0.4.tar.bz2;
       sha256 = "1j2qc9xqc2wibc005abvkj8wwn9hk6b5s2qn94ma2ig82wysm4xr";
     };
     buildInputs = [pkgconfig xproto zlib ];
   }) // {inherit xproto zlib ;};
     
-  liblbxutil = (stdenv.mkDerivation {
-    name = "liblbxutil-1.0.1";
+  libpciaccess = (stdenv.mkDerivation {
+    name = "libpciaccess-0.10.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/liblbxutil-1.0.1.tar.bz2;
-      sha256 = "0n3jgf95svmh788gw601jwdk58gw3sb87h57waaklv8hj1q1rhwl";
+      url = mirror://xorg/X11R7.4/src/everything/libpciaccess-0.10.3.tar.bz2;
+      sha256 = "1p40sskfvdfgysc9gy4558d56s3bzk8wvmqqrmnyd2k8np9rlq1g";
     };
-    buildInputs = [pkgconfig xextproto xproto zlib ];
-  }) // {inherit xextproto xproto zlib ;};
-    
-  liboldX = (stdenv.mkDerivation {
-    name = "liboldX-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/liboldX-1.0.1.tar.bz2;
-      sha256 = "03rl20g5fx0qfli1a1cxg4mvivgpsblwv9amszjq93z2yl0x748h";
-    };
-    buildInputs = [pkgconfig libX11 ];
-  }) // {inherit libX11 ;};
+    buildInputs = [pkgconfig ];
+  }) // {inherit ;};
     
   libpthreadstubs = (stdenv.mkDerivation {
     name = "libpthread-stubs-0.1";
@@ -1055,61 +915,41 @@ rec {
   }) // {inherit ;};
     
   libxcb = (stdenv.mkDerivation {
-    name = "libxcb-1.1";
+    name = "libxcb-1.1.91";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://xcb.freedesktop.org/dist/libxcb-1.1.tar.bz2;
-      sha256 = "0gyrh8y8hn9k6vs8c66czx3rwi07xyfr5kc191ksajbbi2vrr2rk";
+      url = http://xcb.freedesktop.org/dist/libxcb-1.1.91.tar.bz2;
+      sha256 = "1l0jlswndkm87flyvm1sp165pi9w0d5rhfhrhss080nzrf1fxnjp";
     };
-    buildInputs = [pkgconfig libxslt libpthreadstubs libXau xcbproto libXdmcp ];
-  }) // {inherit libxslt libpthreadstubs libXau xcbproto libXdmcp ;};
+    buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
+  }) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
     
   libxkbfile = (stdenv.mkDerivation {
-    name = "libxkbfile-1.0.4";
+    name = "libxkbfile-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libxkbfile-1.0.4.tar.bz2;
-      sha256 = "1bmq4l45a5fzy1g4ap3cwd73c78smf8c5qba9g1sfl9rm97dx2j6";
+      url = mirror://xorg/X11R7.4/src/everything/libxkbfile-1.0.5.tar.bz2;
+      sha256 = "0pwnb3jv4105mj3mpadc23aq3388fcsq5nb1z02nvjy93wkjidha";
     };
     buildInputs = [pkgconfig kbproto libX11 ];
   }) // {inherit kbproto libX11 ;};
     
-  libxkbui = (stdenv.mkDerivation {
-    name = "libxkbui-1.0.2";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libxkbui-1.0.2.tar.bz2;
-      sha256 = "0552zyrm0nvhsyy37x7g767cbii9kc3glvb9dmgywd1jsq0k3hi0";
-    };
-    buildInputs = [pkgconfig libX11 libxkbfile libXt ];
-  }) // {inherit libX11 libxkbfile libXt ;};
-    
-  listres = (stdenv.mkDerivation {
-    name = "listres-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/listres-1.0.1.tar.bz2;
-      sha256 = "18zpmvw4l13h3c4a99af04svp0xj4fwl88mksl0sah724n0famki";
-    };
-    buildInputs = [pkgconfig libXaw libX11 libXmu libXt ];
-  }) // {inherit libXaw libX11 libXmu libXt ;};
-    
   lndir = (stdenv.mkDerivation {
     name = "lndir-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/lndir-1.0.1.tar.bz2;
+      url = mirror://xorg/individual/util/lndir-1.0.1.tar.bz2;
       sha256 = "0a84q8m3x8qbyrhx7r2k7wmhdb5588vcb1r21ifkx8yaaw1360fk";
     };
     buildInputs = [pkgconfig xproto ];
   }) // {inherit xproto ;};
     
   luit = (stdenv.mkDerivation {
-    name = "luit-1.0.2";
+    name = "luit-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/luit-1.0.2.tar.bz2;
-      sha256 = "171qhbbmfa12jv7anxkxamcrjpwiywyvyqnfyxnn431my1nxgi60";
+      url = mirror://xorg/X11R7.4/src/everything/luit-1.0.3.tar.bz2;
+      sha256 = "1mx5fw4iz62gz2y6z92w0wnl81zvfhah9hzd09zsd2gf5qaz4410";
     };
     buildInputs = [pkgconfig libfontenc libX11 zlib ];
   }) // {inherit libfontenc libX11 zlib ;};
@@ -1118,77 +958,47 @@ rec {
     name = "makedepend-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/makedepend-1.0.1.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/makedepend-1.0.1.tar.bz2;
       sha256 = "1lmi2vagp6svfvkqmhsbafjhchwscii7sfdzr20d90hg46gsslmp";
     };
     buildInputs = [pkgconfig xproto ];
   }) // {inherit xproto ;};
     
   mkfontdir = (stdenv.mkDerivation {
-    name = "mkfontdir-1.0.3";
+    name = "mkfontdir-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/mkfontdir-1.0.3.tar.bz2;
-      sha256 = "0x1hclcrqsnccxc0n2wkrx5yjxpgr704dd1x4vvcflqsc41nwy1a";
+      url = mirror://xorg/X11R7.4/src/everything/mkfontdir-1.0.4.tar.bz2;
+      sha256 = "1qzqrb3pg96gd0mifw74syghajwpkkbda0gzwkl4ww171p3kr6kg";
     };
     buildInputs = [pkgconfig ]; preBuild = "substituteInPlace mkfontdir.cpp --replace BINDIR ${mkfontscale}/bin"; 
   }) // {inherit ;};
     
   mkfontscale = (stdenv.mkDerivation {
-    name = "mkfontscale-1.0.3";
+    name = "mkfontscale-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/mkfontscale-1.0.3.tar.bz2;
-      sha256 = "087h7bapnsl74w7c0r23j0gikz2sazw8wr0ql1cb8jjvaajs6n04";
+      url = mirror://xorg/X11R7.4/src/everything/mkfontscale-1.0.5.tar.bz2;
+      sha256 = "0l1qxlqb57idiafbzbfhsfjd4pn5vdv4fbizxfwvxhrx2magz7gp";
     };
     buildInputs = [pkgconfig libfontenc freetype xproto zlib ];
   }) // {inherit libfontenc freetype xproto zlib ;};
     
-  oclock = (stdenv.mkDerivation {
-    name = "oclock-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/oclock-1.0.1.tar.bz2;
-      sha256 = "0z11fj6f2z4q2wcw96m2yf4pg8cxnhwfw4j0f4qbxyq2ci7pvas9";
-    };
-    buildInputs = [pkgconfig libX11 libXext libXmu libXt ];
-  }) // {inherit libX11 libXext libXmu libXt ;};
-    
   pixman = (stdenv.mkDerivation {
-    name = "pixman-0.10.0";
+    name = "pixman-0.12.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/individual/lib/pixman-0.10.0.tar.bz2;
-      sha256 = "1r6il420j7ws9xbk6y3nn8zb7mc76rk1npz5763qp525n94iz11b";
+      url = mirror://xorg/individual/lib/pixman-0.12.0.tar.bz2;
+      sha256 = "0a5j4lxlsn4sns2zcv9z32jh4mll7qv8yb5dyx1gphl258w58ax8";
     };
-    buildInputs = [pkgconfig ];
-  }) // {inherit ;};
-    
-  printproto = (stdenv.mkDerivation {
-    name = "printproto-1.0.3";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/printproto-1.0.3.tar.bz2;
-      sha256 = "0dbjxinhbd55vjdx3jws97id116lxlgg8jp49gccgpw3va65ydwb";
-    };
-    buildInputs = [pkgconfig ];
-  }) // {inherit ;};
-    
-  proxymngr = (stdenv.mkDerivation {
-    name = "proxymngr-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/proxymngr-1.0.1.tar.bz2;
-      sha256 = "1i95jp3xw1z2llw028rpkr4id03jxkqb0pv0l1vj8mhi6iax9xg9";
-    };
-    buildInputs = [pkgconfig libICE libX11 xproxymanagementprotocol libXt ];
-  }) // {inherit libICE libX11 xproxymanagementprotocol libXt ;};
+    buildInputs = [pkgconfig perl ];
+  }) // {inherit perl ;};
     
   randrproto = (stdenv.mkDerivation {
     name = "randrproto-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/randrproto-1.2.1.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/randrproto-1.2.1.tar.bz2;
       sha256 = "0m7n624h2rsxs7m5x03az87x7hlh0gxqphj59q7laqi5iwpx8bqh";
     };
     buildInputs = [pkgconfig ];
@@ -1198,7 +1008,7 @@ rec {
     name = "recordproto-1.13.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/recordproto-1.13.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/recordproto-1.13.2.tar.bz2;
       sha256 = "1yfg15k5fznjvndvld3vw7gcbcmq1p6ic0dybf1a2wzk2j5pmrq4";
     };
     buildInputs = [pkgconfig ];
@@ -1208,7 +1018,7 @@ rec {
     name = "renderproto-0.9.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/renderproto-0.9.3.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/renderproto-0.9.3.tar.bz2;
       sha256 = "0nyl5pmgrvw7p6laqgsrk65b633yvrrf8jx0vakqz2p9fyw0i2n9";
     };
     buildInputs = [pkgconfig ];
@@ -1218,87 +1028,47 @@ rec {
     name = "resourceproto-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/resourceproto-1.0.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/resourceproto-1.0.2.tar.bz2;
       sha256 = "11rlnn54y15bf39ll7vzn9824l1ib15r7p4v8l0k0j7mxvydccqc";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
     
-  rgb = (stdenv.mkDerivation {
-    name = "rgb-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/rgb-1.0.1.tar.bz2;
-      sha256 = "1bch55h8dm382hnc2n52rihx1wp965lsl6camx4c4qigyw1bqdgn";
-    };
-    buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
-    
-  rstart = (stdenv.mkDerivation {
-    name = "rstart-1.0.2";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/rstart-1.0.2.tar.bz2;
-      sha256 = "15lmirb2x8icvc7qzj87fcb09p6fk9kbnphf5wkf864h0ssliz02";
-    };
-    buildInputs = [pkgconfig libX11 ];
-  }) // {inherit libX11 ;};
-    
-  scripts = (stdenv.mkDerivation {
-    name = "scripts-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/scripts-1.0.1.tar.bz2;
-      sha256 = "0dm1jhwq1r396xfcxx3g9lvgzydf4mikjicch6cs8b1hb51ln58v";
-    };
-    buildInputs = [pkgconfig libX11 ];
-  }) // {inherit libX11 ;};
-    
   scrnsaverproto = (stdenv.mkDerivation {
     name = "scrnsaverproto-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/scrnsaverproto-1.1.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/scrnsaverproto-1.1.0.tar.bz2;
       sha256 = "13s7rpygj0zm8lk6r9zw1ivs8wj3g4qrfqw80ifc0ff37kvsn2fv";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
     
   sessreg = (stdenv.mkDerivation {
-    name = "sessreg-1.0.3";
+    name = "sessreg-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/sessreg-1.0.3.tar.bz2;
-      sha256 = "1p40013kg73qkgwhhj06l0yrmvcp90r937vlzh4xyv94adfi833x";
+      url = mirror://xorg/X11R7.4/src/everything/sessreg-1.0.4.tar.bz2;
+      sha256 = "00lqgsdm74kz7csi9is906gr3nfwz3viaax10ipw32i05r867q93";
     };
-    buildInputs = [pkgconfig libX11 ];
-  }) // {inherit libX11 ;};
+    buildInputs = [pkgconfig xproto ];
+  }) // {inherit xproto ;};
     
   setxkbmap = (stdenv.mkDerivation {
     name = "setxkbmap-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/setxkbmap-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/setxkbmap-1.0.4.tar.bz2;
       sha256 = "1b1brw1v98q2rqhr5x7f8mr3clxq62nw5175gpamg5s172916nwv";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ]; postInstall = "ensureDir $out/share; ln -sfn ${xkeyboard_config}/etc/X11 $out/share/X11";
   }) // {inherit libX11 libxkbfile ;};
     
-  showfont = (stdenv.mkDerivation {
-    name = "showfont-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/showfont-1.0.1.tar.bz2;
-      sha256 = "033nc48aaq0j5jg36fwksfsxg3wwyg3kaayifjqcdaql57qkrnw7";
-    };
-    buildInputs = [pkgconfig libFS ];
-  }) // {inherit libFS ;};
-    
   smproxy = (stdenv.mkDerivation {
     name = "smproxy-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/smproxy-1.0.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/smproxy-1.0.2.tar.bz2;
       sha256 = "1lk79yfdalpn0c7hm57vpr3xg6rib1dr6p2wl634733wy062zlkn";
     };
     buildInputs = [pkgconfig libXmu libXt ];
@@ -1308,28 +1078,18 @@ rec {
     name = "trapproto-3.4.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/trapproto-3.4.3.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/trapproto-3.4.3.tar.bz2;
       sha256 = "1qd06blxgah1pf49259gm9njpbqqk1gcisbv8p1ssv39pk9s0cpz";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
     
-  twm = (stdenv.mkDerivation {
-    name = "twm-1.0.3";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/twm-1.0.3.tar.bz2;
-      sha256 = "0kiap5xxswx4w6dhbb6ys19blff8nrzzqwxbh8mvz4x8fw25ahav";
-    };
-    buildInputs = [pkgconfig libX11 libXext libXmu libXt ];
-  }) // {inherit libX11 libXext libXmu libXt ;};
-    
   utilmacros = (stdenv.mkDerivation {
-    name = "util-macros-1.1.5";
+    name = "util-macros-1.1.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/util-macros-1.1.5.tar.bz2;
-      sha256 = "06v5ym133460z9r4jyz9k0dfs07hsrhg1ww35q9cr2vbw689g4vm";
+      url = mirror://xorg/X11R7.4/src/everything/util-macros-1.1.6.tar.bz2;
+      sha256 = "0rjc3vsivrwbwlqnrsi57w5bdi7sb86wc5gzd7d1z0f4ylgcqgxh";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
@@ -1338,48 +1098,38 @@ rec {
     name = "videoproto-2.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/videoproto-2.2.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/videoproto-2.2.2.tar.bz2;
       sha256 = "033q4jgrwgkdcwj5q8hwf7vpl5sdzm7z9dsgwcphrlqchdw8825b";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
     
-  viewres = (stdenv.mkDerivation {
-    name = "viewres-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/viewres-1.0.1.tar.bz2;
-      sha256 = "1f1lrvnjnf5c0lwisribdb7zgsk1874rjz1v5fcsd5xizx2wsjdz";
-    };
-    buildInputs = [pkgconfig libXaw libXt ];
-  }) // {inherit libXaw libXt ;};
-    
   windowswmproto = (stdenv.mkDerivation {
     name = "windowswmproto-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/windowswmproto-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/windowswmproto-1.0.3.tar.bz2;
       sha256 = "0lgih20hvpxzdvzwrw5plfynrkb2b930mnfymfnffbdvjsb283bq";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
     
   x11perf = (stdenv.mkDerivation {
-    name = "x11perf-1.4.1";
+    name = "x11perf-1.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/x11perf-1.4.1.tar.bz2;
-      sha256 = "0r1h9ndlbnyf87vz36ga97hmqbp05q7zh3lmbfjzv5n5irhij668";
+      url = mirror://xorg/X11R7.4/src/everything/x11perf-1.5.tar.bz2;
+      sha256 = "0cqjrr1l1mcnbcx3lab73qmjxbvskcgpgfxlimsf3dz0vm9xlaa7";
     };
     buildInputs = [pkgconfig libX11 libXext libXft libXmu libXrender ];
   }) // {inherit libX11 libXext libXft libXmu libXrender ;};
     
   xauth = (stdenv.mkDerivation {
-    name = "xauth-1.0.2";
+    name = "xauth-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xauth-1.0.2.tar.bz2;
-      sha256 = "05qzbxjvn947igkyad5bg12y3bbd5ji6v9h43jznmcay3rc5m7jn";
+      url = mirror://xorg/X11R7.4/src/everything/xauth-1.0.3.tar.bz2;
+      sha256 = "136sbgfirl9hxcg2a40z2xfs4f35z0f7nmxrkrja8km7zm9qpl8z";
     };
     buildInputs = [pkgconfig libX11 libXau libXext libXmu ];
   }) // {inherit libX11 libXau libXext libXmu ;};
@@ -1388,87 +1138,47 @@ rec {
     name = "xbacklight-1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xbacklight-1.1.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xbacklight-1.1.tar.bz2;
       sha256 = "1934bnxa3hx0mzihv3bgcid6qrn75an03ci5dzhnjicp2lgh15f7";
     };
     buildInputs = [pkgconfig libX11 libXrandr libXrender ];
   }) // {inherit libX11 libXrandr libXrender ;};
     
-  xbiff = (stdenv.mkDerivation {
-    name = "xbiff-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xbiff-1.0.1.tar.bz2;
-      sha256 = "00v5m4s7kh93fx612pcjviy893h611lbcsgx067l1z8wibxb2icq";
-    };
-    buildInputs = [pkgconfig libXaw xbitmaps libXext ];
-  }) // {inherit libXaw xbitmaps libXext ;};
-    
   xbitmaps = (stdenv.mkDerivation {
     name = "xbitmaps-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xbitmaps-1.0.1.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xbitmaps-1.0.1.tar.bz2;
       sha256 = "0rxqxrnkivn52kk41a9bl1ppy756c5gw5w1rbnw75xvp9rcvx9as";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
     
-  xcalc = (stdenv.mkDerivation {
-    name = "xcalc-1.0.2";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xcalc-1.0.2.tar.bz2;
-      sha256 = "0cjapca3lc67ypcinmygbwmjb2bd38ycgshb9p8ljwif44nmwdwn";
-    };
-    buildInputs = [pkgconfig libXaw libXt ];
-  }) // {inherit libXaw libXt ;};
-    
   xcbproto = (stdenv.mkDerivation {
-    name = "xcb-proto-1.1";
+    name = "xcb-proto-1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://xcb.freedesktop.org/dist/xcb-proto-1.1.tar.bz2;
-      sha256 = "0knih0f85y7j3q2c8dia8s6nw5b25c2fr3zx0m0znxah7pc9ibq6";
+      url = http://xcb.freedesktop.org/dist/xcb-proto-1.2.tar.bz2;
+      sha256 = "1rbb007ci1jjdxjshpdabp4qci2096jwb0487ck1njq68csjw9al";
     };
-    buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+    buildInputs = [pkgconfig python ];
+  }) // {inherit python ;};
     
   xcbutil = (stdenv.mkDerivation {
-    name = "xcb-util-0.2";
+    name = "xcb-util-0.3.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://xcb.freedesktop.org/dist/xcb-util-0.2.tar.bz2;
-      sha256 = "06mhfp6n2nyk1flhnbx9kbv2rc3myny2v6rg5y1ymg6wqida3mm0";
+      url = http://xcb.freedesktop.org/dist/xcb-util-0.3.0.tar.bz2;
+      sha256 = "1aq82ymgvrr5hav62mjax8qar9qiszw0cj719wlznh251v0xynpq";
     };
     buildInputs = [pkgconfig libxcb ];
   }) // {inherit libxcb ;};
     
-  xclipboard = (stdenv.mkDerivation {
-    name = "xclipboard-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xclipboard-1.0.1.tar.bz2;
-      sha256 = "1z3h9myc5asq6jacb8r7sjlaym226z45a64fazm14l9805qs569k";
-    };
-    buildInputs = [pkgconfig libXaw libXt ];
-  }) // {inherit libXaw libXt ;};
-    
-  xclock = (stdenv.mkDerivation {
-    name = "xclock-1.0.3";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xclock-1.0.3.tar.bz2;
-      sha256 = "0zspx5jqp52wgp4c4d9qaxhp0b9p2fzx2ys4rza10apgx5x7gd8h";
-    };
-    buildInputs = [pkgconfig libXaw libX11 libXft libxkbfile libXrender libXt ];
-  }) // {inherit libXaw libX11 libXft libxkbfile libXrender libXt ;};
-    
   xcmiscproto = (stdenv.mkDerivation {
     name = "xcmiscproto-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xcmiscproto-1.1.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xcmiscproto-1.1.2.tar.bz2;
       sha256 = "1awjhz3cc06zsds57qnjwgm3y7z5bl4l6akqy6xvfcnnm6b7x05j";
     };
     buildInputs = [pkgconfig ];
@@ -1478,27 +1188,17 @@ rec {
     name = "xcmsdb-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xcmsdb-1.0.1.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xcmsdb-1.0.1.tar.bz2;
       sha256 = "0bp9xw2cmj9d0d18h5fdzcmc7jnjzbn5sb3vnx6qbbpz86gs6xg2";
     };
     buildInputs = [pkgconfig libX11 ];
   }) // {inherit libX11 ;};
     
-  xconsole = (stdenv.mkDerivation {
-    name = "xconsole-1.0.3";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xconsole-1.0.3.tar.bz2;
-      sha256 = "0idw8rxcpg16922zrph4ihnp1a7mq5c46ivl7k1zad5dxxgw47hv";
-    };
-    buildInputs = [pkgconfig libXaw libXt ];
-  }) // {inherit libXaw libXt ;};
-    
   xcursorgen = (stdenv.mkDerivation {
     name = "xcursorgen-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xcursorgen-1.0.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xcursorgen-1.0.2.tar.bz2;
       sha256 = "0khp7i7w8b5835q7wfdg385x072fhwbnpjqvv558vvxgs8mk42g0";
     };
     buildInputs = [pkgconfig libpng libX11 libXcursor ];
@@ -1508,107 +1208,57 @@ rec {
     name = "xcursor-themes-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xcursor-themes-1.0.1.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xcursor-themes-1.0.1.tar.bz2;
       sha256 = "184ybhyb6wj082rvr83q4jnnx3g7f1i4kpm3s4dwwifh5i0cszaf";
     };
     buildInputs = [pkgconfig libXcursor ];
   }) // {inherit libXcursor ;};
     
-  xdbedizzy = (stdenv.mkDerivation {
-    name = "xdbedizzy-1.0.2";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xdbedizzy-1.0.2.tar.bz2;
-      sha256 = "0b81cq8i6shlfq1nad0zljw329grzwd0fhxg9hkypsz7zvlq5s3l";
-    };
-    buildInputs = [pkgconfig libX11 libXext ];
-  }) // {inherit libX11 libXext ;};
-    
-  xditview = (stdenv.mkDerivation {
-    name = "xditview-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xditview-1.0.1.tar.bz2;
-      sha256 = "05w1an1x7np1x0z418pi5vgrwddfx1rvb8736kww4c9vz3jr8w8p";
-    };
-    buildInputs = [pkgconfig libXaw libXt ];
-  }) // {inherit libXaw libXt ;};
-    
-  xdm = (stdenv.mkDerivation {
-    name = "xdm-1.1.6";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xdm-1.1.6.tar.bz2;
-      sha256 = "1kcbb85vliy4644q6iiazpqaq5zzcg9p2j4w9r1gbhx5knfwh6n4";
-    };
-    buildInputs = [pkgconfig libXaw libX11 libXau libXdmcp libXext libXft libXinerama libXmu libXpm libXt ];
-  }) // {inherit libXaw libX11 libXau libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;};
-    
   xdpyinfo = (stdenv.mkDerivation {
-    name = "xdpyinfo-1.0.1";
+    name = "xdpyinfo-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xdpyinfo-1.0.1.tar.bz2;
-      sha256 = "0qawlhs5ryg8zpycqcflrrhf525gk5b43vi15rqwkfv05y3bbk8w";
+      url = mirror://xorg/X11R7.4/src/everything/xdpyinfo-1.0.3.tar.bz2;
+      sha256 = "0qhr7r3q4hs7cjpxh8fjyjia35czbdxzrb7bwm3znkxxa63pd522";
     };
-    buildInputs = [pkgconfig libdmx libX11 libXext libXi libXinerama libXp libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ];
-  }) // {inherit libdmx libX11 libXext libXi libXinerama libXp libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
+    buildInputs = [pkgconfig libdmx libX11 libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ];
+  }) // {inherit libdmx libX11 libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
     
   xdriinfo = (stdenv.mkDerivation {
     name = "xdriinfo-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xdriinfo-1.0.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xdriinfo-1.0.2.tar.bz2;
       sha256 = "0rbj9s0jc265wzqz79q9dkqy7626dmby6qdd4266hybcbc4sq0vv";
     };
     buildInputs = [pkgconfig glproto libX11 ];
   }) // {inherit glproto libX11 ;};
     
-  xedit = (stdenv.mkDerivation {
-    name = "xedit-1.0.2";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xedit-1.0.2.tar.bz2;
-      sha256 = "1pv26chphq74l7g3d5ps2ylgvyrmq0lw5wv1qbxfzjgqpa5xfn16";
-    };
-    buildInputs = [pkgconfig libXaw libXp libXprintUtil libXt ];
-  }) // {inherit libXaw libXp libXprintUtil libXt ;};
-    
   xev = (stdenv.mkDerivation {
-    name = "xev-1.0.1";
+    name = "xev-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xev-1.0.1.tar.bz2;
-      sha256 = "0m6vkbgmq5zbam7cjjjdpli3daia0anp3in9v93m2m3qbh0hff65";
+      url = mirror://xorg/X11R7.4/src/everything/xev-1.0.3.tar.bz2;
+      sha256 = "0fiim4052r6jgzya9f2zixv2qdmrmf35bxd54yz375zfakhpmb6l";
     };
     buildInputs = [pkgconfig libX11 ];
   }) // {inherit libX11 ;};
     
   xextproto = (stdenv.mkDerivation {
-    name = "xextproto-7.0.2";
+    name = "xextproto-7.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xextproto-7.0.2.tar.bz2;
-      sha256 = "1ng0247qi8f86p419ig7910g5dp0xdylliyl778qpc39wyd07wsk";
+      url = mirror://xorg/X11R7.4/src/everything/xextproto-7.0.3.tar.bz2;
+      sha256 = "1d2d7pbxahsjxhcw4snnwcy0qli88xwrqp35zyd1bjai6s744wir";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
     
-  xeyes = (stdenv.mkDerivation {
-    name = "xeyes-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xeyes-1.0.1.tar.bz2;
-      sha256 = "0ac0m9af193lxpyj11k2sp2xpmlhzzn3xrs6kdyy6c11fgl042ak";
-    };
-    buildInputs = [pkgconfig libX11 libXext libXmu libXt ];
-  }) // {inherit libX11 libXext libXmu libXt ;};
-    
   xf86bigfontproto = (stdenv.mkDerivation {
     name = "xf86bigfontproto-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86bigfontproto-1.1.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xf86bigfontproto-1.1.2.tar.bz2;
       sha256 = "097i2l56kwgcd6033ng8j83xpx9pxlnwx53gvcwaf2bpnaspbd01";
     };
     buildInputs = [pkgconfig ];
@@ -1618,7 +1268,7 @@ rec {
     name = "xf86dga-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86dga-1.0.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xf86dga-1.0.2.tar.bz2;
       sha256 = "0mqqrifbbfj2bh6hd187kmfzfn1rxgghmhsy9i6s5rcn6yw361k5";
     };
     buildInputs = [pkgconfig libX11 libXaw libXmu libXt libXxf86dga ];
@@ -1628,301 +1278,111 @@ rec {
     name = "xf86dgaproto-2.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86dgaproto-2.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xf86dgaproto-2.0.3.tar.bz2;
       sha256 = "00mhjvbgkgr08d8drjavrvxyvnma5rddnmpxc5y74cmh12ix9i2s";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
     
   xf86driproto = (stdenv.mkDerivation {
-    name = "xf86driproto-2.0.3";
+    name = "xf86driproto-2.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86driproto-2.0.3.tar.bz2;
-      sha256 = "1mmqaqkingf8k6qi5kfwrqkb4q4767c2biq4h6q06j1p4jd4c70i";
+      url = mirror://xorg/X11R7.4/src/everything/xf86driproto-2.0.4.tar.bz2;
+      sha256 = "1nprqyd72f9hkmf4mdpmc9c9incps9p3y3jwx4pm0qw5ximsczgm";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
     
   xf86inputacecad = (stdenv.mkDerivation {
-    name = "xf86-input-acecad-1.2.0";
+    name = "xf86-input-acecad-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-acecad-1.2.0.tar.bz2;
-      sha256 = "099h36v79sncqvy4gnnwmgq4bq73vfyrb7s1z5h3kvwhfx7jh349";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-input-acecad-1.2.2.tar.bz2;
+      sha256 = "0vpj6ll76iw2qmpyqdh318ixhyn30x9s5xnnimjcwyfmgryvnglm";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
   }) // {inherit inputproto randrproto xorgserver xproto ;};
     
   xf86inputaiptek = (stdenv.mkDerivation {
-    name = "xf86-input-aiptek-1.0.1";
+    name = "xf86-input-aiptek-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-aiptek-1.0.1.tar.bz2;
-      sha256 = "12n2zjxxppggl3pjs6ndi4yx7did88c6gqkszz13in1lj0jy7c1x";
-    };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
-    
-  xf86inputcalcomp = (stdenv.mkDerivation {
-    name = "xf86-input-calcomp-1.1.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-calcomp-1.1.0.tar.bz2;
-      sha256 = "01094hfk3x24m64w0khmk38cwsrplnrf672b228x6wpa9vkldi7b";
-    };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
-    
-  xf86inputcitron = (stdenv.mkDerivation {
-    name = "xf86-input-citron-2.2.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-citron-2.2.0.tar.bz2;
-      sha256 = "1zn3s90xf25vhvrp9imqzr9v7xx59g28dlpw740gi0x3sdasgkr6";
-    };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
-    
-  xf86inputdigitaledge = (stdenv.mkDerivation {
-    name = "xf86-input-digitaledge-1.1.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-digitaledge-1.1.0.tar.bz2;
-      sha256 = "0f4ap658852ya9876ydcbwbr1yjf7s308br1z3yc4nvbnhciy014";
-    };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
-    
-  xf86inputdmc = (stdenv.mkDerivation {
-    name = "xf86-input-dmc-1.1.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-dmc-1.1.0.tar.bz2;
-      sha256 = "0gs7j23w8ki6yvssfwcibdypx9kp29kd02y1n9khf4z0vyr8zjn5";
-    };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
-    
-  xf86inputdynapro = (stdenv.mkDerivation {
-    name = "xf86-input-dynapro-1.1.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-dynapro-1.1.0.tar.bz2;
-      sha256 = "0shdqpksmh3w5va0vw1jj3gd1fdln0yvgjskv9bzw9x0385xaapw";
-    };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
-    
-  xf86inputelo2300 = (stdenv.mkDerivation {
-    name = "xf86-input-elo2300-1.1.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-elo2300-1.1.0.tar.bz2;
-      sha256 = "0d11mbd4hxxgnb3d71camg558dmnyqgjs0sdlrkkhmy44izgclcm";
-    };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
-    
-  xf86inputelographics = (stdenv.mkDerivation {
-    name = "xf86-input-elographics-1.0.0.5";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-elographics-1.0.0.5.tar.bz2;
-      sha256 = "0adai0hs7imn4p7baw2vag5j264gkl42bfjxlqqmqw01g4jgil26";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-input-aiptek-1.1.1.tar.bz2;
+      sha256 = "0xsxm003yxlpzlvrh964jpb1d890fgcr9z3ihhxk74sv4yq1d491";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
   }) // {inherit inputproto randrproto xorgserver xproto ;};
     
   xf86inputevdev = (stdenv.mkDerivation {
-    name = "xf86-input-evdev-1.1.2";
+    name = "xf86-input-evdev-2.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-evdev-1.1.2.tar.bz2;
-      sha256 = "15avwy8isbqagzcdj20ngqajl22k40pssfx7vjirhrqyyq19fiwb";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-input-evdev-2.0.4.tar.bz2;
+      sha256 = "1jhmq1fl8dnrdqcbzrzq29gqjfxzcz7ivlhb3p5x942cmynxqnl2";
     };
-    buildInputs = [pkgconfig inputproto kbproto xorgserver xproto xrandr randrproto];
+    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
     preBuild = "
     sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c
     ";
-  }) // {inherit inputproto kbproto xorgserver xproto ;};
-    
-  xf86inputfpit = (stdenv.mkDerivation {
-    name = "xf86-input-fpit-1.1.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-fpit-1.1.0.tar.bz2;
-      sha256 = "1y4lys3s4qsr4afj7r23ldmjryx778ajb85x1x384qaij3gv5qwf";
-    };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
-    
-  xf86inputhyperpen = (stdenv.mkDerivation {
-    name = "xf86-input-hyperpen-1.1.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-hyperpen-1.1.0.tar.bz2;
-      sha256 = "14zl0zk301w8lvmkgxm4fqab9b66xprdqclqfls5cv7080rhmhni";
-    };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
-    
-  xf86inputjamstudio = (stdenv.mkDerivation {
-    name = "xf86-input-jamstudio-1.1.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-jamstudio-1.1.0.tar.bz2;
-      sha256 = "06kyclz260x2l5f0yn7449si8m6869dc5kvrdc1k3sh8pmhb6hff";
-    };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
   }) // {inherit inputproto randrproto xorgserver xproto ;};
     
   xf86inputjoystick = (stdenv.mkDerivation {
-    name = "xf86-input-joystick-1.2.3";
+    name = "xf86-input-joystick-1.3.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-joystick-1.2.3.tar.bz2;
-      sha256 = "1xslb7p3c0ihg36y402cphyhcwfar3nihv2n417sj4hf1z5033kh";
-    };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
-    
-  xf86inputkeyboard = (stdenv.mkDerivation {
-    name = "xf86-input-keyboard-1.2.2";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-keyboard-1.2.2.tar.bz2;
-      sha256 = "0wn0gv9mb5ld9mginiikn69jknc9wkwqn3dxjy6r405g9r93any2";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-input-joystick-1.3.2.tar.bz2;
+      sha256 = "0jqxjka9gsp90js6273gn01jmkjg9dvw1y94a9fcgpjl1a727bbc";
     };
     buildInputs = [pkgconfig inputproto kbproto randrproto xorgserver xproto ];
   }) // {inherit inputproto kbproto randrproto xorgserver xproto ;};
     
-  xf86inputmagellan = (stdenv.mkDerivation {
-    name = "xf86-input-magellan-1.1.0";
+  xf86inputkeyboard = (stdenv.mkDerivation {
+    name = "xf86-input-keyboard-1.3.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-magellan-1.1.0.tar.bz2;
-      sha256 = "0gc3lzq6pb807ffikld4a810asgj6z786wgd62ii71a21jsm9vwf";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-input-keyboard-1.3.1.tar.bz2;
+      sha256 = "0hmyyg4rxlm9y0jma324hiqrv1zb14zvqm9kx8nm38mmvwalflbv";
     };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
-    
-  xf86inputmagictouch = (stdenv.mkDerivation {
-    name = "xf86-input-magictouch-1.0.0.5";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-magictouch-1.0.0.5.tar.bz2;
-      sha256 = "0k24sy0wcv49xcm4jwfxq3c5xzla8zqviqzvfgs8js6qx4qwivcw";
-    };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
-    
-  xf86inputmicrotouch = (stdenv.mkDerivation {
-    name = "xf86-input-microtouch-1.1.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-microtouch-1.1.0.tar.bz2;
-      sha256 = "0f90r8drcpl6bvjibcc8q7svi8ra9gyrhhbl03yzpv4m2i9zb4kz";
-    };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
+    buildInputs = [pkgconfig inputproto kbproto randrproto xorgserver xproto ];
+  }) // {inherit inputproto kbproto randrproto xorgserver xproto ;};
     
   xf86inputmouse = (stdenv.mkDerivation {
-    name = "xf86-input-mouse-1.2.2";
+    name = "xf86-input-mouse-1.3.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-mouse-1.2.2.tar.bz2;
-      sha256 = "1pvyiv1xl38jacf7cc18sipz8b10mk9vqh11kcl72sq3n99cpsc0";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-input-mouse-1.3.0.tar.bz2;
+      sha256 = "1v4xzx6ng72vl2jakdz1kjm5k7n78p2qpkhlay3c55b76qzjajq5";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
   }) // {inherit inputproto randrproto xorgserver xproto ;};
     
-  xf86inputmutouch = (stdenv.mkDerivation {
-    name = "xf86-input-mutouch-1.1.0";
+  xf86inputsynaptics = (stdenv.mkDerivation {
+    name = "xf86-input-synaptics-0.15.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-mutouch-1.1.0.tar.bz2;
-      sha256 = "1sk23d6jw63l19c0j26qplwmfb0kfnwl5zhbixwqvk2g9zfy0ryc";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-input-synaptics-0.15.0.tar.bz2;
+      sha256 = "12swi6sprhpy3k0wx2f6b0rdmgy2571r08zip1gga7d1fp1q3m77";
     };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
-    
-  xf86inputpalmax = (stdenv.mkDerivation {
-    name = "xf86-input-palmax-1.1.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-palmax-1.1.0.tar.bz2;
-      sha256 = "0ia1mhp318bk292iszqyz25fns7sq8hjzvib6rssal19xmgch02w";
-    };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
-    
-  xf86inputpenmount = (stdenv.mkDerivation {
-    name = "xf86-input-penmount-1.2.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-penmount-1.2.0.tar.bz2;
-      sha256 = "03hmcvvlkk56aldbpqxyv7vi9pbnyip1zyhwk2yffncgrw3qm8fy";
-    };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
-    
-  xf86inputspaceorb = (stdenv.mkDerivation {
-    name = "xf86-input-spaceorb-1.1.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-spaceorb-1.1.0.tar.bz2;
-      sha256 = "0588bwr7m03w61p5h7pixaa9nlsrijld6cr2yzriyh5z36vkrmcw";
-    };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
-    
-  xf86inputsumma = (stdenv.mkDerivation {
-    name = "xf86-input-summa-1.1.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-summa-1.1.0.tar.bz2;
-      sha256 = "1whi5azynj1vv1yiqi47szs0ac0fj5zwh040cnrl02qjsjnjq3zi";
-    };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
-    
-  xf86inputtek4957 = (stdenv.mkDerivation {
-    name = "xf86-input-tek4957-1.1.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-tek4957-1.1.0.tar.bz2;
-      sha256 = "09spw5gvyj8p2alqazhmp1xrjx8xdv2jnfbjk3vampmi3dnm1f89";
-    };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
-    
-  xf86inputur98 = (stdenv.mkDerivation {
-    name = "xf86-input-ur98-1.1.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-ur98-1.1.0.tar.bz2;
-      sha256 = "0aj7qvpbfk3hfwlx9qqp0rkfdlpf75jxc0yf93a35aajznqcwjr1";
-    };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
+    buildInputs = [pkgconfig inputproto randrproto libX11 xorgserver xproto ];
+  }) // {inherit inputproto randrproto libX11 xorgserver xproto ;};
     
   xf86inputvmmouse = (stdenv.mkDerivation {
-    name = "xf86-input-vmmouse-12.4.1";
+    name = "xf86-input-vmmouse-12.5.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-vmmouse-12.4.1.tar.bz2;
-      sha256 = "1vxlf64hxy4sha293axrhgxwdvqwjsql22cr0zpngdn4rxlspln7";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-input-vmmouse-12.5.1.tar.bz2;
+      sha256 = "1yzwgc5cac60zmhsw1npgn81sl06qda80bd0p6nixw1qf6h8nq33";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
   }) // {inherit inputproto randrproto xorgserver xproto ;};
     
   xf86inputvoid = (stdenv.mkDerivation {
-    name = "xf86-input-void-1.1.0";
+    name = "xf86-input-void-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-void-1.1.0.tar.bz2;
-      sha256 = "1r5h92v5f3gis7395c1w9h1byf5q383xscd1l6v0dg911295sg5l";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-input-void-1.1.1.tar.bz2;
+      sha256 = "0kxw5l0r4vp4xhfyb781lr9fmkjgv27yibhd3gaxjgvs4vb65q6x";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
   }) // {inherit inputproto randrproto xorgserver xproto ;};
@@ -1931,337 +1391,307 @@ rec {
     name = "xf86miscproto-0.9.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86miscproto-0.9.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xf86miscproto-0.9.2.tar.bz2;
       sha256 = "1rnnv8vi5z457wl5j184qw1z3ai3mvbwssdshm3ysgf736zlraxa";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
     
-  xf86rushproto = (stdenv.mkDerivation {
-    name = "xf86rushproto-1.1.2";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86rushproto-1.1.2.tar.bz2;
-      sha256 = "1bm3d7ck33y4gkvk7cc7djrnd9w7v4sm73xjnl9n6b8zahvv5n87";
-    };
-    buildInputs = [pkgconfig ];
-  }) // {inherit ;};
-    
   xf86videoapm = (stdenv.mkDerivation {
-    name = "xf86-video-apm-1.1.1";
+    name = "xf86-video-apm-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-apm-1.1.1.tar.bz2;
-      sha256 = "1v6wcl47b3lhik1fs221wx2zcn5006rn09dyiqgi8kxr637ydmq9";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-apm-1.2.0.tar.bz2;
+      sha256 = "11b119a07w947hasvpmpzwmnfchv58qqc329d9lklvifi47h5zph";
     };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
     
   xf86videoark = (stdenv.mkDerivation {
-    name = "xf86-video-ark-0.6.0";
+    name = "xf86-video-ark-0.7.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-ark-0.6.0.tar.bz2;
-      sha256 = "1mw4ph6y4cijb8azsjjy4f35gw4na58m5w3kaxnyag34mvsc9az5";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-ark-0.7.0.tar.bz2;
+      sha256 = "153mynydgb1sa9xn0dvm5ynbsilkl2x9aj3dbz0kggps8lqffrcf";
     };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
     
   xf86videoast = (stdenv.mkDerivation {
-    name = "xf86-video-ast-0.81.0";
+    name = "xf86-video-ast-0.85.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-ast-0.81.0.tar.bz2;
-      sha256 = "1f2r4j85792b81axil3h4fy2s44i5gp4r4c23h2jivwvz2m56mdr";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-ast-0.85.0.tar.bz2;
+      sha256 = "0a2v91v61zn31ih0fizmsd3mz7f767xk7bbs0df8jvc6wj2gy64h";
     };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
     
   xf86videoati = (stdenv.mkDerivation {
-    name = "xf86-video-ati-6.6.3";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-ati-6.6.3.tar.bz2;
-      sha256 = "102p6nz1jvd3pgbl83a4zi99smydqr6il61r33l0lqmi3yg452nh";
-    };
-    buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto glproto mesaHeaders];
-  }) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;};
-    
-  xf86videoati_680 = (stdenv.mkDerivation {
-    name = "xf86-video-ati-6.8.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://xorg.freedesktop.org/archive/individual/driver/xf86-video-ati-6.8.0.tar.bz2;
-      sha256 = "1fjgcrvb5f1awfd52a5h45l80mk6hqzcdvj1i71mrll57hg8aqrq";
-    };
-    buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto mesaHeaders glproto ];
-  }) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto mesaHeaders glproto;};
-    
-  xf86videoati_690 = (stdenv.mkDerivation {
     name = "xf86-video-ati-6.9.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://xorg.freedesktop.org/archive/individual/driver/xf86-video-ati-6.9.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-ati-6.9.0.tar.bz2;
       sha256 = "1hnp2da1asj6ql4a1i2j20mffix255sx08ixv0nijv1qdj8x2b38";
     };
-    buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto mesaHeaders glproto ];
-  }) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto mesaHeaders glproto;};
+    buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ];
+  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;};
     
   xf86videochips = (stdenv.mkDerivation {
-    name = "xf86-video-chips-1.1.1";
+    name = "xf86-video-chips-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-chips-1.1.1.tar.bz2;
-      sha256 = "153lpk2jm6amxag4i8zrpjnk0mfpq1wx49ikdj9pc49idgdira0n";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-chips-1.2.0.tar.bz2;
+      sha256 = "16ag3n052rj275q10sf7j9dz1nxq43szlf5pd3x6mqrvn94qrwq5";
     };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
     
   xf86videocirrus = (stdenv.mkDerivation {
-    name = "xf86-video-cirrus-1.1.0";
+    name = "xf86-video-cirrus-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-cirrus-1.1.0.tar.bz2;
-      sha256 = "06wv2yqr7jalk6znwqdnidjxy1glwhwjk5d6yrs340fmk4hrd22r";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-cirrus-1.2.1.tar.bz2;
+      sha256 = "175vg2gi149awz6jfnj1d51yq3s3ka2pbn75ysnmzpr6cgb9xjg7";
     };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;};
-    
-  xf86videocyrix = (stdenv.mkDerivation {
-    name = "xf86-video-cyrix-1.1.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-cyrix-1.1.0.tar.bz2;
-      sha256 = "1bd65iyacnw76nm9znxmfgvjddbbpn346y55rc3xkpgnw1w6g9nn";
-    };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xf86dgaproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
     
   xf86videodummy = (stdenv.mkDerivation {
-    name = "xf86-video-dummy-0.2.0";
+    name = "xf86-video-dummy-0.3.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-dummy-0.2.0.tar.bz2;
-      sha256 = "04690qg07v01d8ncz5ws651i8scyqsmh7mf50mg1lg3gd62kh0a6";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-dummy-0.3.0.tar.bz2;
+      sha256 = "0y52605g48wqpp138is2wfckdgk4w7v5x7hm7fv4nczhnzhbsjss";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
   }) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;};
     
   xf86videofbdev = (stdenv.mkDerivation {
-    name = "xf86-video-fbdev-0.3.1";
+    name = "xf86-video-fbdev-0.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-fbdev-0.3.1.tar.bz2;
-      sha256 = "1rznknqy3r0jr1xy3186j120qybpjnq4apf0jjj9wmbpiihiz79h";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-fbdev-0.4.0.tar.bz2;
+      sha256 = "179mmh0dzsq1y5i9y7sqr162r9wamslmaa5rya1knc9axgd2b9xv";
     };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;};
+    
+  xf86videogeode = (stdenv.mkDerivation {
+    name = "xf86-video-geode-2.10.1";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-geode-2.10.1.tar.bz2;
+      sha256 = "0l66m0cc2ywwsgbx844gfdywc141gdjzyvpknavw3qh2whcghvlv";
+    };
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
     
   xf86videoglide = (stdenv.mkDerivation {
-    name = "xf86-video-glide-1.0.0";
+    name = "xf86-video-glide-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-glide-1.0.0.tar.bz2;
-      sha256 = "1bsynd01sjz3pp9lkphiiln0nwkjy5fyywymfr1x617r1216szb6";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-glide-1.0.1.tar.bz2;
+      sha256 = "1cv4bwgbv37c0b1nm45pkmfjz07aj01qym2yw1r39z6qxja6hqrb";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
   }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
     
   xf86videoglint = (stdenv.mkDerivation {
-    name = "xf86-video-glint-1.1.1";
+    name = "xf86-video-glint-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-glint-1.1.1.tar.bz2;
-      sha256 = "0vay25kisr8lpmqnl9z3fglw341yr25ad4sij7qvmknfyp9hsgnn";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-glint-1.2.1.tar.bz2;
+      sha256 = "1nhwpv37h5790j3a08frwpy9m9p77376393w06i4h1bx2b9805qn";
     };
-    buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xorgserver xproto ];
+  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xorgserver xproto ;};
     
   xf86videoi128 = (stdenv.mkDerivation {
-    name = "xf86-video-i128-1.2.1";
+    name = "xf86-video-i128-1.3.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-i128-1.2.1.tar.bz2;
-      sha256 = "1cay0pyvbwljaf4x6n9gr4398fann5779mgwiv6l2hhkz2n3q0hd";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-i128-1.3.1.tar.bz2;
+      sha256 = "0xcspy2r8fy8daq47m1w3jrg92210x5m6gyjs1scvsslari27fs9";
     };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
     
   xf86videoi740 = (stdenv.mkDerivation {
-    name = "xf86-video-i740-1.1.0";
+    name = "xf86-video-i740-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-i740-1.1.0.tar.bz2;
-      sha256 = "1idpw8s8wz69qcw0kr3p1826viy17yj3mvkpnkw192kxk1619wmq";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-i740-1.2.0.tar.bz2;
+      sha256 = "0vs831gnbfvlyqlxrmanjvdfy653460zzgr03hy07vsv8vpgdj2r";
     };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
     
-  xf86videoi810 = (stdenv.mkDerivation {
-    name = "xf86-video-i810-1.7.4";
+  xf86videoimpact = (stdenv.mkDerivation {
+    name = "xf86-video-impact-0.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/individual/driver/xf86-video-i810-1.7.4.tar.bz2;
-      sha256 = "0na2qy78waa9jy0ikd10g805v0w048icnkdcss6yd753kffdi37z";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-impact-0.2.0.tar.bz2;
+      sha256 = "08h007qrz4k7pi6gcwfa5h35yfc6c18c6dwfxc32bx0vnhis2a0m";
     };
-    buildInputs = [pkgconfig fontsproto glproto libdrm mesaHeaders randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ];
-  }) // {inherit fontsproto glproto libdrm mesaHeaders randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ;};
-    
-  xf86videoimstt = (stdenv.mkDerivation {
-    name = "xf86-video-imstt-1.1.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-imstt-1.1.0.tar.bz2;
-      sha256 = "0zgv20zj4gr4sv93ffl3zzsy446041zrs13wndxdsdwlgwjw4f4j";
-    };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
+    buildInputs = [pkgconfig xorgserver xproto ];
+  }) // {inherit xorgserver xproto ;};
     
   xf86videointel = (stdenv.mkDerivation {
-    name = "xf86-video-intel-2.1.1";
+    name = "xf86-video-intel-2.4.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-intel-2.1.1.tar.bz2;
-      sha256 = "0765spq3ksw15hn9mia1sbznainnb2w6zlkgwmdv7d4srjr1awjg";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-intel-2.4.2.tar.bz2;
+      sha256 = "0jz6k5zdmhwjznn9hgyq8hmylaf723igvijqabm0kvgzjcgckzas";
     };
-    buildInputs = [pkgconfig fontsproto glproto libdrm mesaHeaders randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ];
-  }) // {inherit fontsproto glproto libdrm mesaHeaders randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ;};
+    buildInputs = [pkgconfig fontsproto mesa glproto libdrm libpciaccess randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ];
+  }) // {inherit fontsproto mesa glproto libdrm libpciaccess randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ;};
+    
+  xf86videomach64 = (stdenv.mkDerivation {
+    name = "xf86-video-mach64-6.8.0";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-mach64-6.8.0.tar.bz2;
+      sha256 = "18g1hk9nq0zlinhw4vz3i9lhh9nql0w5x5lh1bh5j5rmipw1d9pv";
+    };
+    buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ];
+  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;};
     
   xf86videomga = (stdenv.mkDerivation {
-    name = "xf86-video-mga-1.4.6.1";
+    name = "xf86-video-mga-1.4.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-mga-1.4.6.1.tar.bz2;
-      sha256 = "1z7xmyyx2wy69w59cnzir03h4ydhcramzn7rqli428fci30fib57";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-mga-1.4.9.tar.bz2;
+      sha256 = "1h7xs340q9vzdb6ck2z9c9fnxx3nfpxk58k7444n9w2j60rd4zfm";
     };
-    buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
+  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
     
   xf86videoneomagic = (stdenv.mkDerivation {
-    name = "xf86-video-neomagic-1.1.1";
+    name = "xf86-video-neomagic-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-neomagic-1.1.1.tar.bz2;
-      sha256 = "11lav16j3ymn2sra0zdx5ql7hxa5sjpprpgycfv8b0kvjs070jfn";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-neomagic-1.2.1.tar.bz2;
+      sha256 = "19g08nw8crbhkcm50i4n0vwkdhrazwilfp3kdkvp8qarg19qvqwn";
     };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
     
   xf86videonewport = (stdenv.mkDerivation {
     name = "xf86-video-newport-0.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-newport-0.2.1.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-newport-0.2.1.tar.bz2;
       sha256 = "026fn4c760rr03i2r9pq824k31nxq5nq0xq582bgh3k9a9a8bb36";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ];
   }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;};
     
-  xf86videonsc = (stdenv.mkDerivation {
-    name = "xf86-video-nsc-2.8.3";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-nsc-2.8.3.tar.bz2;
-      sha256 = "0f8qicx3b5ibi2y62lmc3r7y093366b61h1rxrdrgf3p301a5ig5";
-    };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
-    
   xf86videonv = (stdenv.mkDerivation {
-    name = "xf86-video-nv-2.1.3";
+    name = "xf86-video-nv-2.1.12";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-nv-2.1.3.tar.bz2;
-      sha256 = "0llrjrfm68x7s274m7q5q49qh59ks75kwzqyhbvij6f36yhmx6wd";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-nv-2.1.12.tar.bz2;
+      sha256 = "07h1aih3gy9vpfqhs2wi1xjjk8jkijc31p3a7kfnjhvc5ys2nvgm";
     };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;};
-
-  xf86videoradeonhd = (stdenv.mkDerivation {
-    name = "xf86-video-radeonhd-1.2.1";
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+    
+  xf86videoopenchrome = (stdenv.mkDerivation {
+    name = "xf86-video-openchrome-0.2.903";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/individual/driver/xf86-video-radeonhd-1.2.1.tar.bz2;
-      sha256 = "125ki9wan5zf1vpn0mv5w95f9fp7l1paks34bhb4alsff76yh1if";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-openchrome-0.2.903.tar.bz2;
+      sha256 = "043lvcvdkhyb5jp2m0ggd0r0gxndjwh2qnj8wbx2hr2wdf6qbr5p";
     };
-    buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto glproto mesaHeaders];
-  }) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ];
+  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ;};
+    
+  xf86videor128 = (stdenv.mkDerivation {
+    name = "xf86-video-r128-6.8.0";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-r128-6.8.0.tar.bz2;
+      sha256 = "0ysnarxh4qz9hjk9zcgzb01w9whfgaq86a71prr9577f9xqwm2an";
+    };
+    buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ];
+  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;};
     
   xf86videorendition = (stdenv.mkDerivation {
-    name = "xf86-video-rendition-4.1.3";
+    name = "xf86-video-rendition-4.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-rendition-4.1.3.tar.bz2;
-      sha256 = "0224vz4v96y5lbxqp1hnvqwp9jwh67ad1brvb9glhrkl5zvsxrrp";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-rendition-4.2.0.tar.bz2;
+      sha256 = "05dfm9zlqnm89xmnx98rf3yrqi0i6frk23hpk6kk8xfq0zvn4yxm";
     };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
     
   xf86videos3 = (stdenv.mkDerivation {
-    name = "xf86-video-s3-0.5.0";
+    name = "xf86-video-s3-0.6.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-s3-0.5.0.tar.bz2;
-      sha256 = "15swq2wkccraj6xv3wrqh69283ixj7clfr91h64as2i03b5hc4ja";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-s3-0.6.0.tar.bz2;
+      sha256 = "0ry0ys83vzwkg9rwg2yc0zflkmkiz54kny33spfmyh0gidjf81zd";
     };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
     
   xf86videos3virge = (stdenv.mkDerivation {
-    name = "xf86-video-s3virge-1.9.1";
+    name = "xf86-video-s3virge-1.10.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-s3virge-1.9.1.tar.bz2;
-      sha256 = "08n89fl97rpk5mzwfjl4kyj5syhz4k02sixip1zp77plcclp1xff";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-s3virge-1.10.1.tar.bz2;
+      sha256 = "12lp988y1gqgs3imj44vjm8wf9y7grqk4ww8rxbwjwzg45b1354h";
     };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
     
   xf86videosavage = (stdenv.mkDerivation {
-    name = "xf86-video-savage-2.1.3";
+    name = "xf86-video-savage-2.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-savage-2.1.3.tar.bz2;
-      sha256 = "1i9w3ami0brwim7v9p3nawnr2qsx16vxclqlbn9lbd3w6zgm9wgm";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-savage-2.2.1.tar.bz2;
+      sha256 = "0zm3v0v2qbwldns6lvvhn4mhdvvf91hrwk0wqlk27xxs1yp5rydd";
     };
-    buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
+  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
     
   xf86videosiliconmotion = (stdenv.mkDerivation {
-    name = "xf86-video-siliconmotion-1.4.2";
+    name = "xf86-video-siliconmotion-1.6.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-siliconmotion-1.4.2.tar.bz2;
-      sha256 = "1pazl8m6gh60sv92p57ldnd8ixwk9k3mw2r62ai44hs51j960ym4";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-siliconmotion-1.6.0.tar.bz2;
+      sha256 = "0lvy05jhj2csrn36hvffzzll63bk706mgf090mvs1fddqswh2lyc";
     };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
     
   xf86videosis = (stdenv.mkDerivation {
-    name = "xf86-video-sis-0.9.3";
+    name = "xf86-video-sis-0.10.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-sis-0.9.3.tar.bz2;
-      sha256 = "1xin2hcjjwj2810h7kxhkmqq841plbsvk0swmjl9py7z2vxyi3l9";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-sis-0.10.0.tar.bz2;
+      sha256 = "0h2b1qk65mzahwir12b20rq16ayivhlsvq3n0r8c5726bpgdrh5w";
     };
-    buildInputs = [pkgconfig fontsproto glproto libdrm mesaHeaders randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ];
-  }) // {inherit fontsproto glproto libdrm mesaHeaders randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto mesa glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ];
+  }) // {inherit fontsproto mesa glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;};
     
   xf86videosisusb = (stdenv.mkDerivation {
-    name = "xf86-video-sisusb-0.8.1";
+    name = "xf86-video-sisusb-0.9.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-sisusb-0.8.1.tar.bz2;
-      sha256 = "1js5vf5xjxpi0nb0bpjc1glbx2l0fq1wqmnlwayn6cp3nfdbg5hm";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-sisusb-0.9.0.tar.bz2;
+      sha256 = "02lk6x8xf53p69kdzjwxkb9szi1n16znji9mwpibhd9vgndrrdvn";
     };
-    buildInputs = [pkgconfig fontsproto glproto mesaHeaders randrproto renderproto videoproto xextproto xf86miscproto xineramaproto xorgserver xproto ];
-  }) // {inherit fontsproto glproto mesaHeaders randrproto renderproto videoproto xextproto xf86miscproto xineramaproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto mesa glproto randrproto renderproto videoproto xextproto xf86miscproto xineramaproto xorgserver xproto ];
+  }) // {inherit fontsproto mesa glproto randrproto renderproto videoproto xextproto xf86miscproto xineramaproto xorgserver xproto ;};
     
   xf86videosunbw2 = (stdenv.mkDerivation {
     name = "xf86-video-sunbw2-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-sunbw2-1.1.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-sunbw2-1.1.0.tar.bz2;
       sha256 = "0dl16ccbzzy0dchxzv4g7qjc59a2875c4lb68yn733xd87lp846p";
     };
     buildInputs = [pkgconfig randrproto xorgserver xproto ];
@@ -2271,7 +1701,7 @@ rec {
     name = "xf86-video-suncg14-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-suncg14-1.1.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-suncg14-1.1.0.tar.bz2;
       sha256 = "09q5wjay9mn9msskawv4i5in3chqwv1a0qp4z54xn9g7f04jpjhy";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
@@ -2281,7 +1711,7 @@ rec {
     name = "xf86-video-suncg3-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-suncg3-1.1.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-suncg3-1.1.0.tar.bz2;
       sha256 = "1ybxqf8z8q3r12s6pm1ygv0wffp9h7c6d4am8qnqgsnzrk4fnr1m";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
@@ -2291,28 +1721,28 @@ rec {
     name = "xf86-video-suncg6-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-suncg6-1.1.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-suncg6-1.1.0.tar.bz2;
       sha256 = "0jqr6xjs6i8lb40qyiqnyrfzmy9ch53jhjr0w20m5vspkjvz7cfn";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
   }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
     
   xf86videosunffb = (stdenv.mkDerivation {
-    name = "xf86-video-sunffb-1.1.0";
+    name = "xf86-video-sunffb-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-sunffb-1.1.0.tar.bz2;
-      sha256 = "0achhw5gskairc2gjqms64qyni7ai8ly6917v1grdxiwx0ks95zq";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-sunffb-1.2.0.tar.bz2;
+      sha256 = "14lj0myf4dbd8c02qwgli6lj7rwlhv2q2d3krsqdd94r4gygiwjr";
     };
     buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto xextproto xf86driproto xorgserver xproto ];
   }) // {inherit fontsproto libdrm randrproto renderproto xextproto xf86driproto xorgserver xproto ;};
     
   xf86videosunleo = (stdenv.mkDerivation {
-    name = "xf86-video-sunleo-1.1.0";
+    name = "xf86-video-sunleo-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-sunleo-1.1.0.tar.bz2;
-      sha256 = "1a8d4y9v6gpbdmd3pl8qgklxw93v631wkafjvk4rpshv4q7xa15m";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-sunleo-1.2.0.tar.bz2;
+      sha256 = "01kffjbshmwix2cdb95j0cx2qmrss6yfjj7y5qssw83h36bvw5dk";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
   }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
@@ -2321,217 +1751,157 @@ rec {
     name = "xf86-video-suntcx-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-suntcx-1.1.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-suntcx-1.1.0.tar.bz2;
       sha256 = "1kq1gg273x460rin8gh5spl7yhyv23b4795by46zcimph4wnm63j";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
   }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
     
   xf86videotdfx = (stdenv.mkDerivation {
-    name = "xf86-video-tdfx-1.3.0";
+    name = "xf86-video-tdfx-1.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-tdfx-1.3.0.tar.bz2;
-      sha256 = "0946f977bc78gcwv8qzbyd20g5bqylc6yz7h11yq2a4nbkgh06kb";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-tdfx-1.4.0.tar.bz2;
+      sha256 = "1bfy02461j3r48b1xf5vbpkgncha33bi0fr43z79xr7j4k9hdgn3";
     };
-    buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
+  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
     
   xf86videotga = (stdenv.mkDerivation {
-    name = "xf86-video-tga-1.1.0";
+    name = "xf86-video-tga-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-tga-1.1.0.tar.bz2;
-      sha256 = "16vfzahrcaw1fpgm28j2anzhfm4di6j1h5glq96i3zarsbyks52h";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-tga-1.2.0.tar.bz2;
+      sha256 = "19mfy468brrp75gy3y0bnyq1jmqdllq9z6kicpj8nc911snqqbx9";
     };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
     
   xf86videotrident = (stdenv.mkDerivation {
-    name = "xf86-video-trident-1.2.3";
+    name = "xf86-video-trident-1.3.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-trident-1.2.3.tar.bz2;
-      sha256 = "1594fbbax5gv5i01i2k0c7bir83h1kbdqqysckgqs8sx2vxbhgnj";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-trident-1.3.0.tar.bz2;
+      sha256 = "1dfxscqv03b65p6jq2lzzyq3ihyx26i85rqh3wn3rsgn8sgnrxm4";
     };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
     
   xf86videotseng = (stdenv.mkDerivation {
-    name = "xf86-video-tseng-1.1.1";
+    name = "xf86-video-tseng-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-tseng-1.1.1.tar.bz2;
-      sha256 = "0vnmvxngshp4912zjf7bjx7954xbph03swxwd202ddqmhwqz7hf9";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-tseng-1.2.0.tar.bz2;
+      sha256 = "1qxi325a4cr8bjhnw6c3pb960kxcl1k0q39kmh090cil148dk40h";
     };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
     
   xf86videov4l = (stdenv.mkDerivation {
-    name = "xf86-video-v4l-0.1.1";
+    name = "xf86-video-v4l-0.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-v4l-0.1.1.tar.bz2;
-      sha256 = "0w68msn8vb1k03mc5sy2cinvral35lzlz5nrb1zxma7nlfg59b9k";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-v4l-0.2.0.tar.bz2;
+      sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb";
     };
     buildInputs = [pkgconfig randrproto videoproto xorgserver xproto ];
   }) // {inherit randrproto videoproto xorgserver xproto ;};
     
   xf86videovermilion = (stdenv.mkDerivation {
-    name = "xf86-video-vermilion-1.0.0";
+    name = "xf86-video-vermilion-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-vermilion-1.0.0.tar.bz2;
-      sha256 = "1vr7vfc35x8dd3ra66i5x2xyycl3ydh98wipz7ks4dkkgs4rh39z";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-vermilion-1.0.1.tar.bz2;
+      sha256 = "12qdk0p2r0pbmsl8fkgwhfh7szvb20yjaay88jlvb89rsbc4rssg";
     };
     buildInputs = [pkgconfig fontsproto renderproto xextproto xf86dgaproto xorgserver xproto ];
   }) // {inherit fontsproto renderproto xextproto xf86dgaproto xorgserver xproto ;};
     
   xf86videovesa = (stdenv.mkDerivation {
-    name = "xf86-video-vesa-1.3.0";
+    name = "xf86-video-vesa-2.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-vesa-1.3.0.tar.bz2;
-      sha256 = "00z2jg409gyn6gkagdrs7la83qmj6k3w9nj4yg73w4pmh6p80v5r";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-vesa-2.0.0.tar.bz2;
+      sha256 = "0rg1q7ymnz0vl56wp792kkcr7qn88x5vrf3z43m2wmapjr12w2zj";
     };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
-    
-  xf86videovga = (stdenv.mkDerivation {
-    name = "xf86-video-vga-4.1.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-vga-4.1.0.tar.bz2;
-      sha256 = "0havz5hv46qz3g6g0mq2568758apdapzy0yd5ny8qs06yz0g89fa";
-    };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
-    
-  xf86videovia = (stdenv.mkDerivation {
-    name = "xf86-video-via-0.2.2";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-via-0.2.2.tar.bz2;
-      sha256 = "0qn89m1s50m4jajw95wcidarknyxn19h8696dbkgwy21cjpvs9jh";
-    };
-    buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ];
-  }) // {inherit fontsproto libdrm randrproto renderproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ;};
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
     
   xf86videovmware = (stdenv.mkDerivation {
-    name = "xf86-video-vmware-10.14.1";
+    name = "xf86-video-vmware-10.16.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-vmware-10.14.1.tar.bz2;
-      sha256 = "1aaghvwy7wnk4pkmxym5cw8w499wqi293nqyc71h8hm5dcszsw8r";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-vmware-10.16.5.tar.bz2;
+      sha256 = "0rj32zsn8p61vxg01rzgvnjby4xpjg6cmxiy11v61cq6v2zrlkiy";
     };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xineramaproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto xextproto xineramaproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;};
     
   xf86videovoodoo = (stdenv.mkDerivation {
-    name = "xf86-video-voodoo-1.1.1";
+    name = "xf86-video-voodoo-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-voodoo-1.1.1.tar.bz2;
-      sha256 = "073mc423wql4w72dbwf73lzr3k0pdxc9drnzs2xb4x76mqdn0x9r";
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-voodoo-1.2.0.tar.bz2;
+      sha256 = "132bgkj2jans4psp0pw4326dgwj7dx9prqwb1z07019hskasd6xp";
     };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xf86dgaproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;};
+    
+  xf86videowsfb = (stdenv.mkDerivation {
+    name = "xf86-video-wsfb-0.2.1";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-wsfb-0.2.1.tar.bz2;
+      sha256 = "0j6ij0yzz7car00x8h3xpmz2s86apvkvk0lcl9hzaffr2ym5iqrr";
+    };
+    buildInputs = [pkgconfig xorgserver xproto ];
+  }) // {inherit xorgserver xproto ;};
+    
+  xf86videoxgi = (stdenv.mkDerivation {
+    name = "xf86-video-xgi-1.5.0";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-xgi-1.5.0.tar.bz2;
+      sha256 = "154ilsc7vaphfh5ab5iy27pwdswbynsshkblji2c0h49xqr39cjz";
+    };
+    buildInputs = [pkgconfig fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ];
+  }) // {inherit fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ;};
+    
+  xf86videoxgixp = (stdenv.mkDerivation {
+    name = "xf86-video-xgixp-1.7.99.3";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/X11R7.4/src/everything/xf86-video-xgixp-1.7.99.3.tar.bz2;
+      sha256 = "1n5v9wcdfp3k3r1xhicg2cw0xr73y3wciagpif7apl7awf76b88k";
+    };
+    buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
+  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
     
   xf86vidmodeproto = (stdenv.mkDerivation {
     name = "xf86vidmodeproto-2.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86vidmodeproto-2.2.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xf86vidmodeproto-2.2.2.tar.bz2;
       sha256 = "0vnrqhzrsyjh77zgrxlgx53r34dij15crpl9369wb7n71jcjy587";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
     
-  xfd = (stdenv.mkDerivation {
-    name = "xfd-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xfd-1.0.1.tar.bz2;
-      sha256 = "07ifbsdany081g6wip0mfq5s2xcdl69p76xnk9rxca84g0bal6qi";
-    };
-    buildInputs = [pkgconfig fontconfig freetype libXaw libXft libXt ];
-  }) // {inherit fontconfig freetype libXaw libXft libXt ;};
-    
-  xfindproxy = (stdenv.mkDerivation {
-    name = "xfindproxy-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xfindproxy-1.0.1.tar.bz2;
-      sha256 = "1sl836x5dbjp6ipin67i0ikrv1l5whvhin3pw4rv85ryvpm5qn3b";
-    };
-    buildInputs = [pkgconfig libICE libX11 xproxymanagementprotocol libXt ];
-  }) // {inherit libICE libX11 xproxymanagementprotocol libXt ;};
-    
-  xfontsel = (stdenv.mkDerivation {
-    name = "xfontsel-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xfontsel-1.0.1.tar.bz2;
-      sha256 = "0zsc9a4n4wpy6g6ajpjcqr277zy9anzhiyaal2cc7dz0gc62mjjy";
-    };
-    buildInputs = [pkgconfig libXaw libXt ];
-  }) // {inherit libXaw libXt ;};
-    
-  xfs = (stdenv.mkDerivation {
-    name = "xfs-1.0.4";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xfs-1.0.4.tar.bz2;
-      sha256 = "06v4xrs2br8h8ailaphfbb2w2yf50xap7fdlihmmmbn74clxwba5";
-    };
-    buildInputs = [pkgconfig libFS libXfont xtrans ];
-  }) // {inherit libFS libXfont xtrans ;};
-    
-  xfsinfo = (stdenv.mkDerivation {
-    name = "xfsinfo-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xfsinfo-1.0.1.tar.bz2;
-      sha256 = "1n8csr613bnq9kkspqg0113z548498005rvx83939wx7nd1k9hxd";
-    };
-    buildInputs = [pkgconfig libFS libX11 ];
-  }) // {inherit libFS libX11 ;};
-    
-  xfwp = (stdenv.mkDerivation {
-    name = "xfwp-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xfwp-1.0.1.tar.bz2;
-      sha256 = "14vdkawdw2lxyx4r6ij2vlcx9ba1frw2d2l007fqc866afsfrmnd";
-    };
-    buildInputs = [pkgconfig libICE libX11 xproxymanagementprotocol ];
-  }) // {inherit libICE libX11 xproxymanagementprotocol ;};
-    
   xgamma = (stdenv.mkDerivation {
     name = "xgamma-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xgamma-1.0.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xgamma-1.0.2.tar.bz2;
       sha256 = "07plrky99vwp13463zbp2fqmyfqkvmxc2ra8iypfy2n61wimngax";
     };
     buildInputs = [pkgconfig libX11 libXxf86vm ];
   }) // {inherit libX11 libXxf86vm ;};
     
-  xgc = (stdenv.mkDerivation {
-    name = "xgc-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xgc-1.0.1.tar.bz2;
-      sha256 = "14qh1qbqh89aa8xyq6zc6qxk9cpnhm0a6axs5nms8qjgqg3dzbbw";
-    };
-    buildInputs = [pkgconfig libXaw libXt ];
-  }) // {inherit libXaw libXt ;};
-    
   xhost = (stdenv.mkDerivation {
     name = "xhost-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xhost-1.0.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xhost-1.0.2.tar.bz2;
       sha256 = "1dhdm6dz2jcnb08qlrjn2g1mzv3gfbyq6yqg9kjmh3r3kp22razd";
     };
     buildInputs = [pkgconfig libX11 libXau libXmu ];
@@ -2541,28 +1911,28 @@ rec {
     name = "xineramaproto-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xineramaproto-1.1.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xineramaproto-1.1.2.tar.bz2;
       sha256 = "0409qj8wdl1c3jchrqvdkl63s8r08gni4xhlxngkpz5wmwf2p9p8";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
     
-  xinit = (stdenv.mkDerivation {
-    name = "xinit-1.0.5";
+  xinput = (stdenv.mkDerivation {
+    name = "xinput-1.3.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xinit-1.0.5.tar.bz2;
-      sha256 = "0bf6y622c0d3i40ch65rs88fjhys1229kdshcy71q91dyf1m5mcm";
+      url = mirror://xorg/X11R7.4/src/everything/xinput-1.3.0.tar.bz2;
+      sha256 = "0i9fh3flmigv7smfg879969kckw0c1h4ab0n3h9mdwmbi18kw31k";
     };
-    buildInputs = [pkgconfig libX11 ];
-  }) // {inherit libX11 ;};
+    buildInputs = [pkgconfig inputproto libX11 libXext libXi ];
+  }) // {inherit inputproto libX11 libXext libXi ;};
     
   xkbcomp = (stdenv.mkDerivation {
-    name = "xkbcomp-1.0.3";
+    name = "xkbcomp-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xkbcomp-1.0.3.tar.bz2;
-      sha256 = "05n7mvw50v575kzsma1f3zp3l8gs2jp7ax4rpbmk7jg3vbjvld86";
+      url = mirror://xorg/X11R7.4/src/everything/xkbcomp-1.0.5.tar.bz2;
+      sha256 = "1h809xl9kpx0r9ynvjfk7wy6rx8pgl1i14qh29r150wf73h06i10";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
   }) // {inherit libX11 libxkbfile ;};
@@ -2571,27 +1941,17 @@ rec {
     name = "xkbevd-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xkbevd-1.0.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xkbevd-1.0.2.tar.bz2;
       sha256 = "0azpl6mcvsi718630vv0slls8avixvlsfd7nj614kagrxhbf6y2b";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
   }) // {inherit libX11 libxkbfile ;};
     
-  xkbprint = (stdenv.mkDerivation {
-    name = "xkbprint-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xkbprint-1.0.1.tar.bz2;
-      sha256 = "05rfvlla9wpbzlg86j83zf907h8cpywx0h5x7v5q0f11bgmgz380";
-    };
-    buildInputs = [pkgconfig libX11 libxkbfile ];
-  }) // {inherit libX11 libxkbfile ;};
-    
   xkbutils = (stdenv.mkDerivation {
     name = "xkbutils-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xkbutils-1.0.1.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xkbutils-1.0.1.tar.bz2;
       sha256 = "0mjq2yfd1kp3gasc08k6r0q16k4asdsafsxw3259fr5pipnp7bda";
     };
     buildInputs = [pkgconfig libXaw libX11 libxkbfile ];
@@ -2601,37 +1961,17 @@ rec {
     name = "xkill-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xkill-1.0.1.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xkill-1.0.1.tar.bz2;
       sha256 = "1pm92hpq1vnj3zjl12x8d9g6a9nyfyz3ahvvicni7qjadsn1m8bp";
     };
     buildInputs = [pkgconfig libX11 libXmu ];
   }) // {inherit libX11 libXmu ;};
     
-  xload = (stdenv.mkDerivation {
-    name = "xload-1.0.2";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xload-1.0.2.tar.bz2;
-      sha256 = "02y5avipnrf9bvhmrs7172j60w3yq7azs6v3qyqmf9f5xyv7dcc6";
-    };
-    buildInputs = [pkgconfig libXaw libXt ];
-  }) // {inherit libXaw libXt ;};
-    
-  xlogo = (stdenv.mkDerivation {
-    name = "xlogo-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xlogo-1.0.1.tar.bz2;
-      sha256 = "1ci6ylnpsy9sgvkkr1jn3rkklx89x8yfr6zk8ps97zj57nzgjnfy";
-    };
-    buildInputs = [pkgconfig libXaw libXext libXft libXp libXprintUtil libXrender libXt ];
-  }) // {inherit libXaw libXext libXft libXp libXprintUtil libXrender libXt ;};
-    
   xlsatoms = (stdenv.mkDerivation {
     name = "xlsatoms-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xlsatoms-1.0.1.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xlsatoms-1.0.1.tar.bz2;
       sha256 = "0nnm2ss1v93wz4jmlvhgxfsrxkx39g9km2jp2nagqdyv1id5fva5";
     };
     buildInputs = [pkgconfig libX11 libXmu ];
@@ -2641,87 +1981,27 @@ rec {
     name = "xlsclients-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xlsclients-1.0.1.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xlsclients-1.0.1.tar.bz2;
       sha256 = "160nk39dj9h5laxd0gbq7jl47y4ikpjf6kl4wlzm469mvk37334q";
     };
     buildInputs = [pkgconfig libX11 libXmu ];
   }) // {inherit libX11 libXmu ;};
     
-  xlsfonts = (stdenv.mkDerivation {
-    name = "xlsfonts-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xlsfonts-1.0.1.tar.bz2;
-      sha256 = "0857x0px3581b89lgv8q05dlc8aly1q71kpdqviviclr88cjdn68";
-    };
-    buildInputs = [pkgconfig libX11 ];
-  }) // {inherit libX11 ;};
-    
-  xmag = (stdenv.mkDerivation {
-    name = "xmag-1.0.2";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xmag-1.0.2.tar.bz2;
-      sha256 = "0hyshs5afqs56y60li86pw65c07vk1wmkk8kzmkq1pbxc0z99pai";
-    };
-    buildInputs = [pkgconfig libXaw libXt ];
-  }) // {inherit libXaw libXt ;};
-    
-  xman = (stdenv.mkDerivation {
-    name = "xman-1.0.3";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xman-1.0.3.tar.bz2;
-      sha256 = "0jir4m55jfbpz32bi3s5zc2y8s12jnz3jd9f6iars41x5px3pq1q";
-    };
-    buildInputs = [pkgconfig libXaw libXp libXprintUtil libXt ];
-  }) // {inherit libXaw libXp libXprintUtil libXt ;};
-    
-  xmessage = (stdenv.mkDerivation {
-    name = "xmessage-1.0.2";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xmessage-1.0.2.tar.bz2;
-      sha256 = "1hy3n227iyrm323hnrdld8knj9h82fz6s7x6bw899axcjdp03d02";
-    };
-    buildInputs = [pkgconfig libXaw libXt ];
-  }) // {inherit libXaw libXt ;};
-    
-  xmh = (stdenv.mkDerivation {
-    name = "xmh-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xmh-1.0.1.tar.bz2;
-      sha256 = "1yn6q8lrc2ndx60j2d42xagpqn3w86vjlwk5p21cbgz0bi2znwcl";
-    };
-    buildInputs = [pkgconfig libXaw libXt ];
-  }) // {inherit libXaw libXt ;};
-    
   xmodmap = (stdenv.mkDerivation {
     name = "xmodmap-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xmodmap-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xmodmap-1.0.3.tar.bz2;
       sha256 = "0zql66q2l8wbldfrzz53vlxpv7p62yhfj6lc2cn24n18g4jcggy3";
     };
     buildInputs = [pkgconfig libX11 ];
   }) // {inherit libX11 ;};
     
-  xmore = (stdenv.mkDerivation {
-    name = "xmore-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xmore-1.0.1.tar.bz2;
-      sha256 = "09r5iwzarqgyxx36z3vsams5qi08n0a1wqx6y52vqx64ffz6cdb5";
-    };
-    buildInputs = [pkgconfig libXaw libXp libXprintUtil libXt ];
-  }) // {inherit libXaw libXp libXprintUtil libXt ;};
-    
   xorgcffiles = (stdenv.mkDerivation {
     name = "xorg-cf-files-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xorg-cf-files-1.0.2.tar.bz2;
+      url = mirror://xorg/individual/util/xorg-cf-files-1.0.2.tar.bz2;
       sha256 = "15wmz9whf0j9irz5scqyyic4ardr53r6k15x2wcnxmfkqap16ip3";
     };
     buildInputs = [pkgconfig ];
@@ -2731,118 +2011,78 @@ rec {
     name = "xorg-docs-1.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xorg-docs-1.4.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xorg-docs-1.4.tar.bz2;
       sha256 = "09a9va5nljg0cahajadpkkqbhm0r6nl2z12yv7fyd5p31kjngz7z";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
     
   xorgserver = (stdenv.mkDerivation {
-    name = "xorg-server-1.4.2";
+    name = "xorg-server-1.5.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/individual/xserver/xorg-server-1.4.2.tar.bz2;
-      sha256 = "0v9izyj2ksk062wafrfc61sydf4nwzx7mj3701q24n199kn6d742";
+      url = mirror://xorg/X11R7.4/src/everything/xorg-server-1.5.1.tar.bz2;
+      sha256 = "08gbfdclx1cqlryxgqa54j2bcri0n816ldq4nyrabq5fzw5qhdig";
     };
-    buildInputs = [pkgconfig pixman renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype glproto hal inputproto kbproto libdrm mkfontdir mkfontscale perl printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libxkbui libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXxf86misc libXxf86vm zlib ]; mesaSrc = mesa.src; x11BuildHook = ./xorgserver.sh; patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch ./xorgserver-xkb-leds.patch ]; 
-  }) // {inherit pixman renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype glproto hal inputproto kbproto libdrm mkfontdir mkfontscale perl printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libxkbui libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXxf86misc libXxf86vm zlib ;};
+    buildInputs = [pkgconfig renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype mesa glproto hal inputproto kbproto libdrm mkfontdir mkfontscale openssl libpciaccess perl pixman randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXv libXxf86misc libXxf86vm zlib ]; patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch ]; propagatedBuildInputs = [libpciaccess]; 
+  }) // {inherit renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype mesa glproto hal inputproto kbproto libdrm mkfontdir mkfontscale openssl libpciaccess perl pixman randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXv libXxf86misc libXxf86vm zlib ;};
     
   xorgsgmldoctools = (stdenv.mkDerivation {
     name = "xorg-sgml-doctools-1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xorg-sgml-doctools-1.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xorg-sgml-doctools-1.2.tar.bz2;
       sha256 = "1snvlijv7ycdis0m7zhl6q6ibg2z6as3mdb17dlza0p0w3r7ivsd";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
     
-  xphelloworld = (stdenv.mkDerivation {
-    name = "xphelloworld-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xphelloworld-1.0.1.tar.bz2;
-      sha256 = "09jlwfbhhxnj46wb4cdhagxfm23gg9qmwryqx5g16nsfpbihijmi";
-    };
-    buildInputs = [pkgconfig libX11 libXaw libXp libXprintAppUtil libXprintUtil libXt ];
-  }) // {inherit libX11 libXaw libXp libXprintAppUtil libXprintUtil libXt ;};
-    
-  xplsprinters = (stdenv.mkDerivation {
-    name = "xplsprinters-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xplsprinters-1.0.1.tar.bz2;
-      sha256 = "0wmhin7z59fb87288gpqx7ia049ly8i51yg7l1slp5z010c0mimd";
-    };
-    buildInputs = [pkgconfig libX11 libXp libXprintUtil ];
-  }) // {inherit libX11 libXp libXprintUtil ;};
-    
   xpr = (stdenv.mkDerivation {
-    name = "xpr-1.0.1";
+    name = "xpr-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xpr-1.0.1.tar.bz2;
-      sha256 = "0jb2zpq8ibb9s1qmcb6zr6k1m5afd8m0xzp9k01wakyw4cfj4wdq";
+      url = mirror://xorg/X11R7.4/src/everything/xpr-1.0.2.tar.bz2;
+      sha256 = "1pwa4dcs7zw4iw52p23swnnq1idipfiadhpih6k47nhwdn4sj9f3";
     };
     buildInputs = [pkgconfig libX11 libXmu ];
   }) // {inherit libX11 libXmu ;};
     
-  xprehashprinterlist = (stdenv.mkDerivation {
-    name = "xprehashprinterlist-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xprehashprinterlist-1.0.1.tar.bz2;
-      sha256 = "0n82yar7hg1npc63fmxrjj84grr6zivddccip1562gbhdwjyjrxs";
-    };
-    buildInputs = [pkgconfig libX11 libXp ];
-  }) // {inherit libX11 libXp ;};
-    
   xprop = (stdenv.mkDerivation {
-    name = "xprop-1.0.3";
+    name = "xprop-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xprop-1.0.3.tar.bz2;
-      sha256 = "19kz6dia3kw44rmmy39g5ygiwbrvgvh7mbq8lnbczd53i2w27nnx";
+      url = mirror://xorg/X11R7.4/src/everything/xprop-1.0.4.tar.bz2;
+      sha256 = "0wnpbigsl5frbh2xnjzdxmvlz47lda5qlg85pnhrr4asgnx7r96s";
     };
-    buildInputs = [pkgconfig libX11 libXmu ];
-  }) // {inherit libX11 libXmu ;};
+    buildInputs = [pkgconfig libX11 ];
+  }) // {inherit libX11 ;};
     
   xproto = (stdenv.mkDerivation {
-    name = "xproto-7.0.10";
+    name = "xproto-7.0.13";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xproto-7.0.10.tar.bz2;
-      sha256 = "1x2dg14c1q1gi5sg1lpkw0aqaq6jkkzr8kqq2j3y8h9d4qh9jrbd";
-    };
-    buildInputs = [pkgconfig ];
-  }) // {inherit ;};
-    
-  xproxymanagementprotocol = (stdenv.mkDerivation {
-    name = "xproxymanagementprotocol-1.0.2";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xproxymanagementprotocol-1.0.2.tar.bz2;
-      sha256 = "1g0ck81yx1bd0mm4sbf3xk2k1lr5ac7nhx17qlm18p680b87clf4";
+      url = mirror://xorg/X11R7.4/src/everything/xproto-7.0.13.tar.bz2;
+      sha256 = "14nmxjbm1cmipdn7m2mm9jjsgchd04fsynrsa4lxxxb95n92hqvg";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
     
   xrandr = (stdenv.mkDerivation {
-    name = "xrandr-1.2.2";
+    name = "xrandr-1.2.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xrandr-1.2.2.tar.bz2;
-      sha256 = "00wkm84radzpvnrk8jbv1sxnkw4sz3jazyvzh1wq4zx0jbs3ybv3";
+      url = mirror://xorg/X11R7.4/src/everything/xrandr-1.2.3.tar.bz2;
+      sha256 = "01r22ngikdsfkv1sxc2f8a0lcr5c08krsvq9kqknd21b79zvf1mb";
     };
     buildInputs = [pkgconfig libX11 libXrandr libXrender ];
   }) // {inherit libX11 libXrandr libXrender ;};
     
   xrdb = (stdenv.mkDerivation {
-    name = "xrdb-1.0.4";
+    name = "xrdb-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xrdb-1.0.4.tar.bz2;
-      sha256 = "0040krghlckdk2q2mm8ng5krpm0xwlp7lar3bw56vsybx1vxx31z";
+      url = mirror://xorg/X11R7.4/src/everything/xrdb-1.0.5.tar.bz2;
+      sha256 = "1ah00m82pc8yv5knp8szqnlip450pw3lg60vzlw05wahja9hhkf2";
     };
     buildInputs = [pkgconfig libX11 libXmu ];
   }) // {inherit libX11 libXmu ;};
@@ -2851,147 +2091,87 @@ rec {
     name = "xrefresh-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xrefresh-1.0.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xrefresh-1.0.2.tar.bz2;
       sha256 = "1x9jdgwbd1ying44apk718h1ycbfx411p81mjzr51cn057yk2a2j";
     };
     buildInputs = [pkgconfig libX11 ];
   }) // {inherit libX11 ;};
     
-  xrx = (stdenv.mkDerivation {
-    name = "xrx-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xrx-1.0.1.tar.bz2;
-      sha256 = "1r640xhbxbyjbmhxsc3gmsfq3cg8rw65jzw0f7krvxzj0z3cf6m5";
-    };
-    buildInputs = [pkgconfig libXaw libX11 libXau libXext xproxymanagementprotocol libXt xtrans ];
-  }) // {inherit libXaw libX11 libXau libXext xproxymanagementprotocol libXt xtrans ;};
-    
   xset = (stdenv.mkDerivation {
-    name = "xset-1.0.3";
+    name = "xset-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xset-1.0.3.tar.bz2;
-      sha256 = "04adhsw6dbigiffr7blpq6nbksai88cnlcalr49xyhi4j3cxfgqf";
+      url = mirror://xorg/X11R7.4/src/everything/xset-1.0.4.tar.bz2;
+      sha256 = "1bdxs24pf7g73n55a967fr96f9i5ilci5nzh32wr5axy6sxp8gkc";
     };
-    buildInputs = [pkgconfig libX11 libXext libXfontcache libXmu libXp libXxf86misc ];
-  }) // {inherit libX11 libXext libXfontcache libXmu libXp libXxf86misc ;};
+    buildInputs = [pkgconfig libX11 libXext libXfontcache libXmu libXxf86misc ];
+  }) // {inherit libX11 libXext libXfontcache libXmu libXxf86misc ;};
     
   xsetmode = (stdenv.mkDerivation {
     name = "xsetmode-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xsetmode-1.0.0.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xsetmode-1.0.0.tar.bz2;
       sha256 = "1am0mylym97m79n54jvlc45njxdchv1mvqdwmpkcd499jb6lg2wq";
     };
     buildInputs = [pkgconfig libX11 libXi ];
   }) // {inherit libX11 libXi ;};
     
-  xsetpointer = (stdenv.mkDerivation {
-    name = "xsetpointer-1.0.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xsetpointer-1.0.0.tar.bz2;
-      sha256 = "0jkxddcf5gv1p1n72vkhfic5m2v0kppcrr1qrx6pckqb898g8rbx";
-    };
-    buildInputs = [pkgconfig libX11 libXi ];
-  }) // {inherit libX11 libXi ;};
-    
   xsetroot = (stdenv.mkDerivation {
     name = "xsetroot-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xsetroot-1.0.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xsetroot-1.0.2.tar.bz2;
       sha256 = "079mld5c05dx2xwhncc94xhrkp4n9388xdncx3x7km1h90gpb6jg";
     };
     buildInputs = [pkgconfig libX11 xbitmaps libXmu ];
   }) // {inherit libX11 xbitmaps libXmu ;};
     
-  xsm = (stdenv.mkDerivation {
-    name = "xsm-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xsm-1.0.1.tar.bz2;
-      sha256 = "16mjk46iza0sqz2fqik416h77f0r3gm14p5i9c5bwnad76ska99g";
-    };
-    buildInputs = [pkgconfig libXaw libXt ];
-  }) // {inherit libXaw libXt ;};
-    
-  xstdcmap = (stdenv.mkDerivation {
-    name = "xstdcmap-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xstdcmap-1.0.1.tar.bz2;
-      sha256 = "0f77yxhb7brwjwnf6a3yc1s28kg1ij65lfznk52m3vkx2dh0d4hd";
-    };
-    buildInputs = [pkgconfig libX11 libXmu ];
-  }) // {inherit libX11 libXmu ;};
-    
   xtrans = (stdenv.mkDerivation {
-    name = "xtrans-1.0.4";
+    name = "xtrans-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xtrans-1.0.4.tar.bz2;
-      sha256 = "133xzvxm3ckgh03cx3z5fqqw4qxz9s74b4qfcnqgzpifhbx1jlkn";
+      url = mirror://xorg/X11R7.4/src/everything/xtrans-1.2.1.tar.bz2;
+      sha256 = "1gb4vyh6b4lybacvipjyqfqj1jxl4bav9mmngjdwl955ks6imwlz";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
     
-  xtrap = (stdenv.mkDerivation {
-    name = "xtrap-1.0.2";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xtrap-1.0.2.tar.bz2;
-      sha256 = "1g0gmvf8fnch5ksq7lky3mbpgmlq19hfaxyllgsdyr8cbfj3slcg";
-    };
-    buildInputs = [pkgconfig libX11 libXTrap ];
-  }) // {inherit libX11 libXTrap ;};
-    
-  xvidtune = (stdenv.mkDerivation {
-    name = "xvidtune-1.0.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xvidtune-1.0.1.tar.bz2;
-      sha256 = "0dhdfji0di1pjkcnq97y7kgrqn7xh3avjxn7jwfh3mpiq91fn3vd";
-    };
-    buildInputs = [pkgconfig libXaw libXt libXxf86vm ];
-  }) // {inherit libXaw libXt libXxf86vm ;};
-    
   xvinfo = (stdenv.mkDerivation {
     name = "xvinfo-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xvinfo-1.0.2.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xvinfo-1.0.2.tar.bz2;
       sha256 = "0l7i9h3r0lzb6kmmcp751i92xml84rhzmz04i5lgj8y759hjlvhj";
     };
     buildInputs = [pkgconfig libX11 libXv ];
   }) // {inherit libX11 libXv ;};
     
   xwd = (stdenv.mkDerivation {
-    name = "xwd-1.0.1";
+    name = "xwd-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xwd-1.0.1.tar.bz2;
-      sha256 = "0cg1x9ga5cs2fc8xhgbxbknvyzr9l61kxalys0n9qhyzck6rpgf8";
+      url = mirror://xorg/X11R7.4/src/everything/xwd-1.0.2.tar.bz2;
+      sha256 = "0qbz63lwdp7c8x0rbafamlja7pk3ahhmcim5cnd7m5f123h792db";
     };
-    buildInputs = [pkgconfig libX11 libXmu ];
-  }) // {inherit libX11 libXmu ;};
+    buildInputs = [pkgconfig libX11 ];
+  }) // {inherit libX11 ;};
     
   xwininfo = (stdenv.mkDerivation {
-    name = "xwininfo-1.0.3";
+    name = "xwininfo-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xwininfo-1.0.3.tar.bz2;
-      sha256 = "12j7lmcdw4km9gm0x0cbmw3f39q54slg47wpb0z13yn6zfma3qzv";
+      url = mirror://xorg/X11R7.4/src/everything/xwininfo-1.0.4.tar.bz2;
+      sha256 = "1r4f898f6xydg02n1m37qgibh49bffn0fwdxwww37k9jhrw556nz";
     };
-    buildInputs = [pkgconfig libX11 libXext libXmu ];
-  }) // {inherit libX11 libXext libXmu ;};
+    buildInputs = [pkgconfig libX11 libXext ];
+  }) // {inherit libX11 libXext ;};
     
   xwud = (stdenv.mkDerivation {
     name = "xwud-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xwud-1.0.1.tar.bz2;
+      url = mirror://xorg/X11R7.4/src/everything/xwud-1.0.1.tar.bz2;
       sha256 = "0v1kjdn5y7dh3fcp46z1m90i9d3xx1k1y4rdr6nj77j7nhwjvpnj";
     };
     buildInputs = [pkgconfig libX11 ];
diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
new file mode 100644
index 00000000000..c0f095c51a8
--- /dev/null
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -0,0 +1,5 @@
+http://xcb.freedesktop.org/dist/xcb-proto-1.2.tar.bz2
+http://xcb.freedesktop.org/dist/xcb-util-0.3.0.tar.bz2
+http://xcb.freedesktop.org/dist/libpthread-stubs-0.1.tar.bz2
+http://xcb.freedesktop.org/dist/libxcb-1.1.91.tar.bz2
+mirror://xorg/individual/lib/pixman-0.12.0.tar.bz2
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 7fb12233044..445f9909a86 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -2,10 +2,9 @@
 
 # Typical command to generate the list of tarballs:
 
-# export i="http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/"; curl $i | perl -e 'while (<>) { if (/href="([^"]*.bz2)"/) { print "$ENV{'i'}$1\n"; }; }' > tarballs
-# manually added xcb tarballs from http://xcb.freedesktop.org/dist/
-# then run: perl ./generate-expr-from-tarballs.pl < tarballs
-
+# export i="mirror://xorg/X11R7.4/src/everything/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs-7.4.list
+# manually update extra.list
+# then run: cat tarballs-7.4.list extra.list old.list | perl ./generate-expr-from-tarballs.pl
 
 use strict;
 
@@ -29,20 +28,23 @@ $pcMap{"libdrm"} = "libdrm";
 $pcMap{"libXaw"} = "libXaw";
 $pcMap{"zlib"} = "zlib";
 $pcMap{"perl"} = "perl";
+$pcMap{"python"} = "python";
 $pcMap{"mesa"} = "mesa";
-$pcMap{"mesaHeaders"} = "mesaHeaders";
 $pcMap{"mkfontscale"} = "mkfontscale";
 $pcMap{"mkfontdir"} = "mkfontdir";
 $pcMap{"bdftopcf"} = "bdftopcf";
 $pcMap{"libxslt"} = "libxslt";
 $pcMap{"dbus-1"} = "dbus";
 $pcMap{"hal"} = "hal";
+$pcMap{"uuid"} = "e2fsprogs";
+$pcMap{"gl"} = "mesa";
+$pcMap{"openssl"} = "openssl";
 
 $pcMap{"\$PIXMAN"} = "pixman";
 $pcMap{"\$RENDERPROTO"} = "renderproto";
 
 
-$extraAttrs{"xorgserver"} = " mesaSrc = mesa.src; x11BuildHook = ./xorgserver.sh; patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch ./xorgserver-xkb-leds.patch ]; ";
+$extraAttrs{"xorgserver"} = " patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch ]; propagatedBuildInputs = [libpciaccess]; ";
 
 $extraAttrs{"imake"} = " inherit xorgcffiles; x11BuildHook = ./imake.sh; patches = [./imake.patch]; ";
 
@@ -144,6 +146,10 @@ while (<>) {
         push @requires, "mkfontdir";
     }
 
+    if ($file =~ /AM_PATH_PYTHON/) {
+        push @requires, "python";
+    }
+
     if ($file =~ /AC_PATH_PROG\(FCCACHE/) {
 	# Don't run fc-cache.
 	die if defined $extraAttrs{$pkg};
@@ -181,9 +187,8 @@ while (<>) {
     process \@requires, $1 while $file =~ /NEEDED=\"(.*)\"/g;
     process \@requires, $1 while $file =~ /XORG_DRIVER_CHECK_EXT\([^,]*,([^\)]*)\)/g;
 
-    push @requires, "glproto", "mesaHeaders" if $pkg =~ /xf86videoi810/;
-    push @requires, "glproto", "mesaHeaders" if $pkg =~ /xf86videosis/;
-    push @requires, "glproto", "mesaHeaders" if $pkg =~ /xf86videointel/;
+    push @requires, "glproto", "gl" if $pkg =~ /xf86videosis/;
+    push @requires, "glproto", "gl" if $pkg =~ /xf86videointel/;
     push @requires, "zlib" if $pkg =~ /xorgserver/;
     push @requires, "xf86bigfontproto" if $pkg =~ /xorgserver/;
     push @requires, "libxslt" if $pkg =~ /libxcb/;
diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list
new file mode 100644
index 00000000000..94e1c1ce13a
--- /dev/null
+++ b/pkgs/servers/x11/xorg/old.list
@@ -0,0 +1,4 @@
+mirror://xorg/individual/util/imake-1.0.2.tar.bz2
+mirror://xorg/individual/util/lndir-1.0.1.tar.bz2
+mirror://xorg/individual/util/xorg-cf-files-1.0.2.tar.bz2
+mirror://xorg/individual/app/bdftopcf-1.0.1.tar.bz2
\ No newline at end of file
diff --git a/pkgs/servers/x11/xorg/tarballs b/pkgs/servers/x11/xorg/tarballs
deleted file mode 100644
index ac8558e62ca..00000000000
--- a/pkgs/servers/x11/xorg/tarballs
+++ /dev/null
@@ -1,296 +0,0 @@
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/applewmproto-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/appres-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/bdftopcf-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/beforelight-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/bigreqsproto-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/bitmap-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/compositeproto-0.4.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/damageproto-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/dmxproto-2.2.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/editres-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/encodings-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/evieext-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/fixesproto-4.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-adobe-75dpi-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-adobe-100dpi-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-adobe-utopia-75dpi-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-adobe-utopia-100dpi-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-adobe-utopia-type1-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-alias-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-arabic-misc-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bh-75dpi-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bh-100dpi-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bh-ttf-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bh-type1-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bitstream-75dpi-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bitstream-100dpi-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bitstream-speedo-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-bitstream-type1-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-cronyx-cyrillic-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-cursor-misc-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-daewoo-misc-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-dec-misc-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-ibm-type1-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-isas-misc-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-jis-misc-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-micro-misc-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-misc-cyrillic-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-misc-ethiopic-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-misc-meltho-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-misc-misc-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-mutt-misc-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-schumacher-misc-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-screen-cyrillic-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-sony-misc-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-sun-misc-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-util-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-winitzki-cyrillic-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/font-xfree86-type1-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/fontcacheproto-0.1.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/fontsproto-2.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/fonttosfnt-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/fslsfonts-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/fstobdf-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/gccmakedep-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/glproto-1.4.8.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/iceauth-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/ico-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/imake-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/inputproto-1.4.2.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/kbproto-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/lbxproxy-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libAppleWM-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libFS-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libICE-1.0.4.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libSM-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libWindowsWM-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libX11-1.1.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXScrnSaver-1.1.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXTrap-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXau-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXaw-1.0.4.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXcomposite-0.4.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXcursor-1.1.9.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXdamage-1.0.4.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXdmcp-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXevie-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXext-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXfixes-4.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXfont-1.3.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXfontcache-1.0.4.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXft-2.1.12.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXi-1.1.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXinerama-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXmu-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXp-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXpm-3.5.7.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXprintAppUtil-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXprintUtil-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXrandr-1.2.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXrender-0.9.4.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXres-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXt-1.0.4.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXtst-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXv-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXvMC-1.0.4.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXxf86dga-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXxf86misc-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXxf86vm-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libdmx-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libfontenc-1.0.4.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/liblbxutil-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/liboldX-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libxkbfile-1.0.4.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libxkbui-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/listres-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/lndir-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/luit-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/makedepend-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/mkfontdir-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/mkfontscale-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/oclock-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/printproto-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/proxymngr-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/randrproto-1.2.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/recordproto-1.13.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/renderproto-0.9.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/resourceproto-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/rgb-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/rstart-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/scripts-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/scrnsaverproto-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/sessreg-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/setxkbmap-1.0.4.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/showfont-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/smproxy-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/trapproto-3.4.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/twm-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/util-macros-1.1.5.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/videoproto-2.2.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/viewres-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/windowswmproto-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/x11perf-1.4.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xauth-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xbacklight-1.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xbiff-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xbitmaps-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xcalc-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xclipboard-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xclock-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xcmiscproto-1.1.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xcmsdb-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xconsole-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xcursor-themes-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xcursorgen-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xdbedizzy-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xditview-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xdm-1.1.6.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xdpyinfo-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xdriinfo-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xedit-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xev-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xextproto-7.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xeyes-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-acecad-1.2.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-aiptek-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-calcomp-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-citron-2.2.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-digitaledge-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-dmc-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-dynapro-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-elo2300-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-elographics-1.0.0.5.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-evdev-1.1.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-fpit-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-hyperpen-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-jamstudio-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-joystick-1.2.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-keyboard-1.2.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-magellan-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-magictouch-1.0.0.5.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-microtouch-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-mouse-1.2.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-mutouch-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-palmax-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-penmount-1.2.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-spaceorb-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-summa-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-tek4957-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-ur98-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-vmmouse-12.4.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-void-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-apm-1.1.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-ark-0.6.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-ast-0.81.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-ati-6.6.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-chips-1.1.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-cirrus-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-cyrix-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-dummy-0.2.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-fbdev-0.3.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-glide-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-glint-1.1.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-i128-1.2.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-i740-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-imstt-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-intel-2.1.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-mga-1.4.6.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-neomagic-1.1.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-newport-0.2.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-nsc-2.8.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-nv-2.1.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-rendition-4.1.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-s3-0.5.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-s3virge-1.9.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-savage-2.1.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-siliconmotion-1.4.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-sis-0.9.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-sisusb-0.8.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-sunbw2-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-suncg3-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-suncg6-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-suncg14-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-sunffb-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-sunleo-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-suntcx-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-tdfx-1.3.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-tga-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-trident-1.2.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-tseng-1.1.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-v4l-0.1.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-vermilion-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-vesa-1.3.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-vga-4.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-via-0.2.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-vmware-10.14.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-voodoo-1.1.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86bigfontproto-1.1.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86dga-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86dgaproto-2.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86driproto-2.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86miscproto-0.9.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86rushproto-1.1.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86vidmodeproto-2.2.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xfd-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xfindproxy-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xfontsel-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xfs-1.0.4.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xfsinfo-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xfwp-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xgamma-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xgc-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xhost-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xineramaproto-1.1.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xinit-1.0.5.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xkbcomp-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xkbevd-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xkbprint-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xkbutils-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xkill-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xload-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xlogo-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xlsatoms-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xlsclients-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xlsfonts-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xmag-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xman-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xmessage-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xmh-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xmodmap-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xmore-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xorg-cf-files-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xorg-docs-1.4.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xorg-server-1.4.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xorg-sgml-doctools-1.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xphelloworld-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xplsprinters-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xpr-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xprehashprinterlist-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xprop-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xproto-7.0.10.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xproxymanagementprotocol-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xrandr-1.2.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xrdb-1.0.4.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xrefresh-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xrx-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xset-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xsetmode-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xsetpointer-1.0.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xsetroot-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xsm-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xstdcmap-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xtrans-1.0.4.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xtrap-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xvidtune-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xvinfo-1.0.2.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xwd-1.0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xwininfo-1.0.3.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xwud-1.0.1.tar.bz2
-http://xcb.freedesktop.org/dist/libxcb-1.1.tar.bz2
-http://xcb.freedesktop.org/dist/xcb-proto-1.1.tar.bz2
-http://xcb.freedesktop.org/dist/xcb-util-0.2.tar.bz2
-http://xcb.freedesktop.org/dist/libpthread-stubs-0.1.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/individual/lib/pixman-0.10.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/individual/driver/xf86-video-i810-1.7.4.tar.bz2
diff --git a/pkgs/servers/x11/xorg/tarballs-7.4.list b/pkgs/servers/x11/xorg/tarballs-7.4.list
new file mode 100644
index 00000000000..0ede051a545
--- /dev/null
+++ b/pkgs/servers/x11/xorg/tarballs-7.4.list
@@ -0,0 +1,208 @@
+mirror://xorg/X11R7.4/src/everything/applewmproto-1.0.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/appres-1.0.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/bigreqsproto-1.0.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/bitmap-1.0.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/compositeproto-0.4.tar.bz2
+mirror://xorg/X11R7.4/src/everything/damageproto-1.1.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/dmxproto-2.2.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/encodings-1.0.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/evieext-1.0.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/fixesproto-4.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-adobe-100dpi-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-adobe-75dpi-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-adobe-utopia-100dpi-1.0.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-adobe-utopia-75dpi-1.0.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-adobe-utopia-type1-1.0.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-alias-1.0.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-arabic-misc-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-bh-100dpi-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-bh-75dpi-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-bh-ttf-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-bh-type1-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-bitstream-100dpi-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-bitstream-75dpi-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-bitstream-speedo-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-bitstream-type1-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/fontcacheproto-0.1.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-cronyx-cyrillic-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-cursor-misc-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-daewoo-misc-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-dec-misc-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-ibm-type1-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-isas-misc-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-jis-misc-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-micro-misc-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-misc-cyrillic-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-misc-ethiopic-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-misc-meltho-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-misc-misc-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-mutt-misc-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-schumacher-misc-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-screen-cyrillic-1.0.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-sony-misc-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/fontsproto-2.0.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-sun-misc-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-util-1.0.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-winitzki-cyrillic-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/font-xfree86-type1-1.0.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/glproto-1.4.9.tar.bz2
+mirror://xorg/X11R7.4/src/everything/iceauth-1.0.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/inputproto-1.4.4.tar.bz2
+mirror://xorg/X11R7.4/src/everything/kbproto-1.0.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libAppleWM-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libdmx-1.0.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libfontenc-1.0.4.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libFS-1.0.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libICE-1.0.4.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libpciaccess-0.10.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libSM-1.1.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libWindowsWM-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libX11-1.1.5.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXau-1.0.4.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXaw-1.0.4.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXcomposite-0.4.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXcursor-1.1.9.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXdamage-1.1.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXdmcp-1.0.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXext-1.0.4.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXfixes-4.0.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXfont-1.3.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXfontcache-1.0.4.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXft-2.1.13.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXi-1.1.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXinerama-1.0.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libxkbfile-1.0.5.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXmu-1.0.4.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXpm-3.5.7.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXrandr-1.2.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXrender-0.9.4.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXres-1.0.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXScrnSaver-1.1.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXt-1.0.5.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXtst-1.0.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXv-1.0.4.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXvMC-1.0.4.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXxf86dga-1.0.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXxf86misc-1.0.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/libXxf86vm-1.0.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/luit-1.0.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/makedepend-1.0.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/mkfontdir-1.0.4.tar.bz2
+mirror://xorg/X11R7.4/src/everything/mkfontscale-1.0.5.tar.bz2
+mirror://xorg/X11R7.4/src/everything/randrproto-1.2.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/recordproto-1.13.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/renderproto-0.9.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/resourceproto-1.0.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/scrnsaverproto-1.1.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/sessreg-1.0.4.tar.bz2
+mirror://xorg/X11R7.4/src/everything/setxkbmap-1.0.4.tar.bz2
+mirror://xorg/X11R7.4/src/everything/smproxy-1.0.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/trapproto-3.4.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/util-macros-1.1.6.tar.bz2
+mirror://xorg/X11R7.4/src/everything/videoproto-2.2.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/windowswmproto-1.0.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/x11perf-1.5.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xauth-1.0.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xbacklight-1.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xbitmaps-1.0.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xcmiscproto-1.1.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xcmsdb-1.0.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xcursorgen-1.0.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xcursor-themes-1.0.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xdpyinfo-1.0.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xdriinfo-1.0.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xev-1.0.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xextproto-7.0.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86bigfontproto-1.1.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86dga-1.0.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86dgaproto-2.0.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86driproto-2.0.4.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-input-acecad-1.2.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-input-aiptek-1.1.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-input-evdev-2.0.4.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-input-joystick-1.3.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-input-keyboard-1.3.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-input-mouse-1.3.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-input-synaptics-0.15.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-input-vmmouse-12.5.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-input-void-1.1.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86miscproto-0.9.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-apm-1.2.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-ark-0.7.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-ast-0.85.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-ati-6.9.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-chips-1.2.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-cirrus-1.2.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-dummy-0.3.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-fbdev-0.4.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-geode-2.10.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-glide-1.0.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-glint-1.2.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-i128-1.3.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-i740-1.2.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-impact-0.2.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-intel-2.4.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-mach64-6.8.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-mga-1.4.9.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-neomagic-1.2.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-newport-0.2.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-nv-2.1.12.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-openchrome-0.2.903.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-r128-6.8.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-rendition-4.2.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-s3-0.6.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-s3virge-1.10.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-savage-2.2.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-siliconmotion-1.6.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-sis-0.10.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-sisusb-0.9.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-sunbw2-1.1.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-suncg14-1.1.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-suncg3-1.1.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-suncg6-1.1.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-sunffb-1.2.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-sunleo-1.2.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-suntcx-1.1.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-tdfx-1.4.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-tga-1.2.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-trident-1.3.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-tseng-1.2.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-v4l-0.2.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-vermilion-1.0.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-vesa-2.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-vmware-10.16.5.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-voodoo-1.2.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-wsfb-0.2.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-xgi-1.5.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86-video-xgixp-1.7.99.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xf86vidmodeproto-2.2.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xgamma-1.0.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xhost-1.0.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xineramaproto-1.1.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xinput-1.3.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xkbcomp-1.0.5.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xkbevd-1.0.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xkbutils-1.0.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xkill-1.0.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xlsatoms-1.0.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xlsclients-1.0.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xmodmap-1.0.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xorg-docs-1.4.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xorg-server-1.5.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xorg-sgml-doctools-1.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xpr-1.0.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xprop-1.0.4.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xproto-7.0.13.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xrandr-1.2.3.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xrdb-1.0.5.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xrefresh-1.0.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xset-1.0.4.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xsetmode-1.0.0.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xsetroot-1.0.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xtrans-1.2.1.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xvinfo-1.0.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xwd-1.0.2.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xwininfo-1.0.4.tar.bz2
+mirror://xorg/X11R7.4/src/everything/xwud-1.0.1.tar.bz2
diff --git a/pkgs/servers/x11/xorg/xorgserver-dri-path.patch b/pkgs/servers/x11/xorg/xorgserver-dri-path.patch
index 804408ad7fa..1c45f2f02bc 100644
--- a/pkgs/servers/x11/xorg/xorgserver-dri-path.patch
+++ b/pkgs/servers/x11/xorg/xorgserver-dri-path.patch
@@ -1,6 +1,6 @@
-diff -rc xorg-server-X11R7.2-1.2.0-orig/GL/glx/glxdri.c xorg-server-X11R7.2-1.2.0/GL/glx/glxdri.c
-*** xorg-server-X11R7.2-1.2.0-orig/GL/glx/glxdri.c	Tue Jan 23 04:13:14 2007
---- xorg-server-X11R7.2-1.2.0/GL/glx/glxdri.c	Tue Feb 27 00:15:38 2007
+diff -rc xorg-server-X11R7.2-1.2.0-orig/glx/glxdri.c xorg-server-X11R7.2-1.2.0/glx/glxdri.c
+*** xorg-server-X11R7.2-1.2.0-orig/glx/glxdri.c	Tue Jan 23 04:13:14 2007
+--- xorg-server-X11R7.2-1.2.0/glx/glxdri.c	Tue Feb 27 00:15:38 2007
 ***************
 *** 945,952 ****
   	goto handle_error;
@@ -23,4 +23,3 @@ diff -rc xorg-server-X11R7.2-1.2.0-orig/GL/glx/glxdri.c xorg-server-X11R7.2-1.2.
   
       screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
       if (screen->driver == NULL) {
-Only in xorg-server-X11R7.2-1.2.0/GL/glx: glxdri.c~
diff --git a/pkgs/servers/x11/xorg/xorgserver-xkb-leds.patch b/pkgs/servers/x11/xorg/xorgserver-xkb-leds.patch
deleted file mode 100644
index 2955819985b..00000000000
--- a/pkgs/servers/x11/xorg/xorgserver-xkb-leds.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- xorg-server-1.4/dix/devices.c.orig  2007-10-19 17:04:51.000000000 -0200
-+++ xorg-server-1.4/dix/devices.c       2007-10-23 17:50:38.000000000 -0200
-@@ -294,7 +294,17 @@ CoreKeyboardBell(int volume, DeviceIntPt
- static void
- CoreKeyboardCtl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
- {
-+#ifdef XKB
-+    if (!noXkbExtension) {
-+       DeviceIntPtr dev = (DeviceIntPtr)
-+           pDev->devPrivates[CoreDevicePrivatesIndex].ptr;
-+
-+       if (dev && dev->key && dev->key->xkbInfo && dev->key->xkbInfo->kbdProc)
-+           (*dev->key->xkbInfo->kbdProc)(dev, ctrl);
-+    }
-+#else
-     return;
-+#endif
- }
-
- /**
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d6dca60f48..c19620c9e63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3354,7 +3354,7 @@ let
     system == "x86_64-linux";
 
   mesa = assert mesaSupported; import ../development/libraries/mesa {
-    inherit fetchurl stdenv pkgconfig x11 xlibs libdrm;
+    inherit fetchurl stdenv pkgconfig expat x11 xlibs libdrm;
   };
 
   mesaHeaders = import ../development/libraries/mesa/headers.nix {
@@ -4803,10 +4803,10 @@ let
     inherit fetchurl openssl stdenv libcap pam;
   };
 
-  xorg = recurseIntoAttrs (import ../servers/x11/xorg {
+  xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
     inherit fetchurl stdenv pkgconfig freetype fontconfig
       libxslt expat libdrm libpng zlib perl mesa mesaHeaders
-      xkeyboard_config dbus hal;
+      xkeyboard_config dbus hal python e2fsprogs openssl;
   });
 
   zabbixAgent = import ../servers/monitoring/zabbix {

From 5eef7df51dc1961c05b57531e0134d2f98885759 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 9 Oct 2008 12:12:58 +0000
Subject: [PATCH 15/60] * intltool: deleted redundant copy (it's already in the
 Gnome Nix   expressions). * Fixed xkbcomp: it no longer found the keyboard
 definitions since it   disregards the -R option passed by the X server (it
 chdirs to the -R   path, but "." has been removed from the xkbcomp search
 path in   xkbcomp 1.0.5).  Build it with /etc/X11/xkb as its default  
 location.  This is less pure but it does allow for updating  
 xkeyboard-config in a running server. * xkeyboard-config: updated to 1.4.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13018
---
 pkgs/data/misc/xkeyboard-config/0.9.nix       | 23 ----------------
 pkgs/data/misc/xkeyboard-config/1.2.nix       | 22 ----------------
 pkgs/data/misc/xkeyboard-config/default.nix   | 19 +++++++-------
 .../tools/misc/intltool/0.36.2.nix            | 26 -------------------
 pkgs/servers/x11/xorg/default.nix             |  2 +-
 .../x11/xorg/generate-expr-from-tarballs.pl   |  5 +++-
 pkgs/top-level/all-packages.nix               |  9 +++----
 7 files changed, 17 insertions(+), 89 deletions(-)
 delete mode 100644 pkgs/data/misc/xkeyboard-config/0.9.nix
 delete mode 100644 pkgs/data/misc/xkeyboard-config/1.2.nix
 delete mode 100644 pkgs/development/tools/misc/intltool/0.36.2.nix

diff --git a/pkgs/data/misc/xkeyboard-config/0.9.nix b/pkgs/data/misc/xkeyboard-config/0.9.nix
deleted file mode 100644
index c7c92cd6c27..00000000000
--- a/pkgs/data/misc/xkeyboard-config/0.9.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "xkeyboard-config-0.9";
-
-  src = fetchurl {
-    url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-0.9.tar.bz2;
-    sha256 = "0zbpprhlv8ggsvgnwqw8d4cx0ry86szm36ghigwb1sn46q0c915v";
-  };
-
-  buildInputs = [perl perlXMLParser xkbcomp];
-
-  ICONV = "iconv";
-
-  preConfigure = "
-    configureFlags=\"--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86\"
-  ";
-
-  postInstall = ''
-  	rm ''${out}/etc/X11/xkb/compiled
-	cat ${./level3-deadkeys-us-intl} >> $out/etc/X11/xkb/symbols/us
-  '';
-}
diff --git a/pkgs/data/misc/xkeyboard-config/1.2.nix b/pkgs/data/misc/xkeyboard-config/1.2.nix
deleted file mode 100644
index de67b00baea..00000000000
--- a/pkgs/data/misc/xkeyboard-config/1.2.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "xkeyboard-config-${version}";
-
-  src = fetchurl {
-          url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-1.2.tar.bz2;
-          sha256 = "1xr7vfgabgyggnkjb56a0bd39yxjhyrldcdsq9pqnw3izfb6i1b4";
-        };
-  buildInputs = [perl perlXMLParser xkbcomp gettext];
-
-  ICONV = "iconv";
-
-  preConfigure = "
-    configureFlags=\"--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86\"
-  ";
-
-  postInstall = ''
-  	rm ''${out}/etc/X11/xkb/compiled || true;
-	cat ${./level3-deadkeys-us-intl} | sed -e 's/altgr-intl/altgr-intl-rich/g' >> $out/etc/X11/xkb/symbols/us
-  '';
-}
diff --git a/pkgs/data/misc/xkeyboard-config/default.nix b/pkgs/data/misc/xkeyboard-config/default.nix
index 31836d24ecf..c36f83aa153 100644
--- a/pkgs/data/misc/xkeyboard-config/default.nix
+++ b/pkgs/data/misc/xkeyboard-config/default.nix
@@ -1,23 +1,22 @@
-{stdenv, fetchurl, perl, perlXMLParser, xkbcomp}:
+{stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool}:
 
 stdenv.mkDerivation {
-  name = "xkeyboard-config-0.9";
+  name = "xkeyboard-config-1.4";
 
   src = fetchurl {
-    url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-0.9.tar.bz2;
-    sha256 = "0zbpprhlv8ggsvgnwqw8d4cx0ry86szm36ghigwb1sn46q0c915v";
+    url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-1.4.tar.bz2;
+    sha256 = "1qdhhc5ji8677dna9qj6kisgpfzhpjmaavdjzvvrv9chrxyqa6lj";
   };
 
-  buildInputs = [perl perlXMLParser xkbcomp];
+  buildInputs = [perl perlXMLParser xkbcomp gettext intltool];
 
   ICONV = "iconv";
 
-  preConfigure = "
-    configureFlags=\"--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86\"
-  ";
+  preConfigure = ''
+    configureFlags="--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86"
+  '';
 
   postInstall = ''
-  	rm ''${out}/etc/X11/xkb/compiled
-	cat ${./level3-deadkeys-us-intl} >> $out/etc/X11/xkb/symbols/us
+    cat ${./level3-deadkeys-us-intl} >> $out/etc/X11/xkb/symbols/us
   '';
 }
diff --git a/pkgs/development/tools/misc/intltool/0.36.2.nix b/pkgs/development/tools/misc/intltool/0.36.2.nix
deleted file mode 100644
index 14e62bbc7d7..00000000000
--- a/pkgs/development/tools/misc/intltool/0.36.2.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-args : with args;
-	let localDefs = builderDefs.meta.function {
-		src = /* put a fetchurl here */
-	fetchurl {
-		url = http://ftp.gnome.org/pub/gnome/sources/intltool/0.36/intltool-0.36.2.tar.bz2;
-		sha256 = "0cfblqz3k5s4rsw6rx9f5v3izsrmrs96293rb7bd02vijbah9gxj";
-	};
-
-		propagatedBuildInputs = [perl perlXMLParser];
-		configureFlags = [];
-	};
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "intltool-0.36.2";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [minInit addInputs doUnpack 
-			(doDump "1") doConfigure doMakeInstall 
-			doPropagate doForceShare]);
-	inherit propagatedBuildInputs;
-	meta = {
-		description = "
-	Internalization tool for XML.
-";
-		inherit src;
-	};
-}
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 8fc7110fccd..39505619738 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1934,7 +1934,7 @@ rec {
       url = mirror://xorg/X11R7.4/src/everything/xkbcomp-1.0.5.tar.bz2;
       sha256 = "1h809xl9kpx0r9ynvjfk7wy6rx8pgl1i14qh29r150wf73h06i10";
     };
-    buildInputs = [pkgconfig libX11 libxkbfile ];
+    buildInputs = [pkgconfig libX11 libxkbfile ]; NIX_CFLAGS_COMPILE = "-DDFLT_XKB_CONFIG_ROOT=\"/etc/X11/xkb\""; 
   }) // {inherit libX11 libxkbfile ;};
     
   xkbevd = (stdenv.mkDerivation {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 445f9909a86..b2e3fa78ff6 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -62,6 +62,9 @@ $extraAttrs{"xf86inputevdev"} = "
 $extraAttrs{"libXpm"} = "
     patchPhase = \"sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in\";";
 
+$extraAttrs{"xkbcomp"} = " NIX_CFLAGS_COMPILE = \"-DDFLT_XKB_CONFIG_ROOT=\\\"/etc/X11/xkb\\\"\"; ";
+
+
 my $downloadCache = "./download-cache";
 $ENV{'NIX_DOWNLOAD_CACHE'} = $downloadCache;
 mkdir $downloadCache, 0755;
@@ -202,7 +205,7 @@ while (<>) {
 
 print "\nWRITE OUT\n";
 
-open OUT, ">default2.nix";
+open OUT, ">default.nix";
 
 print OUT "";
 print OUT <<EOF;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c19620c9e63..31d2b09dc3b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2976,10 +2976,7 @@ let
     inherit fetchurl stdenv;
   };
 
-  intltool = composedArgsAndFun (selectVersion ../development/tools/misc/intltool "0.36.2") {
-    inherit fetchurl stdenv lib builderDefs stringsWithDeps
-      perl perlXMLParser;
-  };
+  intltool = gnome.intltool;
 
   jasper = import ../development/libraries/jasper {
     inherit fetchurl stdenv unzip libjpeg freeglut mesa;
@@ -5783,8 +5780,8 @@ let
     inherit builderDefs;
   };
 
-  xkeyboard_config = composedArgsAndFun (selectVersion ../data/misc/xkeyboard-config "1.2") {
-    inherit fetchurl stdenv perl perlXMLParser gettext;
+  xkeyboard_config = import ../data/misc/xkeyboard-config {
+    inherit fetchurl stdenv perl perlXMLParser gettext intltool;
     inherit (xlibs) xkbcomp;
   };
 

From 201d20db206667ba7c5bd5ec88ba03741a7fa24d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 9 Oct 2008 14:29:06 +0000
Subject: [PATCH 16/60] * openssl-0.9.8i.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13024
---
 pkgs/development/libraries/openssl/builder.sh  | 12 ------------
 pkgs/development/libraries/openssl/default.nix | 18 ++++++++++++++----
 2 files changed, 14 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/development/libraries/openssl/builder.sh

diff --git a/pkgs/development/libraries/openssl/builder.sh b/pkgs/development/libraries/openssl/builder.sh
deleted file mode 100644
index 0ec9de37d76..00000000000
--- a/pkgs/development/libraries/openssl/builder.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-source $stdenv/setup
-
-configureScript=./config
-configureFlags=shared
-
-postInstall=postInstall
-postInstall() {
-    # Bug fix: openssl does a `chmod 644' on the pkgconfig directory.
-    chmod 755 $out/lib/pkgconfig
-}
-
-genericBuild
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 709c78db1c7..4e683584587 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,11 +1,21 @@
 {stdenv, fetchurl, perl}:
 
 stdenv.mkDerivation {
-  name = "openssl-0.9.8h";
-  builder = ./builder.sh;
+  name = "openssl-0.9.8i";
+  
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/security/openssl/openssl-0.9.8h.tar.gz;
-    sha1 = "ced4f2da24a202e01ea22bef30ebc8aee274de86";
+    url = http://www.openssl.org/source/openssl-0.9.8i.tar.gz;
+    sha1 = "b2e029cfb68bf32eae997d60317a40945db5a65f";
   };
+  
   buildInputs = [perl];
+
+  configureScript = "./config";
+  
+  configureFlags = "shared";
+
+  meta = {
+    homepage = http://www.openssl.org/;
+    description = "A cryptographic library that implements the SSL and TLS protocols";
+  };
 }

From 23fa8d41a092be0131829c4595687bb3e1f8f0f5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 9 Oct 2008 14:51:26 +0000
Subject: [PATCH 17/60] * i810 -> intel.  (I hope the "intel" driver is stable
 enough   nowadays; I don't have a laptop with Intel graphics any more to test
   it.)

svn path=/nixpkgs/branches/stdenv-updates/; revision=13026
---
 pkgs/top-level/build-for-release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index 8927a53405b..e9c6e4bebaf 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -204,7 +204,7 @@ let
       xauth
       xf86inputkeyboard
       xf86inputmouse
-      xf86videoi810
+      xf86videointel
       xf86videovesa
       xkbcomp
       xorgserver

From 0e68610febf8b85d8b9e02218ad2ea5bc573579a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 9 Oct 2008 16:24:51 +0000
Subject: [PATCH 18/60] * libXp has been removed from X.org 7.4 but some
 packages still need it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13032
---
 pkgs/servers/x11/xorg/default.nix | 32 +++++++++++++++++++++++++------
 pkgs/servers/x11/xorg/old.list    |  4 +++-
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 39505619738..b27a94985e4 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -503,6 +503,16 @@ rec {
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; 
   }) // {inherit mkfontdir mkfontscale ;};
     
+  gccmakedep = (stdenv.mkDerivation {
+    name = "gccmakedep-1.0.2";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2;
+      sha256 = "04dfamx3fvkvqfgs6xy2a6yqbxjrj4777ylxp38g60hhbdl4jg86";
+    };
+    buildInputs = [pkgconfig ];
+  }) // {inherit ;};
+    
   glproto = (stdenv.mkDerivation {
     name = "glproto-1.4.9";
     builder = ./builder.sh;
@@ -640,8 +650,8 @@ rec {
       url = mirror://xorg/X11R7.4/src/everything/libXaw-1.0.4.tar.bz2;
       sha256 = "1yaslcpj6sd6s8gx2hv60gfjf515gggd8f2jv4zqbp5q9wcapx0i";
     };
-    buildInputs = [pkgconfig libX11 libXau libXext xextproto libXmu libXpm xproto libXt ];
-  }) // {inherit libX11 libXau libXext xextproto libXmu libXpm xproto libXt ;};
+    buildInputs = [pkgconfig libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ];
+  }) // {inherit libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ;};
     
   libXcomposite = (stdenv.mkDerivation {
     name = "libXcomposite-0.4.0";
@@ -763,6 +773,16 @@ rec {
     buildInputs = [pkgconfig libX11 libXext xextproto libXt ];
   }) // {inherit libX11 libXext xextproto libXt ;};
     
+  libXp = (stdenv.mkDerivation {
+    name = "libXp-1.0.0";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/lib/libXp-1.0.0.tar.bz2;
+      sha256 = "1blwrr5zhmwwy87j0svmhv3hc13acyn5j14n5rv0anz81iav2r3y";
+    };
+    buildInputs = [pkgconfig libX11 libXau libXext xextproto ];
+  }) // {inherit libX11 libXau libXext xextproto ;};
+    
   libXpm = (stdenv.mkDerivation {
     name = "libXpm-3.5.7";
     builder = ./builder.sh;
@@ -1221,8 +1241,8 @@ rec {
       url = mirror://xorg/X11R7.4/src/everything/xdpyinfo-1.0.3.tar.bz2;
       sha256 = "0qhr7r3q4hs7cjpxh8fjyjia35czbdxzrb7bwm3znkxxa63pd522";
     };
-    buildInputs = [pkgconfig libdmx libX11 libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ];
-  }) // {inherit libdmx libX11 libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
+    buildInputs = [pkgconfig libdmx libX11 libXext libXi libXinerama libXp libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ];
+  }) // {inherit libdmx libX11 libXext libXi libXinerama libXp libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
     
   xdriinfo = (stdenv.mkDerivation {
     name = "xdriinfo-1.0.2";
@@ -2104,8 +2124,8 @@ rec {
       url = mirror://xorg/X11R7.4/src/everything/xset-1.0.4.tar.bz2;
       sha256 = "1bdxs24pf7g73n55a967fr96f9i5ilci5nzh32wr5axy6sxp8gkc";
     };
-    buildInputs = [pkgconfig libX11 libXext libXfontcache libXmu libXxf86misc ];
-  }) // {inherit libX11 libXext libXfontcache libXmu libXxf86misc ;};
+    buildInputs = [pkgconfig libX11 libXext libXfontcache libXmu libXp libXxf86misc ];
+  }) // {inherit libX11 libXext libXfontcache libXmu libXp libXxf86misc ;};
     
   xsetmode = (stdenv.mkDerivation {
     name = "xsetmode-1.0.0";
diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list
index 94e1c1ce13a..542aa5ec2cc 100644
--- a/pkgs/servers/x11/xorg/old.list
+++ b/pkgs/servers/x11/xorg/old.list
@@ -1,4 +1,6 @@
 mirror://xorg/individual/util/imake-1.0.2.tar.bz2
 mirror://xorg/individual/util/lndir-1.0.1.tar.bz2
 mirror://xorg/individual/util/xorg-cf-files-1.0.2.tar.bz2
-mirror://xorg/individual/app/bdftopcf-1.0.1.tar.bz2
\ No newline at end of file
+mirror://xorg/individual/app/bdftopcf-1.0.1.tar.bz2
+mirror://xorg/individual/lib/libXp-1.0.0.tar.bz2
+mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2

From f370f61ee955ea904d2676ac86e26076c8d94c55 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Oct 2008 08:55:15 +0000
Subject: [PATCH 19/60] * f77 -> fortran.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13042
---
 pkgs/development/interpreters/octave/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 787682f1e2c..aed71da946d 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, g77, readline, ncurses, perl, flex}:
 
 assert readline != null && ncurses != null && flex != null;
-assert g77.langF77;
+assert g77.langFortran;
 
 stdenv.mkDerivation {
   name = "octave-2.9.6";

From dbc0d399bfb457a60d135431d3ba2d3d75022256 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Oct 2008 08:55:45 +0000
Subject: [PATCH 20/60] * Add some more packages that have been apparently
 deprecated from X.org.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13043
---
 pkgs/servers/x11/xorg/default.nix | 30 ++++++++++++++++++++++++++++++
 pkgs/servers/x11/xorg/old.list    |  3 +++
 2 files changed, 33 insertions(+)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index b27a94985e4..2aee79650d0 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1194,6 +1194,16 @@ rec {
     buildInputs = [pkgconfig libxcb ];
   }) // {inherit libxcb ;};
     
+  xclock = (stdenv.mkDerivation {
+    name = "xclock-1.0.3";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/app/xclock-1.0.3.tar.bz2;
+      sha256 = "0zspx5jqp52wgp4c4d9qaxhp0b9p2fzx2ys4rza10apgx5x7gd8h";
+    };
+    buildInputs = [pkgconfig libXaw libX11 libXft libxkbfile libXrender libXt ];
+  }) // {inherit libXaw libX11 libXft libxkbfile libXrender libXt ;};
+    
   xcmiscproto = (stdenv.mkDerivation {
     name = "xcmiscproto-1.1.2";
     builder = ./builder.sh;
@@ -1274,6 +1284,16 @@ rec {
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
     
+  xeyes = (stdenv.mkDerivation {
+    name = "xeyes-1.0.1";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/app/xeyes-1.0.1.tar.bz2;
+      sha256 = "0ac0m9af193lxpyj11k2sp2xpmlhzzn3xrs6kdyy6c11fgl042ak";
+    };
+    buildInputs = [pkgconfig libX11 libXext libXmu libXt ];
+  }) // {inherit libX11 libXext libXmu libXt ;};
+    
   xf86bigfontproto = (stdenv.mkDerivation {
     name = "xf86bigfontproto-1.1.2";
     builder = ./builder.sh;
@@ -2007,6 +2027,16 @@ rec {
     buildInputs = [pkgconfig libX11 libXmu ];
   }) // {inherit libX11 libXmu ;};
     
+  xmessage = (stdenv.mkDerivation {
+    name = "xmessage-1.0.2";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/app/xmessage-1.0.2.tar.bz2;
+      sha256 = "1hy3n227iyrm323hnrdld8knj9h82fz6s7x6bw899axcjdp03d02";
+    };
+    buildInputs = [pkgconfig libXaw libXt ];
+  }) // {inherit libXaw libXt ;};
+    
   xmodmap = (stdenv.mkDerivation {
     name = "xmodmap-1.0.3";
     builder = ./builder.sh;
diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list
index 542aa5ec2cc..c731277fe41 100644
--- a/pkgs/servers/x11/xorg/old.list
+++ b/pkgs/servers/x11/xorg/old.list
@@ -4,3 +4,6 @@ mirror://xorg/individual/util/xorg-cf-files-1.0.2.tar.bz2
 mirror://xorg/individual/app/bdftopcf-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libXp-1.0.0.tar.bz2
 mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2
+mirror://xorg/individual/app/xmessage-1.0.2.tar.bz2
+mirror://xorg/individual/app/xeyes-1.0.1.tar.bz2
+mirror://xorg/individual/app/xclock-1.0.3.tar.bz2

From b43d4f87db55fe32716e1f174c0a375248546754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 12 Oct 2008 19:15:29 +0000
Subject: [PATCH 21/60] Pkgconfig 0.23.

Untested!

svn path=/nixpkgs/branches/stdenv-updates/; revision=13054
---
 .../tools/misc/pkgconfig/default.nix           | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index df35368d0cd..a96d69e5394 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -1,25 +1,15 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "pkg-config-0.22";
+stdenv.mkDerivation rec {
+  name = "pkg-config-0.23";
   
   setupHook = ./setup-hook.sh;
   
   src = fetchurl {
-    url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.22.tar.gz;
-    sha256 = "1rpb5wygmp0f8nal7y3ga4556i7hkjdslv3wdq04fj30gns621vy";
+    url = "http://pkgconfig.freedesktop.org/releases/${name}.tar.gz";
+    sha256 = "0lrvk17724mc2nzpaa0vwybarrl50r7qdnr4h6jijm50srrf1808";
   };
 
-  patches = [
-    # Process Requires.private properly, see
-    # http://bugs.freedesktop.org/show_bug.cgi?id=4738.
-    (fetchurl {
-      name = "pkgconfig-8494.patch";
-      url = http://bugs.freedesktop.org/attachment.cgi?id=8494;
-      sha256 = "1pcrdbb7dypg2biy0yqc7bdxak5zii8agqljdvk7j4wbyghpqzws";
-    })
-  ];
-
   meta = {
     description = "A tool that allows packages to find out information about other packages";
     homepage = http://pkg-config.freedesktop.org/wiki/;

From 64a6c823fceb21be8cd33ab3a1404e076f7039a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 13 Oct 2008 09:04:56 +0000
Subject: [PATCH 22/60] Add `gnumakeNix' attribute for GNU Make with
 `nix-log2xml' support.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31d2b09dc3b..24c3a222bbf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2264,6 +2264,12 @@ let
     log2xmlSupport = getConfig [ "gnuMake" "log2xmlSupport" ] true;
   };
 
+  # The modified version of GNU Make with support for `nix-log2xml'.
+  gnumakeNix = import ../development/tools/build-managers/gnumake {
+    inherit fetchurl stdenv;
+    log2xmlSupport = true;
+  };
+
   gnumake380 = import ../development/tools/build-managers/gnumake-3.80 {
     inherit fetchurl stdenv;
   };

From 36debce744e37a6c48c38af6a886459aa9375e79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 13 Oct 2008 09:06:04 +0000
Subject: [PATCH 23/60] Use `gnumakeNix' instead of `gnumake' in `stdenv'.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13056
---
 pkgs/stdenv/common-path.nix                | 2 +-
 pkgs/stdenv/linux/default.nix              | 2 +-
 pkgs/stdenv/linux/make-bootstrap-tools.nix | 4 ++--
 pkgs/stdenv/mingw/pkgs/default.nix         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/stdenv/common-path.nix b/pkgs/stdenv/common-path.nix
index 3b267a543c6..227870a943a 100644
--- a/pkgs/stdenv/common-path.nix
+++ b/pkgs/stdenv/common-path.nix
@@ -8,7 +8,7 @@
   pkgs.gnutar
   pkgs.gzip
   pkgs.bzip2
-  pkgs.gnumake
+  pkgs.gnumakeNix
   pkgs.bash
   pkgs.patch
   pkgs.replace
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 30516de54cc..69b4046a6cd 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -217,7 +217,7 @@ rec {
       inherit (stdenvLinuxBoot2Pkgs) binutils /* gcc */ glibc;
       inherit (stdenvLinuxBoot3Pkgs)
         gzip bzip2 bash coreutils diffutils findutils gawk
-        gnumake gnused gnutar gnugrep patch patchelf
+        gnumakeNix gnused gnutar gnugrep patch patchelf
         attr acl;
     };
   };
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 71aa638378c..9d381cca7e1 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -10,7 +10,7 @@ let
   # dietlibc.
   pkgsToRemove = 
     [ "binutils" "gcc" "coreutils" "findutils" "diffutils" "gnused" "gnugrep"
-      "gawk" "gnutar" "gzip" "bzip2" "gnumake" "bash" "patch" "patchelf"
+      "gawk" "gnutar" "gzip" "bzip2" "gnumakeNix" "bash" "patch" "patchelf"
     ];
 
   pkgsDiet = import ../../top-level/all-packages.nix {
@@ -28,7 +28,7 @@ let
 
     inherit (pkgsDiet)
       coreutils diffutils gnugrep
-      gzip bzip2 gnumake bash patch binutils curl;
+      gzip bzip2 gnumakeNix bash patch binutils curl;
 
     findutils = pkgsDiet.findutils4227; # 4.2.28 is broken
       
diff --git a/pkgs/stdenv/mingw/pkgs/default.nix b/pkgs/stdenv/mingw/pkgs/default.nix
index 6c843e8d394..c0bad491e78 100755
--- a/pkgs/stdenv/mingw/pkgs/default.nix
+++ b/pkgs/stdenv/mingw/pkgs/default.nix
@@ -150,7 +150,7 @@ rec {
   pkgs.gnutar
   pkgs.gzip
   pkgs.bzip2
-  pkgs.gnumake
+  pkgs.gnumakeNix
   pkgs.bash
   pkgs.patch
   */

From a2b9febb421a182c5b14f0e6a570bcb0f5b393dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 13 Oct 2008 09:06:50 +0000
Subject: [PATCH 24/60] GNU Make: Disable `nix-log2xml' support by default.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13057
---
 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 24c3a222bbf..6253b9fa409 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2261,7 +2261,7 @@ let
 
   gnumake = import ../development/tools/build-managers/gnumake {
     inherit fetchurl stdenv;
-    log2xmlSupport = getConfig [ "gnuMake" "log2xmlSupport" ] true;
+    log2xmlSupport = getConfig [ "gnuMake" "log2xmlSupport" ] false;
   };
 
   # The modified version of GNU Make with support for `nix-log2xml'.

From 1e6622f4d5d500d6e701bd81dd4a22977d10637d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Oct 2008 12:51:04 +0000
Subject: [PATCH 25/60] * The patch for proper Requires.private processing is
 still necessary,   unfortunately.  For instance, libxcb's xcb.pc declares:

    Requires.private: pthread-stubs ...

  Thus libxcb has to declare the pthread-stubs package as a
  propagatedBuildInput, otherwise packages that check for libxcb using
  pkg-config (such as libX11) will fail.  But then we get a totally
  unnecessary additional runtime dependency, which is clearly a bad
  thing.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13058
---
 .../tools/misc/pkgconfig/default.nix          |   6 +
 .../misc/pkgconfig/requires-private.patch     | 224 ++++++++++++++++++
 2 files changed, 230 insertions(+)
 create mode 100644 pkgs/development/tools/misc/pkgconfig/requires-private.patch

diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index a96d69e5394..22035f6fee7 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -10,6 +10,12 @@ stdenv.mkDerivation rec {
     sha256 = "0lrvk17724mc2nzpaa0vwybarrl50r7qdnr4h6jijm50srrf1808";
   };
 
+  patches = [
+    # Process Requires.private properly, see
+    # http://bugs.freedesktop.org/show_bug.cgi?id=4738.
+    ./requires-private.patch
+  ];
+
   meta = {
     description = "A tool that allows packages to find out information about other packages";
     homepage = http://pkg-config.freedesktop.org/wiki/;
diff --git a/pkgs/development/tools/misc/pkgconfig/requires-private.patch b/pkgs/development/tools/misc/pkgconfig/requires-private.patch
new file mode 100644
index 00000000000..f90b73b6c46
--- /dev/null
+++ b/pkgs/development/tools/misc/pkgconfig/requires-private.patch
@@ -0,0 +1,224 @@
+diff -rc pkg-config-0.23-orig/main.c pkg-config-0.23/main.c
+*** pkg-config-0.23-orig/main.c	2008-01-16 23:06:48.000000000 +0100
+--- pkg-config-0.23/main.c	2008-10-13 14:41:42.000000000 +0200
+***************
+*** 431,436 ****
+--- 431,457 ----
+    else
+      disable_private_libs();
+  
++   /* Only process Requires field if cflags or libs wanted */
++   if (want_libs ||
++       want_cflags ||
++       want_l_libs ||
++       want_L_libs ||
++       want_other_libs ||
++       want_I_cflags ||
++       want_other_cflags)
++     enable_requires();
++   else
++     disable_requires();
++ 
++   /* Only process Requires.private if cflags or static libs wanted */
++   if (want_cflags ||
++       want_I_cflags ||
++       want_other_cflags ||
++       want_static_lib_list)
++     enable_requires_private();
++   else
++     disable_requires_private();
++ 
+    if (want_my_version)
+      {
+        printf ("%s\n", VERSION);
+diff -rc pkg-config-0.23-orig/parse.c pkg-config-0.23/parse.c
+*** pkg-config-0.23-orig/parse.c	2008-01-16 21:42:49.000000000 +0100
+--- pkg-config-0.23/parse.c	2008-10-13 14:41:42.000000000 +0200
+***************
+*** 913,919 ****
+  #endif
+  
+  static void
+! parse_line (Package *pkg, const char *untrimmed, const char *path, gboolean ignore_requires, gboolean ignore_private_libs)
+  {
+    char *str;
+    char *p;
+--- 913,921 ----
+  #endif
+  
+  static void
+! parse_line (Package *pkg, const char *untrimmed, const char *path,
+!             gboolean ignore_requires, gboolean ignore_requires_private,
+!             gboolean ignore_private_libs)
+  {
+    char *str;
+    char *p;
+***************
+*** 956,970 ****
+          parse_description (pkg, p, path);
+        else if (strcmp (tag, "Version") == 0)
+          parse_version (pkg, p, path);
+!       else if (strcmp (tag, "Requires.private") == 0)
+! 	parse_requires_private (pkg, p, path);
+!       else if (strcmp (tag, "Requires") == 0)
+! 	{
+!           if (ignore_requires == FALSE)
+! 	    parse_requires (pkg, p, path);
+!           else
+! 	    goto cleanup;
+!         }
+        else if ((strcmp (tag, "Libs.private") == 0) && 
+                 ignore_private_libs == FALSE)
+          parse_libs_private (pkg, p, path);
+--- 958,969 ----
+          parse_description (pkg, p, path);
+        else if (strcmp (tag, "Version") == 0)
+          parse_version (pkg, p, path);
+!       else if ((strcmp (tag, "Requires.private") == 0) &&
+!                ignore_requires_private == FALSE)
+!         parse_requires_private (pkg, p, path);
+!       else if ((strcmp (tag, "Requires") == 0) &&
+!                ignore_requires == FALSE)
+!         parse_requires (pkg, p, path);
+        else if ((strcmp (tag, "Libs.private") == 0) && 
+                 ignore_private_libs == FALSE)
+          parse_libs_private (pkg, p, path);
+***************
+*** 1067,1073 ****
+  }
+  
+  Package*
+! parse_package_file (const char *path, gboolean ignore_requires, gboolean ignore_private_libs)
+  {
+    FILE *f;
+    Package *pkg;
+--- 1066,1074 ----
+  }
+  
+  Package*
+! parse_package_file (const char *path, gboolean ignore_requires,
+!                     gboolean ignore_requires_private,
+!                     gboolean ignore_private_libs)
+  {
+    FILE *f;
+    Package *pkg;
+***************
+*** 1104,1110 ****
+      {
+        one_line = TRUE;
+        
+!       parse_line (pkg, str->str, path, ignore_requires, ignore_private_libs);
+  
+        g_string_truncate (str, 0);
+      }
+--- 1105,1112 ----
+      {
+        one_line = TRUE;
+        
+!       parse_line (pkg, str->str, path, ignore_requires,
+!                   ignore_requires_private, ignore_private_libs);
+  
+        g_string_truncate (str, 0);
+      }
+diff -rc pkg-config-0.23-orig/parse.h pkg-config-0.23/parse.h
+*** pkg-config-0.23-orig/parse.h	2008-01-16 21:42:49.000000000 +0100
+--- pkg-config-0.23/parse.h	2008-10-13 14:41:42.000000000 +0200
+***************
+*** 23,28 ****
+--- 23,29 ----
+  #include "pkg.h"
+  
+  Package *parse_package_file (const char *path, gboolean ignore_requires,
++                              gboolean ignore_requires_private,
+                               gboolean ignore_private_libs);
+  
+  Package *get_compat_package (const char *name);
+diff -rc pkg-config-0.23-orig/pkg.c pkg-config-0.23/pkg.c
+*** pkg-config-0.23-orig/pkg.c	2008-01-16 22:59:49.000000000 +0100
+--- pkg-config-0.23/pkg.c	2008-10-13 14:41:42.000000000 +0200
+***************
+*** 55,60 ****
+--- 55,61 ----
+  
+  gboolean disable_uninstalled = FALSE;
+  gboolean ignore_requires = FALSE;
++ gboolean ignore_requires_private = FALSE;
+  gboolean ignore_private_libs = TRUE;
+  
+  void
+***************
+*** 337,343 ****
+      }
+  
+    debug_spew ("Reading '%s' from file '%s'\n", name, location);
+!   pkg = parse_package_file (location, ignore_requires, ignore_private_libs);
+    
+    if (pkg == NULL)
+      {
+--- 338,345 ----
+      }
+  
+    debug_spew ("Reading '%s' from file '%s'\n", name, location);
+!   pkg = parse_package_file (location, ignore_requires, ignore_requires_private,
+!                             ignore_private_libs);
+    
+    if (pkg == NULL)
+      {
+***************
+*** 1506,1511 ****
+--- 1508,1514 ----
+    int mlen = 0;
+    
+    ignore_requires = TRUE;
++   ignore_requires_private = TRUE;
+  
+    g_hash_table_foreach (locations, max_len_foreach, &mlen);
+    g_hash_table_foreach (locations, packages_foreach, GINT_TO_POINTER (mlen + 1));
+***************
+*** 1522,1524 ****
+--- 1525,1551 ----
+  {
+    ignore_private_libs = TRUE;
+  }
++ 
++ void
++ enable_requires(void)
++ {
++   ignore_requires = FALSE;
++ }
++ 
++ void
++ disable_requires(void)
++ {
++   ignore_requires = TRUE;
++ }
++ 
++ void
++ enable_requires_private(void)
++ {
++   ignore_requires_private = FALSE;
++ }
++ 
++ void
++ disable_requires_private(void)
++ {
++   ignore_requires_private = TRUE;
++ }
+diff -rc pkg-config-0.23-orig/pkg.h pkg-config-0.23/pkg.h
+*** pkg-config-0.23-orig/pkg.h	2008-01-16 22:27:19.000000000 +0100
+--- pkg-config-0.23/pkg.h	2008-10-13 14:41:42.000000000 +0200
+***************
+*** 120,125 ****
+--- 120,131 ----
+  void enable_private_libs(void);
+  void disable_private_libs(void);
+  
++ void enable_requires(void);
++ void disable_requires(void);
++ 
++ void enable_requires_private(void);
++ void disable_requires_private(void);
++ 
+  /* If TRUE, do not automatically prefer uninstalled versions */
+  extern gboolean disable_uninstalled;
+  

From 5bc2dc536d138611011baa147654d9fb1efddc29 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Oct 2008 12:06:36 +0000
Subject: [PATCH 26/60] * `pkg-config --cflags': ignore Requires.private (just
 like --libs).   Whether this is correct is debatable (especially since there
 is no   formal semantics for Requires.private), but not ignoring it breaks  
 some packages (like Pango's dependency on Cairo).

svn path=/nixpkgs/branches/stdenv-updates/; revision=13060
---
 .../tools/misc/pkgconfig/requires-private.patch       | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/misc/pkgconfig/requires-private.patch b/pkgs/development/tools/misc/pkgconfig/requires-private.patch
index f90b73b6c46..f5dee097d60 100644
--- a/pkgs/development/tools/misc/pkgconfig/requires-private.patch
+++ b/pkgs/development/tools/misc/pkgconfig/requires-private.patch
@@ -1,9 +1,9 @@
 diff -rc pkg-config-0.23-orig/main.c pkg-config-0.23/main.c
 *** pkg-config-0.23-orig/main.c	2008-01-16 23:06:48.000000000 +0100
---- pkg-config-0.23/main.c	2008-10-13 14:41:42.000000000 +0200
+--- pkg-config-0.23/main.c	2008-10-14 13:04:04.000000000 +0200
 ***************
 *** 431,436 ****
---- 431,457 ----
+--- 431,454 ----
     else
       disable_private_libs();
   
@@ -19,11 +19,8 @@ diff -rc pkg-config-0.23-orig/main.c pkg-config-0.23/main.c
 +   else
 +     disable_requires();
 + 
-+   /* Only process Requires.private if cflags or static libs wanted */
-+   if (want_cflags ||
-+       want_I_cflags ||
-+       want_other_cflags ||
-+       want_static_lib_list)
++   /* Only process Requires.private if static libs wanted */
++   if (want_static_lib_list)
 +     enable_requires_private();
 +   else
 +     disable_requires_private();

From 5b45cce6c18ad378592f2eca67565baec16484a6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Oct 2008 12:08:07 +0000
Subject: [PATCH 27/60] * Don't need to set CAIRO_CFLAGS anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13061
---
 pkgs/development/libraries/cairo/default.nix               | 6 +++---
 pkgs/development/libraries/gtk-libs/2.12/pango/default.nix | 5 -----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 57a2e0b386f..3a0d06dbcce 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -19,13 +19,13 @@ stdenv.mkDerivation {
   buildInputs = [
     pkgconfig x11 fontconfig freetype pixman
   ];
-  
+
   propagatedBuildInputs =
     stdenv.lib.optional postscriptSupport zlib ++
     stdenv.lib.optional pngSupport libpng;
     
-  configureFlags =
-    (if pdfSupport then ["--enable-pdf"] else []);
+  configureFlags = ["--disable-static"] ++
+    stdenv.lib.optional pdfSupport "--enable-pdf";
 
   meta = {
     description = "A 2D graphics library with support for multiple output devices";
diff --git a/pkgs/development/libraries/gtk-libs/2.12/pango/default.nix b/pkgs/development/libraries/gtk-libs/2.12/pango/default.nix
index 13b6092a2d8..4cdef0c3b65 100644
--- a/pkgs/development/libraries/gtk-libs/2.12/pango/default.nix
+++ b/pkgs/development/libraries/gtk-libs/2.12/pango/default.nix
@@ -12,11 +12,6 @@ stdenv.mkDerivation {
   
   propagatedBuildInputs = [x11 glib cairo libpng];
 
-  # The configure script doesn't seem to pick up the Cairo cflags.
-  preConfigure = ''
-    CAIRO_CFLAGS=$(pkg-config --cflags cairo --debug)
-  '';
-
   meta = {
     description = "A library for laying out and rendering of text, with an emphasis on internationalization";
     homepage = http://www.pango.org/;

From f940eda22dea474b299add7046cf386ae271ba1a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Oct 2008 12:25:28 +0000
Subject: [PATCH 28/60] * Who turned this off? :-P  Surely we want locale
 support in Glibc...

svn path=/nixpkgs/branches/stdenv-updates/; revision=13062
---
 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 6253b9fa409..d7323181246 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2813,7 +2813,7 @@ let
 
   glibc28 = import ../development/libraries/glibc-2.8 {
     inherit fetchurl stdenv kernelHeaders;
-    installLocales = getPkgConfig "glibc" "locales" false;
+    installLocales = getPkgConfig "glibc" "locales" true;
   };
 
   glibc_multi =

From c9c20456103efd7b903ad1586dbb81f63f4342c8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Oct 2008 14:46:56 +0000
Subject: [PATCH 29/60] * Cairo: build with XCB support. * Fixed libXp.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13069
---
 pkgs/development/libraries/cairo/default.nix  |  6 ++---
 pkgs/servers/x11/xorg/default.nix             | 26 +++++++++++++------
 .../x11/xorg/generate-expr-from-tarballs.pl   | 17 +++---------
 pkgs/servers/x11/xorg/old.list                |  1 +
 pkgs/top-level/all-packages.nix               |  4 +--
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 3a0d06dbcce..46e6dfba2d4 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -2,7 +2,7 @@
 , pdfSupport ? true
 , pngSupport ? true
 , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype
-, zlib, libpng, pixman
+, zlib, libpng, pixman, libxcb, xcbutil
 }:
 
 assert postscriptSupport -> zlib != null;
@@ -17,14 +17,14 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    pkgconfig x11 fontconfig freetype pixman
+    pkgconfig x11 fontconfig freetype pixman libxcb xcbutil
   ];
 
   propagatedBuildInputs =
     stdenv.lib.optional postscriptSupport zlib ++
     stdenv.lib.optional pngSupport libpng;
     
-  configureFlags = ["--disable-static"] ++
+  configureFlags = ["--disable-static" "--enable-xcb"] ++
     stdenv.lib.optional pdfSupport "--enable-pdf";
 
   meta = {
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 2aee79650d0..e1cccdff872 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -650,8 +650,8 @@ rec {
       url = mirror://xorg/X11R7.4/src/everything/libXaw-1.0.4.tar.bz2;
       sha256 = "1yaslcpj6sd6s8gx2hv60gfjf515gggd8f2jv4zqbp5q9wcapx0i";
     };
-    buildInputs = [pkgconfig libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ];
-  }) // {inherit libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ;};
+    buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ];
+  }) // {inherit printproto libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ;};
     
   libXcomposite = (stdenv.mkDerivation {
     name = "libXcomposite-0.4.0";
@@ -780,8 +780,8 @@ rec {
       url = mirror://xorg/individual/lib/libXp-1.0.0.tar.bz2;
       sha256 = "1blwrr5zhmwwy87j0svmhv3hc13acyn5j14n5rv0anz81iav2r3y";
     };
-    buildInputs = [pkgconfig libX11 libXau libXext xextproto ];
-  }) // {inherit libX11 libXau libXext xextproto ;};
+    buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto ];
+  }) // {inherit printproto libX11 libXau libXext xextproto ;};
     
   libXpm = (stdenv.mkDerivation {
     name = "libXpm-3.5.7";
@@ -1014,6 +1014,16 @@ rec {
     buildInputs = [pkgconfig perl ];
   }) // {inherit perl ;};
     
+  printproto = (stdenv.mkDerivation {
+    name = "printproto-1.0.4";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/proto/printproto-1.0.4.tar.bz2;
+      sha256 = "1gnkpz8iyl27gyjvy8rhm9v6g5qvz3632pn5djxks577i0qsjngh";
+    };
+    buildInputs = [pkgconfig ];
+  }) // {inherit ;};
+    
   randrproto = (stdenv.mkDerivation {
     name = "randrproto-1.2.1";
     builder = ./builder.sh;
@@ -1191,8 +1201,8 @@ rec {
       url = http://xcb.freedesktop.org/dist/xcb-util-0.3.0.tar.bz2;
       sha256 = "1aq82ymgvrr5hav62mjax8qar9qiszw0cj719wlznh251v0xynpq";
     };
-    buildInputs = [pkgconfig libxcb ];
-  }) // {inherit libxcb ;};
+    buildInputs = [pkgconfig gperf m4 libxcb xproto ];
+  }) // {inherit gperf m4 libxcb xproto ;};
     
   xclock = (stdenv.mkDerivation {
     name = "xclock-1.0.3";
@@ -2074,8 +2084,8 @@ rec {
       url = mirror://xorg/X11R7.4/src/everything/xorg-server-1.5.1.tar.bz2;
       sha256 = "08gbfdclx1cqlryxgqa54j2bcri0n816ldq4nyrabq5fzw5qhdig";
     };
-    buildInputs = [pkgconfig renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype mesa glproto hal inputproto kbproto libdrm mkfontdir mkfontscale openssl libpciaccess perl pixman randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXv libXxf86misc libXxf86vm zlib ]; patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch ]; propagatedBuildInputs = [libpciaccess]; 
-  }) // {inherit renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype mesa glproto hal inputproto kbproto libdrm mkfontdir mkfontscale openssl libpciaccess perl pixman randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXv libXxf86misc libXxf86vm zlib ;};
+    buildInputs = [pkgconfig renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype mesa glproto hal inputproto kbproto libdrm mkfontdir mkfontscale openssl libpciaccess perl pixman printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXv libXxf86misc libXxf86vm zlib ]; patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch ]; propagatedBuildInputs = [libpciaccess]; 
+  }) // {inherit renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype mesa glproto hal inputproto kbproto libdrm mkfontdir mkfontscale openssl libpciaccess perl pixman printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXv libXxf86misc libXxf86vm zlib ;};
     
   xorgsgmldoctools = (stdenv.mkDerivation {
     name = "xorg-sgml-doctools-1.2";
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index b2e3fa78ff6..664517ba504 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -21,25 +21,13 @@ my %pcMap;
 my %extraAttrs;
 
 
+my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mesa", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "hal", "openssl", "gperf", "m4");
+$pcMap{$_} = $_ foreach @missingPCs;
 $pcMap{"freetype2"} = "freetype";
-$pcMap{"fontconfig"} = "fontconfig";
 $pcMap{"libpng12"} = "libpng";
-$pcMap{"libdrm"} = "libdrm";
-$pcMap{"libXaw"} = "libXaw";
-$pcMap{"zlib"} = "zlib";
-$pcMap{"perl"} = "perl";
-$pcMap{"python"} = "python";
-$pcMap{"mesa"} = "mesa";
-$pcMap{"mkfontscale"} = "mkfontscale";
-$pcMap{"mkfontdir"} = "mkfontdir";
-$pcMap{"bdftopcf"} = "bdftopcf";
-$pcMap{"libxslt"} = "libxslt";
 $pcMap{"dbus-1"} = "dbus";
-$pcMap{"hal"} = "hal";
 $pcMap{"uuid"} = "e2fsprogs";
 $pcMap{"gl"} = "mesa";
-$pcMap{"openssl"} = "openssl";
-
 $pcMap{"\$PIXMAN"} = "pixman";
 $pcMap{"\$RENDERPROTO"} = "renderproto";
 
@@ -195,6 +183,7 @@ while (<>) {
     push @requires, "zlib" if $pkg =~ /xorgserver/;
     push @requires, "xf86bigfontproto" if $pkg =~ /xorgserver/;
     push @requires, "libxslt" if $pkg =~ /libxcb/;
+    push @requires, "gperf", "m4", "xproto" if $pkg =~ /xcbutil/;
     
     print "REQUIRES @requires => $pkg\n";
     $pkgRequires{$pkg} = \@requires;
diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list
index c731277fe41..796c7c10e83 100644
--- a/pkgs/servers/x11/xorg/old.list
+++ b/pkgs/servers/x11/xorg/old.list
@@ -2,6 +2,7 @@ mirror://xorg/individual/util/imake-1.0.2.tar.bz2
 mirror://xorg/individual/util/lndir-1.0.1.tar.bz2
 mirror://xorg/individual/util/xorg-cf-files-1.0.2.tar.bz2
 mirror://xorg/individual/app/bdftopcf-1.0.1.tar.bz2
+mirror://xorg/individual/proto/printproto-1.0.4.tar.bz2
 mirror://xorg/individual/lib/libXp-1.0.0.tar.bz2
 mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2
 mirror://xorg/individual/app/xmessage-1.0.2.tar.bz2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7323181246..8ff10725f2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2583,7 +2583,7 @@ let
 
   cairo = import ../development/libraries/cairo {
     inherit fetchurl stdenv pkgconfig x11 fontconfig freetype zlib libpng;
-    inherit (xlibs) pixman;
+    inherit (xlibs) pixman libxcb xcbutil;
   };
 
   cairomm = import ../development/libraries/cairomm {
@@ -4809,7 +4809,7 @@ let
   xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
     inherit fetchurl stdenv pkgconfig freetype fontconfig
       libxslt expat libdrm libpng zlib perl mesa mesaHeaders
-      xkeyboard_config dbus hal python e2fsprogs openssl;
+      xkeyboard_config dbus hal python e2fsprogs openssl gperf m4;
   });
 
   zabbixAgent = import ../servers/monitoring/zabbix {

From c0892721d02d306f52f1da4e8a1535d2136079c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 29 Oct 2008 08:57:58 +0000
Subject: [PATCH 30/60] GNU Binutils 2.19.

Untested!

svn path=/nixpkgs/branches/stdenv-updates/; revision=13141
---
 pkgs/development/tools/misc/binutils/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 29cf5074e1c..7a2b3e116a3 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, noSysDirs}:
 
-stdenv.mkDerivation {
-  name = "binutils-2.18";
+stdenv.mkDerivation rec {
+  name = "binutils-2.19";
   
   src = fetchurl {
-    url = mirror://gnu/binutils/binutils-2.18.tar.bz2;
-    sha256 = "16zfc7llbjdn69bbdy7kqgg2xa67ypgj7z5qicgwzvghaaj36yj8";
+    url = "mirror://gnu/binutils/${name}.tar.bz2";
+    sha256 = "12jjvb9p9j59a46glxy15ff5h4i2s3izpx05gf8jmxibzh7s2bmx";
   };
 
   patches = [
@@ -27,7 +27,11 @@ stdenv.mkDerivation {
   configureFlags = "--disable-werror"; # needed for dietlibc build
 
   meta = {
-    description = "Tools for manipulating binaries (linker, assembler, etc.)";
+    description = "GNU Binutils, tools for manipulating binaries (linker, assembler, 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. */

From c4df2f80d5558b2ea88529f20e174d7ff3060382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 29 Oct 2008 08:58:48 +0000
Subject: [PATCH 31/60] GNU M4 1.4.12.

Untested!

svn path=/nixpkgs/branches/stdenv-updates/; revision=13142
---
 pkgs/development/tools/misc/gnum4/SIGPIPE.patch | 15 ---------------
 pkgs/development/tools/misc/gnum4/default.nix   | 10 ++--------
 2 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/gnum4/SIGPIPE.patch

diff --git a/pkgs/development/tools/misc/gnum4/SIGPIPE.patch b/pkgs/development/tools/misc/gnum4/SIGPIPE.patch
deleted file mode 100644
index cd7d8910bc3..00000000000
--- a/pkgs/development/tools/misc/gnum4/SIGPIPE.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Make the `126.diversions' test work when run in the Nix daemon.
-See http://thread.gmane.org/gmane.comp.gnu.m4.bugs/2552/focus=2555 for details.
-
-index 02e0f6d..3cd6951 100644
---- a/doc/m4.texinfo
-+++ b/doc/m4.texinfo
-@@ -4714,7 +4714,7 @@ ifdef(`__unix__', ,
- ')m4exit(`77')')dnl
- changequote(`[', `]')dnl
- syscmd([echo 'divert(1)hi
--format(%1000000d, 1)' | m4 | sed 1q])dnl
-+format(%1000000d, 1)' | ]__program__[ | sed -n 1p])dnl
- @result{}hi
- sysval
- @result{}0
diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index 4f1c2f8c362..0158f6b5e2a 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -1,18 +1,12 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "m4-1.4.11";
+  name = "m4-1.4.12";
   src = fetchurl {
     url = "mirror://gnu/m4/${name}.tar.bz2";
-    sha256 = "1bcakymxddxykg5vbll3d9xq17m5sa3r6cprf1k27x5k4mjnhz0b";
+    sha256 = "18qvi12843kvqkpcmrjxz1929s833q5d0jzm8hc965j663g1fll5";
   };
 
-  patches = [ ./SIGPIPE.patch ];
-
-  # XXX: Work around Gnulib bug.  See:
-  # http://thread.gmane.org/gmane.comp.gnu.m4.bugs/2478 .
-  configureFlags = "gl_cv_func_strtod_works=no";
-
   doCheck = true;
 
   meta = {

From 9a3890592d37ca5036ed1cbd699999dc2345f936 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 30 Oct 2008 15:54:29 +0000
Subject: [PATCH 32/60] * Missing space.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13163
---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 5c8d935c799..b318b8f7cef 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -601,7 +601,7 @@ configurePhase() {
     fi
 
     echo "configure flags: $configureFlags ${configureFlagsArray[@]}"
-    $configureScript $configureFlags"${configureFlagsArray[@]}"
+    $configureScript $configureFlags "${configureFlagsArray[@]}"
 
     eval "$postConfigure"
 }

From 28b96c18c7913c7eeaf1f91233d026d3bf39f03f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 4 Nov 2008 09:03:05 +0000
Subject: [PATCH 33/60] GNU Ncurses 5.7.

Untested!

svn path=/nixpkgs/branches/stdenv-updates/; revision=13185
---
 .../development/libraries/ncurses/default.nix | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 1fb6c251e3c..4c034befbf9 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, unicode ? true}:
 
-stdenv.mkDerivation {
-  name = "ncurses-5.6";
+stdenv.mkDerivation rec {
+  name = "ncurses-5.7";
   
   src = fetchurl {
-    url = mirror://gnu/ncurses/ncurses-5.6.tar.gz;
-    md5 = "b6593abe1089d6aab1551c105c9300e3";
+    url = "mirror://gnu/ncurses/${name}.tar.gz";
+    sha256 = "1x4q6kma6zgg438llbgiac3kik7j2lln9v97jdffv3fyqyjxx6qa";
   };
   
   configureFlags =
@@ -15,6 +15,8 @@ stdenv.mkDerivation {
     
   preBuild = ''sed -e "s@\([[:space:]]\)sh @\1''${SHELL} @" -i */Makefile Makefile'';
 
+  doCheck = true;
+
   # When building a wide-character (Unicode) build, create backward
   # compatibility links from the the "normal" libraries to the
   # wide-character libraries (e.g. libncurses.so to libncursesw.so).
@@ -29,4 +31,26 @@ stdenv.mkDerivation {
       fi
     done;
   " else "";
+
+  meta = {
+    description = "GNU Ncurses, a free software emulation of curses in SVR4 and more";
+
+    longDescription = ''
+      The Ncurses (new curses) library is a free software emulation of
+      curses in System V Release 4.0, and more.  It uses Terminfo
+      format, supports pads and color and multiple highlights and
+      forms characters and function-key mapping, and has all the other
+      SYSV-curses enhancements over BSD Curses.
+
+      The ncurses code was developed under GNU/Linux.  It has been in
+      use for some time with OpenBSD as the system curses library, and
+      on FreeBSD and NetBSD as an external package.  It should port
+      easily to any ANSI/POSIX-conforming UNIX.  It has even been
+      ported to OS/2 Warp!
+    '';
+
+    homepage = http://www.gnu.org/software/ncurses/;
+
+    license = "X11";
+  };
 }

From 903ca0fc40e457bca167bb6d88e096a3331aa6ae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 14 Nov 2008 10:22:15 +0000
Subject: [PATCH 34/60] * Do the right thing if $sourceRoot contains spaces. 
 Contributed by   Jeevakan Suresh.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13287
---
 pkgs/stdenv/generic/setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index b318b8f7cef..d3c3aa9620d 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -517,7 +517,7 @@ unpackPhase() {
                             echo "unpacker produced multiple directories"
                             exit 1
                         fi
-                        sourceRoot=$i
+                        sourceRoot="$i"
                         ;;
                 esac
             fi
@@ -535,7 +535,7 @@ unpackPhase() {
     # necessary when sources have been copied from other store
     # locations.
     if test "dontMakeSourcesWritable" != 1; then
-        chmod -R u+w $sourceRoot
+        chmod -R u+w "$sourceRoot"
     fi
 
     eval "$postUnpack"

From cdc74e1677a6d21da0a72bdb21374ff11e4a2512 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Dec 2008 10:12:32 +0000
Subject: [PATCH 35/60] svn path=/nixpkgs/branches/stdenv-updates/;
 revision=13602

---
 pkgs/stdenv/generic/setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index d3c3aa9620d..bb81e022d4d 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -255,7 +255,7 @@ stripDirs() {
 
     if test -n "${dirs}"; then
         header "stripping (with flags $stripFlags) in $dirs"
-        find $dirs -type f -print0 | xargs -0 strip $stripFlags || true
+        find $dirs -type f -print0 | xargs -0 -r strip $stripFlags || true
         stopNest
     fi
 }
@@ -713,7 +713,7 @@ fixupPhase() {
 
     # TODO: strip _only_ ELF executables, and return || fail here...
     if test -z "$dontStrip"; then
-        stripDebugList=${stripDebugList:-lib bin sbin}
+        stripDebugList=${stripDebugList:-lib libexec bin sbin}
         if test -n "$stripDebugList"; then
             stripDirs "$stripDebugList" "${stripDebugFlags:--S}"
         fi

From 0adab29d1ea4a717a461e2f9ab8d77e09c876778 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Dec 2008 10:21:05 +0000
Subject: [PATCH 36/60] svn path=/nixpkgs/branches/stdenv-updates/;
 revision=13603

---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index bb81e022d4d..a45b4f01013 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -255,7 +255,7 @@ stripDirs() {
 
     if test -n "${dirs}"; then
         header "stripping (with flags $stripFlags) in $dirs"
-        find $dirs -type f -print0 | xargs -0 -r strip $stripFlags || true
+        find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $stripFlags || true
         stopNest
     fi
 }

From e4a8b61eba6bd06c089f3f6a819f3f550aa2d148 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Dec 2008 10:58:07 +0000
Subject: [PATCH 37/60] svn path=/nixpkgs/branches/stdenv-updates/;
 revision=13604

---
 pkgs/build-support/release/default.nix      | 3 +--
 pkgs/development/interpreters/octave/hg.nix | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix
index e3ea97876f4..65813ef9cab 100644
--- a/pkgs/build-support/release/default.nix
+++ b/pkgs/build-support/release/default.nix
@@ -5,8 +5,7 @@ with pkgs;
 rec {
 
   makeSourceTarball = args: import ./make-source-tarball.nix (
-    { inherit autoconf automake libtool;
-      stdenv = stdenvNew;
+    { inherit stdenv autoconf automake libtool;
     } // args);
 
   nixBuild = args: import ./nix-build.nix (
diff --git a/pkgs/development/interpreters/octave/hg.nix b/pkgs/development/interpreters/octave/hg.nix
index 037a2ab66b0..43d4358d11c 100644
--- a/pkgs/development/interpreters/octave/hg.nix
+++ b/pkgs/development/interpreters/octave/hg.nix
@@ -2,7 +2,7 @@
  bison, autoconf, automake, sourceByName, getConfig, lib, atlas, gperf, python, glibc, gnuplot, texinfo, texLive}:
 
 assert readline != null && ncurses != null && flex != null;
-assert g77.langF77;
+assert g77.langFortran;
 
 let commonBuildInputs = [g77 readline ncurses perl glibc]; in
 

From 821de7706a4a44d919c95f0e990ac01840788c94 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Dec 2008 11:06:23 +0000
Subject: [PATCH 38/60] * Glibc 2.9.  Got rid of 2.8 because we never used it.
 * Kernel headers 2.6.27.  However, they don't work yet because they   have a
 Perl dependency, which is annoying during the bootstrap.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13605
---
 .../glibc-2.8/nss-skip-unavail.patch          | 25 -------------------
 .../{glibc-2.8 => glibc-2.9}/builder.sh       |  0
 .../{glibc-2.8 => glibc-2.9}/default.nix      |  6 ++---
 .../glibc-2.9/nss-skip-unavail.patch          | 25 +++++++++++++++++++
 .../linux/kernel-headers/2.6.21.3.nix         | 21 ----------------
 .../{2.6.25.4.nix => 2.6.27.8.nix}            |  6 ++---
 pkgs/top-level/all-packages.nix               | 12 +++------
 7 files changed, 35 insertions(+), 60 deletions(-)
 delete mode 100644 pkgs/development/libraries/glibc-2.8/nss-skip-unavail.patch
 rename pkgs/development/libraries/{glibc-2.8 => glibc-2.9}/builder.sh (100%)
 rename pkgs/development/libraries/{glibc-2.8 => glibc-2.9}/default.nix (91%)
 create mode 100644 pkgs/development/libraries/glibc-2.9/nss-skip-unavail.patch
 delete mode 100644 pkgs/os-specific/linux/kernel-headers/2.6.21.3.nix
 rename pkgs/os-specific/linux/kernel-headers/{2.6.25.4.nix => 2.6.27.8.nix} (77%)

diff --git a/pkgs/development/libraries/glibc-2.8/nss-skip-unavail.patch b/pkgs/development/libraries/glibc-2.8/nss-skip-unavail.patch
deleted file mode 100644
index 4d29082f941..00000000000
--- a/pkgs/development/libraries/glibc-2.8/nss-skip-unavail.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -rc glibc-2.7-orig/sysdeps/posix/getaddrinfo.c glibc-2.7/sysdeps/posix/getaddrinfo.c
-*** glibc-2.7-orig/sysdeps/posix/getaddrinfo.c	2007-10-17 18:05:12.000000000 +0200
---- glibc-2.7/sysdeps/posix/getaddrinfo.c	2008-04-08 12:17:09.000000000 +0200
-***************
-*** 498,505 ****
-  	  int no_data = 0;
-  	  int no_inet6_data = 0;
-  	  service_user *nip = NULL;
-- 	  enum nss_status inet6_status = NSS_STATUS_UNAVAIL;
-- 	  enum nss_status status = NSS_STATUS_UNAVAIL;
-  	  int no_more;
-  	  int old_res_options;
-  
---- 498,503 ----
-***************
-*** 689,694 ****
---- 687,694 ----
-  
-  	  while (!no_more)
-  	    {
-+               enum nss_status inet6_status = NSS_STATUS_UNAVAIL;
-+               enum nss_status status = NSS_STATUS_UNAVAIL;
-  	      nss_gethostbyname3_r fct = NULL;
-  	      if (req->ai_flags & AI_CANONNAME)
-  		/* No need to use this function if we do not look for
diff --git a/pkgs/development/libraries/glibc-2.8/builder.sh b/pkgs/development/libraries/glibc-2.9/builder.sh
similarity index 100%
rename from pkgs/development/libraries/glibc-2.8/builder.sh
rename to pkgs/development/libraries/glibc-2.9/builder.sh
diff --git a/pkgs/development/libraries/glibc-2.8/default.nix b/pkgs/development/libraries/glibc-2.9/default.nix
similarity index 91%
rename from pkgs/development/libraries/glibc-2.8/default.nix
rename to pkgs/development/libraries/glibc-2.9/default.nix
index 6f39ebbf8d4..a5469dc8a6f 100644
--- a/pkgs/development/libraries/glibc-2.8/default.nix
+++ b/pkgs/development/libraries/glibc-2.9/default.nix
@@ -4,13 +4,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "glibc-2.8-20081006";
+  name = "glibc-2.9";
   
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = "ftp://sources.redhat.com/pub/glibc/snapshots/${name}.tar.bz2";
-    sha256 = "e32021c14f0bda55b6a5d2a98ac878a03b2c6f78a1ab4a11f0386a51eda1d58e";
+    url = http://nixos.org/tarballs/glibc-2.9-20081208.tar.bz2;
+    sha256 = "0zhxbgcsl97pf349m0lz8d5ljvvzrcqc23yf08d888xlk4ms8m3h";
   };
 
   inherit kernelHeaders installLocales;
diff --git a/pkgs/development/libraries/glibc-2.9/nss-skip-unavail.patch b/pkgs/development/libraries/glibc-2.9/nss-skip-unavail.patch
new file mode 100644
index 00000000000..dc09b509870
--- /dev/null
+++ b/pkgs/development/libraries/glibc-2.9/nss-skip-unavail.patch
@@ -0,0 +1,25 @@
+diff -rc glibc-2.9-20081208-orig/sysdeps/posix/getaddrinfo.c glibc-2.9-20081208/sysdeps/posix/getaddrinfo.c
+*** glibc-2.9-20081208-orig/sysdeps/posix/getaddrinfo.c	2008-07-30 21:14:22.000000000 +0200
+--- glibc-2.9-20081208/sysdeps/posix/getaddrinfo.c	2008-12-10 11:39:32.000000000 +0100
+***************
+*** 505,512 ****
+  	  int no_data = 0;
+  	  int no_inet6_data = 0;
+  	  service_user *nip = NULL;
+- 	  enum nss_status inet6_status = NSS_STATUS_UNAVAIL;
+- 	  enum nss_status status = NSS_STATUS_UNAVAIL;
+  	  int no_more;
+  	  int old_res_options;
+  
+--- 505,510 ----
+***************
+*** 702,707 ****
+--- 700,707 ----
+  
+  	  while (!no_more)
+  	    {
++ 	      enum nss_status inet6_status = NSS_STATUS_UNAVAIL;
++ 	      enum nss_status status = NSS_STATUS_UNAVAIL;
+  	      nss_gethostbyname4_r fct4
+  		= __nss_lookup_function (nip, "gethostbyname4_r");
+  	      if (fct4 != NULL)
diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.21.3.nix b/pkgs/os-specific/linux/kernel-headers/2.6.21.3.nix
deleted file mode 100644
index 2f0b00fcd5f..00000000000
--- a/pkgs/os-specific/linux/kernel-headers/2.6.21.3.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{stdenv, fetchurl}:
-
-assert stdenv.isLinux;
-
-stdenv.mkDerivation {
-  name = "linux-headers-2.6.21.3";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.21.3.tar.bz2";
-    sha256 = "17rxvw42z4amijb8nya54c2h6bb8gnxnr628arv8shmsccf8qsp5";
-  };
-
-  platform = 
-    if stdenv.system == "i686-linux" then "i386" else
-    if stdenv.system == "x86_64-linux" then "x86_64" else
-    if stdenv.system == "powerpc-linux" then "powerpc" else
-    abort "don't know what the kernel include directory is called for this platform";
-
-  extraIncludeDirs =
-    if stdenv.system == "powerpc-linux" then ["ppc"] else [];
-}
diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.25.4.nix b/pkgs/os-specific/linux/kernel-headers/2.6.27.8.nix
similarity index 77%
rename from pkgs/os-specific/linux/kernel-headers/2.6.25.4.nix
rename to pkgs/os-specific/linux/kernel-headers/2.6.27.8.nix
index c6d1cc409fc..b585c462a28 100644
--- a/pkgs/os-specific/linux/kernel-headers/2.6.25.4.nix
+++ b/pkgs/os-specific/linux/kernel-headers/2.6.27.8.nix
@@ -3,13 +3,13 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation {
-  name = "linux-headers-2.6.25.4";
+  name = "linux-headers-2.6.27.8";
   
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.25.4.tar.bz2";
-    sha256 = "0hp36pwphw5rs9kwm5ksr7ynfmzgpcd8gi45rigbilvcvmsdnxf3";
+    url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.27.8.tar.bz2";
+    sha256 = "0pgh2zg4md9jvv64s03m3dkwdnliygjl7mxjmg1qki89jc2s62ik";
   };
 
   platform = 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21439923d69..99c2a5095c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2945,14 +2945,14 @@ let
     inherit fetchurl stdenv pkgconfig gettext;
   };
 
-  glibc = useFromStdenv "glibc" glibc28;
+  glibc = useFromStdenv "glibc" glibc29;
 
   glibc27 = import ../development/libraries/glibc-2.7 {
     inherit fetchurl stdenv kernelHeaders;
     #installLocales = false;
   };
 
-  glibc28 = import ../development/libraries/glibc-2.8 {
+  glibc29 = import ../development/libraries/glibc-2.9 {
     inherit fetchurl stdenv kernelHeaders;
     installLocales = getPkgConfig "glibc" "locales" true;
   };
@@ -6023,19 +6023,15 @@ let
     inherit fetchurl stdenv unifdef;
   };
 
-  kernelHeaders_2_6_21 = import ../os-specific/linux/kernel-headers/2.6.21.3.nix {
-    inherit fetchurl stdenv;
-  };
-
   kernelHeaders_2_6_23 = import ../os-specific/linux/kernel-headers/2.6.23.16.nix {
     inherit fetchurl stdenv;
   };
 
-  kernelHeaders_2_6_25 = import ../os-specific/linux/kernel-headers/2.6.25.4.nix {
+  kernelHeaders_2_6_26 = import ../os-specific/linux/kernel-headers/2.6.26.2.nix {
     inherit fetchurl stdenv;
   };
 
-  kernelHeaders_2_6_26 = import ../os-specific/linux/kernel-headers/2.6.26.2.nix {
+  kernelHeaders_2_6_27 = import ../os-specific/linux/kernel-headers/2.6.27.8.nix {
     inherit fetchurl stdenv;
   };
 

From 4998f96209a7de8289c4b54aeab0cd947f6bb31b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Jan 2009 16:11:22 +0000
Subject: [PATCH 39/60] * GNU tar 1.21.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13787
---
 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 e2d9b9eee8b..6752b8e09ee 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "gnutar-1.20";
+  name = "gnutar-1.21";
   
   src = fetchurl {
-    url = mirror://gnu/tar/tar-1.20.tar.bz2;
-    sha256 = "1swx3whm2vh0qzq8v04vgwk5zds6zlznk52xwivj7p2szcxg72xy";
+    url = mirror://gnu/tar/tar-1.21.tar.bz2;
+    sha256 = "0l5kmq3s6rbps6h62li5a1yycchaa2mnhv8b8qlak90w0z970v6w";
   };
   
   patches = [./implausible.patch];

From 1134464c49ab056a52d8ddd8babd5c2888abbd5b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Jan 2009 17:10:29 +0000
Subject: [PATCH 40/60] * Start of the new, simplified stdenv-linux bootstrap
 binaries.   Instead of using a mishmash of statically linked and dietlibc  
 programs (which often have problems on various platforms), we just   use
 normal, dynamically linked binaries, and use some patchelf magic   to rewrite
 them so that they can find Glibc.  Also include G++ and   Perl, since there
 are some builds in the bootstrap that need them.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13788
---
 pkgs/stdenv/linux/test.nix | 186 +++++++++++++++++++++++++++++++++++++
 1 file changed, 186 insertions(+)
 create mode 100644 pkgs/stdenv/linux/test.nix

diff --git a/pkgs/stdenv/linux/test.nix b/pkgs/stdenv/linux/test.nix
new file mode 100644
index 00000000000..209ec651e1d
--- /dev/null
+++ b/pkgs/stdenv/linux/test.nix
@@ -0,0 +1,186 @@
+{system ? builtins.currentSystem}:
+
+with import ../../top-level/all-packages.nix {inherit system;};
+
+rec {
+
+
+  # We want coreutils without ACL support.
+  coreutils_ = coreutils.function (args: {
+    aclSupport = false;
+  });
+
+  
+  build = 
+
+    stdenv.mkDerivation {
+      name = "build";
+
+      buildInputs = [nukeReferences];
+
+      buildCommand = ''
+        ensureDir $out/bin $out/lib $out/libexec
+
+        # Copy what we need of Glibc.
+        cp -d ${glibc}/lib/ld-*.so* $out/lib
+        cp -d ${glibc}/lib/libc*.so* $out/lib
+        cp -d ${glibc}/lib/libc_nonshared.a $out/lib
+        cp -d ${glibc}/lib/libm*.so* $out/lib
+        cp -d ${glibc}/lib/libdl*.so* $out/lib
+        cp -d ${glibc}/lib/librt*.so*  $out/lib
+        cp -d ${glibc}/lib/libpthread*.so* $out/lib
+        cp -d ${glibc}/lib/libnsl*.so* $out/lib
+        cp -d ${glibc}/lib/libutil*.so* $out/lib
+        cp -d ${glibc}/lib/crt?.o $out/lib
+        
+        cp -rL ${glibc}/include $out
+        chmod -R u+w $out/include
+        
+        # Hopefully we won't need these.
+        rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video
+        
+        # Copy coreutils, bash, etc.
+        cp ${coreutils_}/bin/* $out/bin
+        (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)
+        
+        cp ${bash}/bin/bash $out/bin
+        cp ${findutils}/bin/find $out/bin
+        cp ${findutils}/bin/xargs $out/bin
+        cp -d ${diffutils}/bin/* $out/bin
+        cp -d ${gnused}/bin/* $out/bin
+        cp -d ${gnugrep}/bin/* $out/bin
+        cp ${gawk}/bin/gawk $out/bin
+        cp -d ${gawk}/bin/awk $out/bin
+        cp ${gnutar}/bin/tar $out/bin
+        cp ${gzip}/bin/gzip $out/bin
+        cp ${bzip2}/bin/bzip2 $out/bin
+        cp -d ${gnumake}/bin/* $out/bin
+        cp -d ${patch}/bin/* $out/bin
+        cp ${patchelf}/bin/* $out/bin
+        cp ${replace}/bin/* $out/bin
+
+        cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep
+        
+        # Copy what we need of gcc.    
+        cp -d ${gcc.gcc}/bin/gcc $out/bin
+        cp -d ${gcc.gcc}/bin/cpp $out/bin
+        cp -d ${gcc.gcc}/bin/g++ $out/bin
+        cp -d ${gcc.gcc}/lib/libgcc_s.so* $out/lib
+        cp -d ${gcc.gcc}/lib/libstdc++.so* $out/lib
+        cp -rd ${gcc.gcc}/lib/gcc $out/lib
+        chmod -R u+w $out/lib
+        rm -f $out/lib/gcc/*/*/include/linux
+        rm -f $out/lib/gcc/*/*/include/sound
+        cp -rd ${gcc.gcc}/libexec/* $out/libexec
+        cp -rd ${gcc.gcc}/include/c++ $out/include
+
+        # Copy binutils.
+        for i in as ld ar ranlib nm strip readelf objdump; do
+          cp ${binutils}/bin/$i $out/bin
+        done
+
+        # Copy perl.
+        cp ${perl}/bin/perl $out/bin
+        
+        chmod -R u+w $out
+        
+        # Strip executables even further.
+        for i in $out/bin/* $out/libexec/gcc/*/*/*; do
+            if test -x $i -a ! -L $i; then
+                chmod +w $i
+                strip -s $i || true
+            fi
+        done
+        
+        nuke-refs $out/bin/*
+        nuke-refs $out/lib/*
+        nuke-refs $out/libexec/gcc/*/*/*
+
+        sleep 5
+        (cd $out && tar cvfj $out/static-tools.tar.bz2 bin lib libexec include)
+      ''; # */
+
+      # The result should not contain any references (store paths) so
+      # that we can safely copy them out of the store and to other
+      # locations in the store.
+      allowedReferences = [];
+    };
+
+  
+  unpack =
+    
+    stdenv.mkDerivation {
+      name = "unpack";
+
+      buildCommand = ''
+        tar xvfj ${build}/static-tools.tar.bz2
+        cp -prd . $out
+        rm $out/env-vars
+
+        for i in $out/bin/* $out/libexec/gcc/*/*/*; do
+            echo patching $i
+            if ! test -L $i; then
+                LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux.so.2 \
+                    $out/bin/patchelf --set-interpreter $out/lib/ld-linux.so.2 --set-rpath $out/lib $i
+            fi
+        done
+
+        # Fix the libc linker script.
+        for i in $out/lib/libc.so; do
+            cat $i | sed "s|/nix/store/e*-[^/]*/|$out/|g" > $i.tmp
+            mv $i.tmp $i
+        done
+      ''; # */
+
+      allowedReferences = ["out"];
+    };
+
+
+  test =
+
+    stdenv.mkDerivation {
+      name = "test";
+
+      LD_LIBRARY_PATH = "${unpack}/lib";
+
+      realBuilder = "${unpack}/bin/bash";
+      
+      buildCommand = ''
+        export PATH=${unpack}/bin
+        ls -l
+        mkdir $out
+        mkdir $out/bin
+        sed --version
+        find --version
+        diff --version
+        patch --version
+        make --version
+        awk --version
+        grep --version
+        gcc --version
+
+        perl -e 'print 1 + 2, "\n";'
+
+        export CPP="cpp -B${unpack}"
+        export CC="gcc -B${unpack} -Wl,-dynamic-linker,${unpack}/lib/ld-linux.so.2 -Wl,-rpath,${unpack}/lib"
+        export CXX="g++ -B${unpack} -Wl,-dynamic-linker,${unpack}/lib/ld-linux.so.2 -Wl,-rpath,${unpack}/lib"
+        
+        echo '#include <stdio.h>' >> foo.c
+        echo 'int main() { printf("Hello World\n"); return 0; }' >> foo.c
+        $CC -o $out/bin/foo foo.c
+        $out/bin/foo
+
+        echo '#include <iostream>' >> bar.cc
+        echo 'int main() { std::cout << "Hello World\n"; }' >> bar.cc
+        $CXX -o $out/bin/bar bar.cc
+        $out/bin/bar
+
+        tar xvf ${hello.src}
+        cd hello-*
+        ./configure --prefix=$out || cat config.log
+        make
+        make install
+      ''; # */
+    };
+    
+}

From 2f88c471d4ba1255fdc42eda7d88e6a94dcbb17c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Jan 2009 17:12:55 +0000
Subject: [PATCH 41/60] svn path=/nixpkgs/branches/stdenv-updates/;
 revision=13789

---
 pkgs/stdenv/linux/test.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/stdenv/linux/test.nix b/pkgs/stdenv/linux/test.nix
index 209ec651e1d..8fb1909d694 100644
--- a/pkgs/stdenv/linux/test.nix
+++ b/pkgs/stdenv/linux/test.nix
@@ -96,7 +96,6 @@ rec {
         nuke-refs $out/lib/*
         nuke-refs $out/libexec/gcc/*/*/*
 
-        sleep 5
         (cd $out && tar cvfj $out/static-tools.tar.bz2 bin lib libexec include)
       ''; # */
 
@@ -177,7 +176,7 @@ rec {
 
         tar xvf ${hello.src}
         cd hello-*
-        ./configure --prefix=$out || cat config.log
+        ./configure --prefix=$out
         make
         make install
       ''; # */

From 60ac36f9c57699d6501ccc5065366df99e6b7690 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Jan 2009 17:13:14 +0000
Subject: [PATCH 42/60] * Ignore symlinks.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13790
---
 pkgs/build-support/nuke-references/builder.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/nuke-references/builder.sh b/pkgs/build-support/nuke-references/builder.sh
index 867262c516b..a08dfa2bd94 100644
--- a/pkgs/build-support/nuke-references/builder.sh
+++ b/pkgs/build-support/nuke-references/builder.sh
@@ -4,9 +4,11 @@ ensureDir $out/bin
 cat > $out/bin/nuke-refs <<EOF
 #! $SHELL -e
 for i in \$*; do
-    cat \$i | sed "s|/nix/store/[a-z0-9]*-|/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" > \$i.tmp
-    if test -x \$i; then chmod +x \$i.tmp; fi
-    mv \$i.tmp \$i
+    if ! test -L \$i; then
+        cat \$i | sed "s|/nix/store/[a-z0-9]*-|/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" > \$i.tmp
+        if test -x \$i; then chmod +x \$i.tmp; fi
+        mv \$i.tmp \$i
+    fi
 done
 EOF
 chmod +x $out/bin/nuke-refs

From 88ba45c4992f04a40395ad885a5c5402d1b0c642 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Jan 2009 17:13:35 +0000
Subject: [PATCH 43/60] svn path=/nixpkgs/branches/stdenv-updates/;
 revision=13791

---
 pkgs/tools/text/gnugrep/default.nix | 2 ++
 pkgs/top-level/all-packages.nix     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index c44aa10c700..5e1efba7c00 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -18,4 +18,6 @@ stdenv.mkDerivation {
     homepage = http://www.gnu.org/software/grep/;
     description = "GNU implementation of the Unix grep command";
   };
+
+  passthru = {inherit pcre;};
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 750236f44d4..52281a9b5c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -596,7 +596,7 @@ let
   };
 
   coreutils = useFromStdenv "coreutils"
-    ((if stdenv ? isDietLibC
+    (makeOverridable (if stdenv ? isDietLibC
       then import ../tools/misc/coreutils-5
       else import ../tools/misc/coreutils)
     {

From d8f6e06ae4fec3d3ccb7721d8550507354b51f24 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Jan 2009 10:45:46 +0000
Subject: [PATCH 44/60] * Latest gmp, mpfr libraries.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13803
---
 pkgs/development/libraries/gmp/default.nix  | 8 +++++---
 pkgs/development/libraries/mpfr/default.nix | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/gmp/default.nix b/pkgs/development/libraries/gmp/default.nix
index 967c60a35b3..459a57ab5ca 100644
--- a/pkgs/development/libraries/gmp/default.nix
+++ b/pkgs/development/libraries/gmp/default.nix
@@ -1,15 +1,17 @@
 {stdenv, fetchurl, m4, cxx ? true }:
 
 stdenv.mkDerivation {
-  name = "gmp-4.2.3";
+  name = "gmp-4.2.4";
 
   src = fetchurl {
-    url = mirror://gnu/gmp/gmp-4.2.3.tar.bz2;
-    sha256 = "139b5abc49833832184c0a03ff6fc64c59ef102b420d2a5884ad78af5647414b";
+    url = mirror://gnu/gmp/gmp-4.2.4.tar.bz2;
+    sha256 = "0s73xzhwrfqcr1gmhsink1fhfzjlkyk70b1bdyrm76m6b3jv082l";
   };
 
   buildInputs = [m4];
+  
   configureFlags = if cxx then "--enable-cxx" else "--disable-cxx";
+  
   doCheck = true;
 
   meta = {
diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index b74b8af02e1..f6456ea0c4e 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, gmp}:
 
 stdenv.mkDerivation {
-  name = "mpfr-2.3.1";
+  name = "mpfr-2.3.2";
 
   src = fetchurl {
-    url = http://www.mpfr.org/mpfr-current/mpfr-2.3.1.tar.bz2;
-    sha256 = "0c44va4plxfd9zm7aa24173im38svnb15lbxql5hvxbc9bgzjmyq";
+    url = http://www.mpfr.org/mpfr-current/mpfr-2.3.2.tar.bz2;
+    sha256 = "0k5s5whhz5njp4ybim8c7rcin5ba1s2apwijmg7bg0p1jv4piq0q";
   };
 
   buildInputs = [gmp];

From f7ad18404187e77da712a495ddefa76872ca6aac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Jan 2009 11:01:20 +0000
Subject: [PATCH 45/60] * ncurses: don't do make check because it doesn't have
 one.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13804
---
 .../development/libraries/ncurses/default.nix | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 4c034befbf9..d82c9de81f2 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -8,29 +8,27 @@ stdenv.mkDerivation rec {
     sha256 = "1x4q6kma6zgg438llbgiac3kik7j2lln9v97jdffv3fyqyjxx6qa";
   };
   
-  configureFlags =
-    "--with-shared --includedir=\${out}/include" +
-    (if unicode then " --enable-widec " else " ") +
-    " --without-debug";
+  configureFlags = ''
+    --with-shared --includedir=''${out}/include --without-debug
+    ${if unicode then "--enable-widec" else ""}
+  '';
     
   preBuild = ''sed -e "s@\([[:space:]]\)sh @\1''${SHELL} @" -i */Makefile Makefile'';
 
-  doCheck = true;
-
   # When building a wide-character (Unicode) build, create backward
   # compatibility links from the the "normal" libraries to the
   # wide-character libraries (e.g. libncurses.so to libncursesw.so).
-  postInstall = if unicode then "
+  postInstall = if unicode then ''
     chmod -v 644 $out/lib/libncurses++w.a
     for lib in curses ncurses form panel menu; do
-      if test -e $out/lib/lib\${lib}w.a; then
-        rm -vf $out/lib/lib\${lib}.so
-        echo \"INPUT(-l\${lib}w)\" > $out/lib/lib\${lib}.so
-        ln -svf lib\${lib}w.a $out/lib/lib\${lib}.a
-        ln -svf lib\${lib}w.so.5 $out/lib/lib\${lib}.so.5
+      if test -e $out/lib/lib''${lib}w.a; then
+        rm -vf $out/lib/lib$lib.so
+        echo "INPUT(-l''${lib}w)" > $out/lib/lib$lib.so
+        ln -svf lib''${lib}w.a $out/lib/lib$lib.a
+        ln -svf lib''${lib}w.so.5 $out/lib/lib$lib.so.5
       fi
     done;
-  " else "";
+  '' else "";
 
   meta = {
     description = "GNU Ncurses, a free software emulation of curses in SVR4 and more";

From 72822ebbc01c86d148889c3c34c2babd10bd36bb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Jan 2009 16:22:27 +0000
Subject: [PATCH 46/60] * Put Glibc at the very end of the GCC header search
 path.  This   should fix previous problems with GCC 4.3 in compiling C++ code
   where e.g. <cassert> has to appear before <assert.h> in the search   path
 due to the former's use of #include_next.  The previous "fix"   broke
 compilation of C code by placing the C++ include directory   before the Glibc
 include directory (which would barf on   e.g. <complex.h>, which appears in
 both).

svn path=/nixpkgs/branches/stdenv-updates/; revision=13806
---
 pkgs/build-support/gcc-wrapper/builder.sh | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh
index 1a23294dd74..0691b427325 100644
--- a/pkgs/build-support/gcc-wrapper/builder.sh
+++ b/pkgs/build-support/gcc-wrapper/builder.sh
@@ -17,7 +17,7 @@ if test -z "$nativeLibc"; then
     # against the crt1.o from our own glibc, rather than the one in
     # /usr/lib.  (This is only an issue when using an `impure'
     # compiler/linker, i.e., one that searches /usr/lib and so on.)
-    echo "-B$libc/lib/ -isystem $libc/include" > $out/nix-support/libc-cflags
+    echo "-B$libc/lib/ -idirafter $libc/include" > $out/nix-support/libc-cflags
     
     echo "-L$libc/lib" > $out/nix-support/libc-ldflags
 
@@ -37,17 +37,6 @@ else
     gccLDFlags="$gccLDFlags -L$gcc/lib"
     echo "$gccLDFlags" > $out/nix-support/gcc-ldflags
 
-    # Explicitly add the libstdc++ header files to the search path.
-    # G++ already finds them automatically, but it adds them to the
-    # very end of the header search path.  This means that
-    # #include_next constructs in the libstdc++ headers won't find the
-    # Glibc headers, since they appear *before* the libstdc++ headers.
-    # So we add them here using -isystem.  Note that `add-flags' adds
-    # the libc flags before the gcc flags.
-    if test -e $gcc/include/c++/*.*; then
-        gccCFlags="$gccCFlags -isystem $(echo $gcc/include/c++/*.*)"
-    fi
-
     # GCC shows $gcc/lib in `gcc -print-search-dirs', but not
     # $gcc/lib64 (even though it does actually search there...)..
     # This confuses libtool.  So add it to the compiler tool search

From 808bf6d34add1211e0b16bff64d1b392fbbcdcdd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Jan 2009 18:49:58 +0000
Subject: [PATCH 47/60] * Make the nested output patch in GNU Make runtime
 configurable (by   setting the NIX_INDENT_MAKE variable; disabled by default)
 so we   don't need a separate gnumakeNix package.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13807
---
 .../tools/build-managers/gnumake/default.nix  | 12 ++--
 .../tools/build-managers/gnumake/log.patch    | 65 +++++++++++--------
 pkgs/stdenv/common-path.nix                   |  2 +-
 pkgs/stdenv/linux/default.nix                 |  2 +-
 pkgs/stdenv/linux/make-bootstrap-tools.nix    |  4 +-
 pkgs/stdenv/mingw/pkgs/default.nix            |  2 +-
 pkgs/top-level/all-packages.nix               | 14 ++--
 7 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix
index cd4c2a98939..09ac6b9142e 100644
--- a/pkgs/development/tools/build-managers/gnumake/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, log2xmlSupport ? true}:
+{stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "gnumake-3.81";
@@ -9,13 +9,11 @@ stdenv.mkDerivation {
   };
   
   patches =
-    (if log2xmlSupport
-        # Provide nested log output for subsequent pretty-printing by
-        # nix-log2xml.
-        then [ ./log.patch ]
-	else [])
-    ++
     [
+      # Provide nested log output for subsequent pretty-printing by
+      # nix-log2xml.
+      ./log.patch
+      
       # Purity: don't look for library dependencies (of the form
       # `-lfoo') in /lib and /usr/lib.  It's a stupid feature anyway.
       # Likewise, when searching for included Makefiles, don't look in
diff --git a/pkgs/development/tools/build-managers/gnumake/log.patch b/pkgs/development/tools/build-managers/gnumake/log.patch
index 3104e1f2bde..0f3ed6d7299 100644
--- a/pkgs/development/tools/build-managers/gnumake/log.patch
+++ b/pkgs/development/tools/build-managers/gnumake/log.patch
@@ -1,6 +1,6 @@
 diff -rc make-3.81-orig/job.c make-3.81/job.c
 *** make-3.81-orig/job.c	2006-03-20 04:03:04.000000000 +0100
---- make-3.81/job.c	2008-02-20 17:41:25.000000000 +0100
+--- make-3.81/job.c	2009-01-19 19:37:28.000000000 +0100
 ***************
 *** 1083,1089 ****
        appear.  */
@@ -14,24 +14,24 @@ diff -rc make-3.81-orig/job.c make-3.81/job.c
        appear.  */
   
     message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag))
-! 	   ? "\e[3s\e[a%s\e[b" : (char *) 0, p);
+!           ? (enable_nested_output ? "\e[3s\e[a%s\e[b" : "%s") : (char *) 0, p);
   
     /* Tell update_goal_chain that a command has been started on behalf of
        this target.  It is important that this happens here and not in
 diff -rc make-3.81-orig/main.c make-3.81/main.c
 *** make-3.81-orig/main.c	2006-03-20 03:36:37.000000000 +0100
---- make-3.81/main.c	2008-02-20 17:41:25.000000000 +0100
+--- make-3.81/main.c	2009-01-19 19:41:41.000000000 +0100
 ***************
 *** 886,891 ****
 --- 886,900 ----
   }
   
   
-+ static void closeNesting()
++ static void close_nesting()
 + {
-+   while (logNestingStdout--)
++   while (stdout_nesting_level--)
 +     printf("\e[q");
-+   while (logNestingStderr--)
++   while (stderr_nesting_level--)
 +     fprintf(stderr, "\e[q");
 + }
 + 
@@ -41,25 +41,28 @@ diff -rc make-3.81-orig/main.c make-3.81/main.c
   main (int argc, char **argv)
 ***************
 *** 931,936 ****
---- 940,947 ----
+--- 940,950 ----
     atexit (close_stdout);
   #endif
   
-+   atexit(closeNesting);
++   atexit(close_nesting);
++ 
++   if (getenv("NIX_INDENT_MAKE"))
++     enable_nested_output = 1;
 + 
     /* Needed for OS/2 */
     initialize_main(&argc, &argv);
   
 ***************
 *** 3095,3100 ****
---- 3106,3117 ----
+--- 3109,3120 ----
   
     /* Use entire sentences to give the translators a fighting chance.  */
   
-+   if (entering)
++   if (entering && enable_nested_output)
 +     {
 +       printf("\e[p");
-+       logNestingStdout++;
++       stdout_nesting_level++;
 +     }
 +   
     if (makelevel == 0)
@@ -67,48 +70,56 @@ diff -rc make-3.81-orig/main.c make-3.81/main.c
         if (entering)
 ***************
 *** 3124,3129 ****
---- 3141,3155 ----
+--- 3144,3159 ----
           printf (_("%s[%u]: Leaving directory `%s'\n"),
                   program, makelevel, starting_directory);
   
-+   if (!entering)
++   if (!entering && enable_nested_output)
 +     {
 +       printf("\e[q");
-+       logNestingStdout--;
++       stdout_nesting_level--;
 +     }
 +  
     /* Flush stdout to be sure this comes before any stderr output.  */
     fflush (stdout);
   }
 + 
-+ int logNestingStdout = 0;
-+ int logNestingStderr = 0;
++ int enable_nested_output = 0;
++ int stdout_nesting_level = 0;
++ int stderr_nesting_level = 0;
 diff -rc make-3.81-orig/make.h make-3.81/make.h
 *** make-3.81-orig/make.h	2006-02-16 00:54:43.000000000 +0100
---- make-3.81/make.h	2008-02-20 17:41:25.000000000 +0100
+--- make-3.81/make.h	2009-01-19 19:32:03.000000000 +0100
 ***************
 *** 609,611 ****
---- 609,613 ----
+--- 609,614 ----
   #define ENULLLOOP(_v,_c)   do{ errno = 0; \
                                  while (((_v)=_c)==0 && errno==EINTR); }while(0)
   
-+ extern int logNestingStdout;
-+ extern int logNestingStderr;
++ extern int enable_nested_output;
++ extern int stdout_nesting_level;
++ extern int stderr_nesting_level;
 diff -rc make-3.81-orig/remake.c make-3.81/remake.c
 *** make-3.81-orig/remake.c	2006-03-20 03:36:37.000000000 +0100
---- make-3.81/remake.c	2008-02-20 17:44:01.000000000 +0100
+--- make-3.81/remake.c	2009-01-19 19:39:40.000000000 +0100
 ***************
 *** 1120,1126 ****
---- 1120,1131 ----
+--- 1120,1137 ----
         /* The normal case: start some commands.  */
         if (!touch_flag || file->cmds->any_recurse)
   	{
-+           log_working_directory (1);
-+           fprintf(stderr, "\e[pbuilding %s\n", file->name);
-+           logNestingStderr++;
++           if (enable_nested_output) 
++             {
++               log_working_directory (1);
++               fprintf(stderr, "\e[pbuilding %s\n", file->name);
++               stderr_nesting_level++;
++             }
   	  execute_file_commands (file);
-+           fprintf(stderr, "\e[q");
-+           logNestingStderr--;
++           if (enable_nested_output) 
++             {
++               fprintf(stderr, "\e[q");
++               stderr_nesting_level--;
++             }
   	  return;
   	}
   
diff --git a/pkgs/stdenv/common-path.nix b/pkgs/stdenv/common-path.nix
index 227870a943a..3b267a543c6 100644
--- a/pkgs/stdenv/common-path.nix
+++ b/pkgs/stdenv/common-path.nix
@@ -8,7 +8,7 @@
   pkgs.gnutar
   pkgs.gzip
   pkgs.bzip2
-  pkgs.gnumakeNix
+  pkgs.gnumake
   pkgs.bash
   pkgs.patch
   pkgs.replace
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index da97b6a4c19..21594bad5a9 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -218,7 +218,7 @@ rec {
       inherit (stdenvLinuxBoot2Pkgs) binutils /* gcc */ glibc;
       inherit (stdenvLinuxBoot3Pkgs)
         gzip bzip2 bash coreutils diffutils findutils gawk
-        gnumakeNix gnused gnutar gnugrep patch patchelf
+        gnumake gnused gnutar gnugrep patch patchelf
         attr acl;
     };
   };
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 9d381cca7e1..71aa638378c 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -10,7 +10,7 @@ let
   # dietlibc.
   pkgsToRemove = 
     [ "binutils" "gcc" "coreutils" "findutils" "diffutils" "gnused" "gnugrep"
-      "gawk" "gnutar" "gzip" "bzip2" "gnumakeNix" "bash" "patch" "patchelf"
+      "gawk" "gnutar" "gzip" "bzip2" "gnumake" "bash" "patch" "patchelf"
     ];
 
   pkgsDiet = import ../../top-level/all-packages.nix {
@@ -28,7 +28,7 @@ let
 
     inherit (pkgsDiet)
       coreutils diffutils gnugrep
-      gzip bzip2 gnumakeNix bash patch binutils curl;
+      gzip bzip2 gnumake bash patch binutils curl;
 
     findutils = pkgsDiet.findutils4227; # 4.2.28 is broken
       
diff --git a/pkgs/stdenv/mingw/pkgs/default.nix b/pkgs/stdenv/mingw/pkgs/default.nix
index c0bad491e78..6c843e8d394 100755
--- a/pkgs/stdenv/mingw/pkgs/default.nix
+++ b/pkgs/stdenv/mingw/pkgs/default.nix
@@ -150,7 +150,7 @@ rec {
   pkgs.gnutar
   pkgs.gzip
   pkgs.bzip2
-  pkgs.gnumakeNix
+  pkgs.gnumake
   pkgs.bash
   pkgs.patch
   */
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 52281a9b5c9..b7e92e3a1e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2386,16 +2386,10 @@ let
     inherit fetchurl stdenv;
   };
 
-  gnumake = import ../development/tools/build-managers/gnumake {
-    inherit fetchurl stdenv;
-    log2xmlSupport = getConfig [ "gnuMake" "log2xmlSupport" ] false;
-  };
-
-  # The modified version of GNU Make with support for `nix-log2xml'.
-  gnumakeNix = import ../development/tools/build-managers/gnumake {
-    inherit fetchurl stdenv;
-    log2xmlSupport = true;
-  };
+  gnumake = useFromStdenv "gnumake"
+    (import ../development/tools/build-managers/gnumake {
+      inherit fetchurl stdenv;
+    });
 
   gnumake380 = import ../development/tools/build-managers/gnumake-3.80 {
     inherit fetchurl stdenv;

From 63246c648fa78f41aa2789e3974c9d83be654959 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Jan 2009 20:31:02 +0000
Subject: [PATCH 48/60] * Turn on Make indentation.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13810
---
 pkgs/stdenv/generic/setup.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index a45b4f01013..f2220892eda 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -237,6 +237,10 @@ if test "$NIX_DEBUG" = "1"; then
 fi
 
 
+# Make GNU Make produce nested output.
+export NIX_INDENT_MAKE=1
+
+
 ######################################################################
 # Misc. helper functions.
 

From fce6b5a23303fb2c9a31eae323a1440a20fca5f2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Jan 2009 20:35:03 +0000
Subject: [PATCH 49/60] * Use GCC 4.3.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13811
---
 pkgs/stdenv/linux/test.nix | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/pkgs/stdenv/linux/test.nix b/pkgs/stdenv/linux/test.nix
index 8fb1909d694..03650951c7a 100644
--- a/pkgs/stdenv/linux/test.nix
+++ b/pkgs/stdenv/linux/test.nix
@@ -10,6 +10,9 @@ rec {
     aclSupport = false;
   });
 
+
+  gcc = gcc43;
+
   
   build = 
 
@@ -38,6 +41,7 @@ rec {
         
         # Hopefully we won't need these.
         rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video
+        mv $out/include $out/include-glibc
         
         # Copy coreutils, bash, etc.
         cp ${coreutils_}/bin/* $out/bin
@@ -61,7 +65,7 @@ rec {
 
         cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep
         
-        # Copy what we need of gcc.    
+        # Copy what we need of GCC.
         cp -d ${gcc.gcc}/bin/gcc $out/bin
         cp -d ${gcc.gcc}/bin/cpp $out/bin
         cp -d ${gcc.gcc}/bin/g++ $out/bin
@@ -69,11 +73,17 @@ rec {
         cp -d ${gcc.gcc}/lib/libstdc++.so* $out/lib
         cp -rd ${gcc.gcc}/lib/gcc $out/lib
         chmod -R u+w $out/lib
-        rm -f $out/lib/gcc/*/*/include/linux
-        rm -f $out/lib/gcc/*/*/include/sound
+        rm -f $out/lib/gcc/*/*/include*/linux
+        rm -f $out/lib/gcc/*/*/include*/sound
+        rm -rf $out/lib/gcc/*/*/include*/root
+        #rm -f $out/lib/gcc/*/*/*.a
         cp -rd ${gcc.gcc}/libexec/* $out/libexec
+        mkdir $out/include
         cp -rd ${gcc.gcc}/include/c++ $out/include
 
+        cp -d ${gmp}/lib/libgmp*.so* $out/lib
+        cp -d ${mpfr}/lib/libmpfr*.so* $out/lib
+        
         # Copy binutils.
         for i in as ld ar ranlib nm strip readelf objdump; do
           cp ${binutils}/bin/$i $out/bin
@@ -96,7 +106,8 @@ rec {
         nuke-refs $out/lib/*
         nuke-refs $out/libexec/gcc/*/*/*
 
-        (cd $out && tar cvfj $out/static-tools.tar.bz2 bin lib libexec include)
+        sync
+        (cd $out && tar cvfj $out/static-tools.tar.bz2 bin lib libexec include include-glibc)
       ''; # */
 
       # The result should not contain any references (store paths) so
@@ -160,18 +171,19 @@ rec {
 
         perl -e 'print 1 + 2, "\n";'
 
-        export CPP="cpp -B${unpack}"
-        export CC="gcc -B${unpack} -Wl,-dynamic-linker,${unpack}/lib/ld-linux.so.2 -Wl,-rpath,${unpack}/lib"
-        export CXX="g++ -B${unpack} -Wl,-dynamic-linker,${unpack}/lib/ld-linux.so.2 -Wl,-rpath,${unpack}/lib"
+        export CPP="cpp -idirafter ${unpack}/include-glibc -B${unpack}"
+        export CC="gcc -idirafter ${unpack}/include-glibc -B${unpack} -Wl,-dynamic-linker,${unpack}/lib/ld-linux.so.2 -Wl,-rpath,${unpack}/lib"
+        export CXX="g++ -idirafter ${unpack}/include-glibc -B${unpack} -Wl,-dynamic-linker,${unpack}/lib/ld-linux.so.2 -Wl,-rpath,${unpack}/lib"
         
         echo '#include <stdio.h>' >> foo.c
+        echo '#include <limits.h>' >> foo.c
         echo 'int main() { printf("Hello World\n"); return 0; }' >> foo.c
         $CC -o $out/bin/foo foo.c
         $out/bin/foo
 
         echo '#include <iostream>' >> bar.cc
         echo 'int main() { std::cout << "Hello World\n"; }' >> bar.cc
-        $CXX -o $out/bin/bar bar.cc
+        $CXX -v -o $out/bin/bar bar.cc
         $out/bin/bar
 
         tar xvf ${hello.src}

From 581af921ea3b99fd7e597707d7489df2f7d9790c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 Jan 2009 14:11:22 +0000
Subject: [PATCH 50/60] * Latest OpenSSL, Curl.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13817
---
 .../development/libraries/openssl/default.nix |  6 +-
 .../networking/curl/connect-timeout.patch     | 56 +++++++++----------
 pkgs/tools/networking/curl/default.nix        |  6 +-
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 4e683584587..5393b228432 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, perl}:
 
 stdenv.mkDerivation {
-  name = "openssl-0.9.8i";
+  name = "openssl-0.9.8j";
   
   src = fetchurl {
-    url = http://www.openssl.org/source/openssl-0.9.8i.tar.gz;
-    sha1 = "b2e029cfb68bf32eae997d60317a40945db5a65f";
+    url = http://www.openssl.org/source/openssl-0.9.8j.tar.gz;
+    sha1 = "f70f7127a26e951e8a0d854c0c9e6b4c24df78e4";
   };
   
   buildInputs = [perl];
diff --git a/pkgs/tools/networking/curl/connect-timeout.patch b/pkgs/tools/networking/curl/connect-timeout.patch
index 339930e03f6..1edb1f70b9b 100644
--- a/pkgs/tools/networking/curl/connect-timeout.patch
+++ b/pkgs/tools/networking/curl/connect-timeout.patch
@@ -1,8 +1,8 @@
-diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c
-*** curl-7.18.1-orig/lib/connect.c	2008-02-07 23:25:04.000000000 +0100
---- curl-7.18.1/lib/connect.c	2008-04-23 11:25:30.000000000 +0200
+diff -rc curl-7.19.3-orig/lib/connect.c curl-7.19.3/lib/connect.c
+*** curl-7.19.3-orig/lib/connect.c	2009-01-02 23:30:50.000000000 +0100
+--- curl-7.19.3/lib/connect.c	2009-01-21 15:04:08.000000000 +0100
 ***************
-*** 99,105 ****
+*** 115,121 ****
   singleipconnect(struct connectdata *conn,
                   const Curl_addrinfo *ai, /* start connecting to this */
                   long timeout_ms,
@@ -10,7 +10,7 @@ diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c
   
   /*
    * Curl_timeleft() returns the amount of milliseconds left allowed for the
---- 99,106 ----
+--- 115,122 ----
   singleipconnect(struct connectdata *conn,
                   const Curl_addrinfo *ai, /* start connecting to this */
                   long timeout_ms,
@@ -20,8 +20,8 @@ diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c
   /*
    * Curl_timeleft() returns the amount of milliseconds left allowed for the
 ***************
-*** 552,557 ****
---- 553,559 ----
+*** 541,546 ****
+--- 542,548 ----
   {
     curl_socket_t sockfd;
     Curl_addrinfo *ai;
@@ -30,7 +30,7 @@ diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c
     /* first close the failed socket */
     sclose(conn->sock[sockindex]);
 ***************
-*** 565,571 ****
+*** 554,560 ****
     ai = conn->ip_addr->ai_next;
   
     while(ai) {
@@ -38,7 +38,7 @@ diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c
       if(sockfd != CURL_SOCKET_BAD) {
         /* store the new socket descriptor */
         conn->sock[sockindex] = sockfd;
---- 567,573 ----
+--- 556,562 ----
     ai = conn->ip_addr->ai_next;
   
     while(ai) {
@@ -47,36 +47,36 @@ diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c
         /* store the new socket descriptor */
         conn->sock[sockindex] = sockfd;
 ***************
-*** 720,726 ****
+*** 714,720 ****
   singleipconnect(struct connectdata *conn,
                   const Curl_addrinfo *ai,
                   long timeout_ms,
 !                 bool *connected)
   {
+    struct Curl_sockaddr_ex addr;
     char addr_buf[128];
-    int rc;
---- 722,729 ----
+--- 716,723 ----
   singleipconnect(struct connectdata *conn,
                   const Curl_addrinfo *ai,
                   long timeout_ms,
 !                 bool *connected,
 !                 bool *timed_out)
   {
+    struct Curl_sockaddr_ex addr;
     char addr_buf[128];
-    int rc;
 ***************
-*** 740,745 ****
---- 743,750 ----
-    struct curl_sockaddr *addr=(struct curl_sockaddr*)&addr_storage;
-    const void *iptoprint;
+*** 730,735 ****
+--- 733,740 ----
+    struct sockaddr_in6 * const sa6 = (void *)&addr.sa_addr;
+  #endif
   
 +   *timed_out = FALSE;
 + 
-    addr->family=ai->ai_family;
-    addr->socktype=conn->socktype;
-    addr->protocol=ai->ai_protocol;
+    /*
+     * The Curl_sockaddr_ex structure is basically libcurl's external API
+     * curl_sockaddr structure with enough space available to directly hold
 ***************
-*** 841,848 ****
+*** 880,887 ****
       infof(data, "connected\n");
       return sockfd;
     }
@@ -85,7 +85,7 @@ diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c
     else {
       data->state.os_errno = error;
       infof(data, "%s\n", Curl_strerror(conn, error));
---- 846,855 ----
+--- 885,894 ----
       infof(data, "connected\n");
       return sockfd;
     }
@@ -97,7 +97,7 @@ diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c
       data->state.os_errno = error;
       infof(data, "%s\n", Curl_strerror(conn, error));
 ***************
-*** 872,879 ****
+*** 911,918 ****
     int num_addr;
     Curl_addrinfo *ai;
     Curl_addrinfo *curr_addr;
@@ -106,7 +106,7 @@ diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c
     struct timeval before = Curl_tvnow();
   
     /*************************************************************
---- 879,886 ----
+--- 918,925 ----
     int num_addr;
     Curl_addrinfo *ai;
     Curl_addrinfo *curr_addr;
@@ -116,7 +116,7 @@ diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c
   
     /*************************************************************
 ***************
-*** 915,933 ****
+*** 955,973 ****
          curr_addr = curr_addr->ai_next, aliasindex++) {
   
       /* start connecting to the IP curr_addr points to */
@@ -135,8 +135,8 @@ diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c
 -     before = after;
     }  /* end of connect-to-each-address loop */
   
-    if(sockfd == CURL_SOCKET_BAD) {
---- 922,938 ----
+    *sockconn = sockfd;    /* the socket descriptor we've connected */
+--- 962,978 ----
          curr_addr = curr_addr->ai_next, aliasindex++) {
   
       /* start connecting to the IP curr_addr points to */
@@ -153,4 +153,4 @@ diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c
       }
     }  /* end of connect-to-each-address loop */
   
-    if(sockfd == CURL_SOCKET_BAD) {
+    *sockconn = sockfd;    /* the socket descriptor we've connected */
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index a429e1c9514..bf003ff77f7 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -4,11 +4,11 @@ assert zlibSupport -> zlib != null;
 assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation {
-  name = "curl-7.18.1";
+  name = "curl-7.19.3";
   
   src = fetchurl {
-    url = http://curl.haxx.se/download/curl-7.18.1.tar.bz2;
-    sha256 = "0v5fpr4bsdlg262nsgrijlfhp3vgr1ypir1rrkmhxcsnpv4frw6c";
+    url = http://curl.haxx.se/download/curl-7.19.3.tar.bz2;
+    sha256 = "08ij168xflbhsypdliknmds095fw5x35d19hnf559yq0jpj0hmln";
   };
   
   buildInputs =

From d73c2175e03341192648161cdbd99baa6018aadd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 Jan 2009 16:07:31 +0000
Subject: [PATCH 51/60] * lzma 4.32.7.

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

diff --git a/pkgs/tools/compression/lzma/default.nix b/pkgs/tools/compression/lzma/default.nix
index 67ef9c3add1..bcc649e073d 100644
--- a/pkgs/tools/compression/lzma/default.nix
+++ b/pkgs/tools/compression/lzma/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "lzma-4.32.5";
+  name = "lzma-4.32.7";
   
   src = fetchurl {
-    url = http://tukaani.org/lzma/lzma-4.32.5.tar.gz;
-    sha256 = "1mqy1biy46gqky6n3gyr2l395hwckh0xyi96waz5p5x8mgp372ch";
+    url = http://tukaani.org/lzma/lzma-4.32.7.tar.gz;
+    sha256 = "0b03bdvm388kwlcz97aflpr3ir1zpa3m0bq3s6cd3pp5a667lcwz";
   };
 
   CFLAGS = "-O3";

From 3709e0e666612b57e223f73ab8200d2f2d84d8ea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 23 Jan 2009 10:50:53 +0000
Subject: [PATCH 52/60] * GNU sed 4.1.2: obsolete.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13825
---
 pkgs/tools/text/gnused/4.1.2.nix | 9 ---------
 pkgs/top-level/all-packages.nix  | 4 ----
 2 files changed, 13 deletions(-)
 delete mode 100644 pkgs/tools/text/gnused/4.1.2.nix

diff --git a/pkgs/tools/text/gnused/4.1.2.nix b/pkgs/tools/text/gnused/4.1.2.nix
deleted file mode 100644
index fce5228cbbb..00000000000
--- a/pkgs/tools/text/gnused/4.1.2.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "gnused-4.1.2";
-  src = fetchurl {
-    url = mirror://gnu/sed/sed-4.1.2.tar.gz;
-    md5 = "928f0e06422f414091917401f1a834d0";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7e92e3a1e6..098e569f6d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -798,10 +798,6 @@ let
       inherit fetchurl stdenv;
     });
 
-  gnused412 = import ../tools/text/gnused/4.1.2.nix {
-    inherit fetchurl stdenv;
-  };
-
   gnutar = useFromStdenv "gnutar"
     (import ../tools/archivers/gnutar {
       inherit fetchurl stdenv;

From 4274b92cda0f42862247359584997d8e65a4b88d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 23 Jan 2009 10:55:41 +0000
Subject: [PATCH 53/60] * Remove unused versions of tar.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13826
---
 pkgs/tools/archivers/gnutar/1.15.1.nix |  9 ---------
 pkgs/tools/archivers/gnutar/1.17.nix   | 11 -----------
 pkgs/tools/archivers/gnutar/1.18.nix   | 11 -----------
 pkgs/top-level/all-packages.nix        |  4 ----
 4 files changed, 35 deletions(-)
 delete mode 100644 pkgs/tools/archivers/gnutar/1.15.1.nix
 delete mode 100644 pkgs/tools/archivers/gnutar/1.17.nix
 delete mode 100644 pkgs/tools/archivers/gnutar/1.18.nix

diff --git a/pkgs/tools/archivers/gnutar/1.15.1.nix b/pkgs/tools/archivers/gnutar/1.15.1.nix
deleted file mode 100644
index 77dc1a3c76e..00000000000
--- a/pkgs/tools/archivers/gnutar/1.15.1.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "gnutar-1.15.1";
-  src = fetchurl {
-    url = http://nixos.org/tarballs/tar-1.15.1.tar.bz2;
-    md5 = "57da3c38f8e06589699548a34d5a5d07";
-  };
-}
diff --git a/pkgs/tools/archivers/gnutar/1.17.nix b/pkgs/tools/archivers/gnutar/1.17.nix
deleted file mode 100644
index c87b855ed63..00000000000
--- a/pkgs/tools/archivers/gnutar/1.17.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "gnutar-1.17";
-  src = 
-	fetchurl {
-		url = mirror://gnu/tar/tar-1.17.tar.bz2;
-		sha256 = "14m49kya1swilivc2laycw3p3y3i1s3q0vkhwjan58aiv8fh5y8r";
-	};
-  patches = [./implausible.patch];
-}
diff --git a/pkgs/tools/archivers/gnutar/1.18.nix b/pkgs/tools/archivers/gnutar/1.18.nix
deleted file mode 100644
index aab315f673e..00000000000
--- a/pkgs/tools/archivers/gnutar/1.18.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "gnutar-1.17";
-  src = 
-	fetchurl {
-		url = mirror://gnu/tar/tar-1.18.tar.bz2;
-		sha256 = "0png2yqkw333acf55k0hjs0mcx1s0w0gkf50pa6hv3kw8bh4x524";
-	};
-  patches = [./implausible.patch ./gnulib-futimens.patch];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 098e569f6d2..4f8ba0ccd92 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -803,10 +803,6 @@ let
       inherit fetchurl stdenv;
     });
 
-  gnutar151 = import ../tools/archivers/gnutar/1.15.1.nix {
-    inherit fetchurl stdenv;
-  };
-
   graphviz = import ../tools/graphics/graphviz {
     inherit fetchurl stdenv pkgconfig libpng libjpeg expat x11 yacc
       libtool fontconfig gd;

From c91168a600337076c3ddd7fad9c82b884f5a0b09 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 23 Jan 2009 15:09:56 +0000
Subject: [PATCH 54/60] * Bootstrap tools: build on x86_64-linux. * Removed
 Perl from the bootstrap tools.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13827
---
 pkgs/stdenv/linux/test.nix             | 24 ++++++++++--------------
 pkgs/tools/networking/curl/default.nix |  2 +-
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/pkgs/stdenv/linux/test.nix b/pkgs/stdenv/linux/test.nix
index 03650951c7a..8125c76f723 100644
--- a/pkgs/stdenv/linux/test.nix
+++ b/pkgs/stdenv/linux/test.nix
@@ -13,7 +13,7 @@ rec {
 
   gcc = gcc43;
 
-  
+
   build = 
 
     stdenv.mkDerivation {
@@ -69,8 +69,8 @@ rec {
         cp -d ${gcc.gcc}/bin/gcc $out/bin
         cp -d ${gcc.gcc}/bin/cpp $out/bin
         cp -d ${gcc.gcc}/bin/g++ $out/bin
-        cp -d ${gcc.gcc}/lib/libgcc_s.so* $out/lib
-        cp -d ${gcc.gcc}/lib/libstdc++.so* $out/lib
+        cp -d ${gcc.gcc}/lib*/libgcc_s.so* $out/lib
+        cp -d ${gcc.gcc}/lib*/libstdc++.so* $out/lib
         cp -rd ${gcc.gcc}/lib/gcc $out/lib
         chmod -R u+w $out/lib
         rm -f $out/lib/gcc/*/*/include*/linux
@@ -89,9 +89,6 @@ rec {
           cp ${binutils}/bin/$i $out/bin
         done
 
-        # Copy perl.
-        cp ${perl}/bin/perl $out/bin
-        
         chmod -R u+w $out
         
         # Strip executables even further.
@@ -106,8 +103,7 @@ rec {
         nuke-refs $out/lib/*
         nuke-refs $out/libexec/gcc/*/*/*
 
-        sync
-        (cd $out && tar cvfj $out/static-tools.tar.bz2 bin lib libexec include include-glibc)
+        (cd $out && tar cvfj $out/bootstrap-tools.tar.bz2 bin lib libexec include include-glibc)
       ''; # */
 
       # The result should not contain any references (store paths) so
@@ -123,15 +119,15 @@ rec {
       name = "unpack";
 
       buildCommand = ''
-        tar xvfj ${build}/static-tools.tar.bz2
+        tar xvfj ${build}/bootstrap-tools.tar.bz2
         cp -prd . $out
         rm $out/env-vars
 
         for i in $out/bin/* $out/libexec/gcc/*/*/*; do
             echo patching $i
             if ! test -L $i; then
-                LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux.so.2 \
-                    $out/bin/patchelf --set-interpreter $out/lib/ld-linux.so.2 --set-rpath $out/lib $i
+                LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.2 \
+                    $out/bin/patchelf --set-interpreter $out/lib/ld-linux*.so.2 --set-rpath $out/lib $i
             fi
         done
 
@@ -169,11 +165,11 @@ rec {
         grep --version
         gcc --version
 
-        perl -e 'print 1 + 2, "\n";'
+        ldlinux=$(echo ${unpack}/lib/ld-linux*.so.2)
 
         export CPP="cpp -idirafter ${unpack}/include-glibc -B${unpack}"
-        export CC="gcc -idirafter ${unpack}/include-glibc -B${unpack} -Wl,-dynamic-linker,${unpack}/lib/ld-linux.so.2 -Wl,-rpath,${unpack}/lib"
-        export CXX="g++ -idirafter ${unpack}/include-glibc -B${unpack} -Wl,-dynamic-linker,${unpack}/lib/ld-linux.so.2 -Wl,-rpath,${unpack}/lib"
+        export CC="gcc -idirafter ${unpack}/include-glibc -B${unpack} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${unpack}/lib"
+        export CXX="g++ -idirafter ${unpack}/include-glibc -B${unpack} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${unpack}/lib"
         
         echo '#include <stdio.h>' >> foo.c
         echo '#include <limits.h>' >> foo.c
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index bf003ff77f7..314f7c48be2 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, zlibSupport ? false, zlib, sslSupport ? false, openssl ? null}:
+{stdenv, fetchurl, zlibSupport ? false, zlib ? null, sslSupport ? false, openssl ? null}:
 
 assert zlibSupport -> zlib != null;
 assert sslSupport -> openssl != null;

From 6927ec314e00a2921e2e478025ce1ef8574e4136 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 24 Jan 2009 19:05:35 +0000
Subject: [PATCH 55/60] GNU Coreutils 7.0.

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

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 2def6c8d4e8..a1605898661 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -1,11 +1,13 @@
 {stdenv, fetchurl, aclSupport ? false, acl}:
 
-stdenv.mkDerivation {
-  name = "coreutils-6.12";
+stdenv.mkDerivation rec {
+  name = "coreutils-7.0";
   
   src = fetchurl {
-    url = mirror://gnu/coreutils/coreutils-6.12.tar.gz;
-    sha256 = "12pi7i2mxff5jab48pqpwlz2pi0j6sp9p7bgrcl663iiw81zglj9";
+    # Version 7.0 is marked as "beta", which is why it's on `alpha.gnu.org'.
+    # See http://lists.gnu.org/archive/html/bug-coreutils/2008-10/msg00064.html .
+    url = "ftp://alpha.gnu.org/gnu/coreutils/${name}.tar.gz";
+    sha256 = "00cwf8rqbj89ikv8fhdhv26dpc2ghzw1hn48pk1vg3nnmxj55nr7";
   };
 
   buildInputs = stdenv.lib.optional aclSupport acl;
@@ -16,5 +18,14 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.gnu.org/software/coreutils/;
     description = "The basic file, shell and text manipulation utilities of the GNU operating system";
+
+    longDescription = ''
+      The GNU Core Utilities are the basic file, shell and text
+      manipulation utilities of the GNU operating system.  These are
+      the core utilities which are expected to exist on every
+      operating system.
+    '';
+
+    license = "GPLv3+";
   };
 }

From 88c502217b9fc809bf8002dc94d2e08888251d21 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 27 Jan 2009 10:51:54 +0000
Subject: [PATCH 56/60] * coreutils 7.0 already has the backwards compatibility
 patch for old   Linux kernels.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13875
---
 pkgs/tools/misc/coreutils/default.nix         |   3 -
 .../misc/coreutils/gnulib-futimens.patch      |  54 ---------
 .../setting-time-backward-compatibility.patch | 114 ------------------
 3 files changed, 171 deletions(-)
 delete mode 100644 pkgs/tools/misc/coreutils/gnulib-futimens.patch
 delete mode 100644 pkgs/tools/misc/coreutils/setting-time-backward-compatibility.patch

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index a1605898661..6ba378a0f29 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -12,9 +12,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = stdenv.lib.optional aclSupport acl;
   
-  # Support older Linux kernels.
-  patches = [ ./setting-time-backward-compatibility.patch ];
-  
   meta = {
     homepage = http://www.gnu.org/software/coreutils/;
     description = "The basic file, shell and text manipulation utilities of the GNU operating system";
diff --git a/pkgs/tools/misc/coreutils/gnulib-futimens.patch b/pkgs/tools/misc/coreutils/gnulib-futimens.patch
deleted file mode 100644
index f107f017d82..00000000000
--- a/pkgs/tools/misc/coreutils/gnulib-futimens.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-now hat glibc-2.6  declares futimens.
-http://lists.gnu.org/archive/html/bug-gnulib/2007-05/msg00089.html
-
-diff -ru cpio-2.7.orig/lib/utimens.c cpio-2.7/lib/utimens.c
---- cpio-2.7.orig/lib/utimens.c	2007-05-20 21:23:57.000000000 +0900
-+++ cpio-2.7/lib/utimens.c	2007-05-21 08:40:22.000000000 +0900
-@@ -73,7 +73,7 @@
-    Return 0 on success, -1 (setting errno) on failure.  */
- 
- int
--futimens (int fd ATTRIBUTE_UNUSED,
-+gl_futimens (int fd ATTRIBUTE_UNUSED,
- 	  char const *file, struct timespec const timespec[2])
- {
-   /* There's currently no interface to set file timestamps with
-@@ -166,5 +166,5 @@
- int
- utimens (char const *file, struct timespec const timespec[2])
- {
--  return futimens (-1, file, timespec);
-+  return gl_futimens (-1, file, timespec);
- }
-diff -ru cpio-2.7.orig/lib/utimens.h cpio-2.7/lib/utimens.h
---- cpio-2.7.orig/lib/utimens.h	2007-05-20 21:23:57.000000000 +0900
-+++ cpio-2.7/lib/utimens.h	2007-05-21 08:39:57.000000000 +0900
-@@ -1,3 +1,3 @@
- #include "timespec.h"
--int futimens (int, char const *, struct timespec const [2]);
-+int gl_futimens (int, char const *, struct timespec const [2]);
- int utimens (char const *, struct timespec const [2]);
-diff -ru coreutils-6.9.orig/src/copy.c coreutils-6.9/src/copy.c
---- coreutils-6.9.orig/src/copy.c	2007-05-21 09:27:22.000000000 +0900
-+++ coreutils-6.9/src/copy.c	2007-05-21 09:27:47.000000000 +0900
-@@ -623,7 +623,7 @@
-       timespec[0] = get_stat_atime (src_sb);
-       timespec[1] = get_stat_mtime (src_sb);
- 
--      if (futimens (dest_desc, dst_name, timespec) != 0)
-+      if (gl_futimens (dest_desc, dst_name, timespec) != 0)
- 	{
- 	  error (0, errno, _("preserving times for %s"), quote (dst_name));
- 	  if (x->require_preserve)
-diff -ru coreutils-6.9.orig/src/touch.c coreutils-6.9/src/touch.c
---- coreutils-6.9.orig/src/touch.c	2007-05-21 09:27:22.000000000 +0900
-+++ coreutils-6.9/src/touch.c	2007-05-21 09:27:57.000000000 +0900
-@@ -182,7 +182,7 @@
-       t = timespec;
-     }
- 
--  ok = (futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0);
-+  ok = (gl_futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0);
- 
-   if (fd == STDIN_FILENO)
-     {
diff --git a/pkgs/tools/misc/coreutils/setting-time-backward-compatibility.patch b/pkgs/tools/misc/coreutils/setting-time-backward-compatibility.patch
deleted file mode 100644
index afeb49cbad5..00000000000
--- a/pkgs/tools/misc/coreutils/setting-time-backward-compatibility.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- coreutils-6.12/lib/utimens.c	2008-05-29 09:21:57.000000000 -0400
-+++ lib/utimens.c	2008-06-07 11:36:50.000000000 -0400
-@@ -96,20 +96,42 @@
- #endif
- 
-   /* POSIX 200x added two interfaces to set file timestamps with
--     nanosecond resolution.  */
-+     nanosecond resolution.  We provide a fallback for ENOSYS (for
-+     example, compiling against Linux 2.6.25 kernel headers and glibc
-+     2.7, but running on Linux 2.6.18 kernel).  */
- #if HAVE_UTIMENSAT
-   if (fd < 0)
--    return utimensat (AT_FDCWD, file, timespec, 0);
-+    {
-+      int result = utimensat (AT_FDCWD, file, timespec, 0);
-+#ifdef __linux__
-+      /* Work around what might be a kernel bug:
-+         http://bugzilla.redhat.com/442352
-+         http://bugzilla.redhat.com/449910
-+         It appears that utimensat can mistakenly return 280 rather
-+         than 0 to indicate success.
-+         FIXME: remove in 2010 or whenever the offending kernels
-+         are no longer in common use.  */
-+      if (0 < result)
-+        result = 0;
-+#endif
-+
-+      if (result == 0 || errno != ENOSYS)
-+        return result;
-+    }
- #endif
- #if HAVE_FUTIMENS
--  return futimens (fd, timespec);
--#else
-+  {
-+    int result = futimens (fd, timespec);
-+    if (result == 0 || errno != ENOSYS)
-+      return result;
-+  }
-+#endif
- 
-   /* The platform lacks an interface to set file timestamps with
-      nanosecond resolution, so do the best we can, discarding any
-      fractional part of the timestamp.  */
-   {
--# if HAVE_FUTIMESAT || HAVE_WORKING_UTIMES
-+#if HAVE_FUTIMESAT || HAVE_WORKING_UTIMES
-     struct timeval timeval[2];
-     struct timeval const *t;
-     if (timespec)
-@@ -125,9 +147,9 @@
- 
-     if (fd < 0)
-       {
--#  if HAVE_FUTIMESAT
-+# if HAVE_FUTIMESAT
- 	return futimesat (AT_FDCWD, file, t);
--#  endif
-+# endif
-       }
-     else
-       {
-@@ -141,21 +163,21 @@
- 	   worth optimizing, and who knows what other messed-up systems
- 	   are out there?  So play it safe and fall back on the code
- 	   below.  */
--#  if HAVE_FUTIMESAT
-+# if HAVE_FUTIMESAT
- 	if (futimesat (fd, NULL, t) == 0)
- 	  return 0;
--#  elif HAVE_FUTIMES
-+# elif HAVE_FUTIMES
- 	if (futimes (fd, t) == 0)
- 	  return 0;
--#  endif
-+# endif
-       }
--# endif /* HAVE_FUTIMESAT || HAVE_WORKING_UTIMES */
-+#endif /* HAVE_FUTIMESAT || HAVE_WORKING_UTIMES */
- 
-     if (!file)
-       {
--# if ! (HAVE_FUTIMESAT || (HAVE_WORKING_UTIMES && HAVE_FUTIMES))
-+#if ! (HAVE_FUTIMESAT || (HAVE_WORKING_UTIMES && HAVE_FUTIMES))
- 	errno = ENOSYS;
--# endif
-+#endif
- 
- 	/* Prefer EBADF to ENOSYS if both error numbers apply.  */
- 	if (errno == ENOSYS)
-@@ -170,9 +192,9 @@
- 	return -1;
-       }
- 
--# if HAVE_WORKING_UTIMES
-+#if HAVE_WORKING_UTIMES
-     return utimes (file, t);
--# else
-+#else
-     {
-       struct utimbuf utimbuf;
-       struct utimbuf const *ut;
-@@ -187,9 +209,8 @@
- 
-       return utime (file, ut);
-     }
--# endif /* !HAVE_WORKING_UTIMES */
-+#endif /* !HAVE_WORKING_UTIMES */
-   }
--#endif /* !HAVE_FUTIMENS */
- }
- 
- /* Set the access and modification time stamps of FILE to be
-

From a5b607ef4fe0766d7b3d492acffa34c833844bb0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 27 Jan 2009 11:03:41 +0000
Subject: [PATCH 57/60] * Bash 3.2.48.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13876
---
 pkgs/shells/bash/default.nix    | 15 ++++++++++---
 pkgs/shells/bash/new.nix        | 40 ---------------------------------
 pkgs/top-level/all-packages.nix |  2 +-
 3 files changed, 13 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/shells/bash/new.nix

diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index 07d4de24da6..04828111533 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -3,13 +3,22 @@
 assert interactive -> ncurses != null;
 
 stdenv.mkDerivation {
-  name = "bash-3.2-p39";
+  name = "bash-3.2.48";
 
   src = fetchurl {
-    url = http://nixos.org/tarballs/bash-3.2-p39.tar.bz2;
-    sha256 = "075qs6nfjql57y8ffg3f4glb3l5yl3xy5hny75x6kpwxkqlcxqfy";
+    url = mirror://gnu/bash/bash-3.2.48.tar.gz;
+    sha256 = "1i81scw3mnfjbmsn3cjfdancyx3d0rg8gd9hpdfng9j83dbdrs98";
   };
 
+  NIX_CFLAGS_COMPILE = ''
+    -DSYS_BASHRC="/etc/bashrc"
+    -DSYS_BASH_LOGOUT="/etc/bash_logout"
+    -DDEFAULT_PATH_VALUE="/no-such-path"
+    -DSTANDARD_UTILS_PATH="/no-such-path"
+    -DNON_INTERACTIVE_LOGIN_SHELLS
+    -DSSH_SOURCE_BASHRC
+  '';
+
   postInstall = "ln -s bash $out/bin/sh";
 
   patches = [
diff --git a/pkgs/shells/bash/new.nix b/pkgs/shells/bash/new.nix
deleted file mode 100644
index beaf2f845e7..00000000000
--- a/pkgs/shells/bash/new.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{stdenv, fetchurl, bison, interactive ? false, ncurses ? null, texinfo ? null}:
-
-assert interactive -> ncurses != null;
-
-stdenv.mkDerivation {
-  name = "bash-3.2-p39";
-
-  src = fetchurl {
-    url = http://nixos.org/tarballs/bash-3.2-p39.tar.bz2;
-    sha256 = "075qs6nfjql57y8ffg3f4glb3l5yl3xy5hny75x6kpwxkqlcxqfy";
-  };
-
-  NIX_CFLAGS_COMPILE = ''
-    -DSYS_BASHRC="/etc/bashrc"
-    -DSYS_BASH_LOGOUT="/etc/bash_logout"
-    -DDEFAULT_PATH_VALUE="/no-such-path"
-    -DSTANDARD_UTILS_PATH="/no-such-path"
-    -DNON_INTERACTIVE_LOGIN_SHELLS
-    -DSSH_SOURCE_BASHRC
-  '';
-
-  postInstall = "ln -s bash $out/bin/sh";
-
-  patches = [
-    # For dietlibc builds.
-    ./winsize.patch
-  ];
-
-  # !!! Bison is only needed for bash-3.2 (because of bash32-001.patch)
-  buildInputs = [bison]
-    ++ stdenv.lib.optional (texinfo != null) texinfo
-    ++ stdenv.lib.optional interactive ncurses;
-
-  meta = {
-    homepage = http://www.gnu.org/software/bash/;
-    description =
-      "GNU Bourne-Again Shell, the de facto standard shell on Linux" +
-        (if interactive then " (for interactive use)" else "");
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f8ba0ccd92..996dee41a30 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1378,7 +1378,7 @@ let
       inherit fetchurl stdenv bison;
     }));
 
-  bashInteractive = appendToName "interactive" (import ../shells/bash/new.nix {
+  bashInteractive = appendToName "interactive" (import ../shells/bash {
     inherit fetchurl stdenv ncurses texinfo bison;
     interactive = true;
   });

From cfda61c7c638bfa76bfc2bcdb007cb8e5605e296 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 27 Jan 2009 11:53:35 +0000
Subject: [PATCH 58/60] * GCC 4.3.3, just in time too :-)

svn path=/nixpkgs/branches/stdenv-updates/; revision=13877
---
 pkgs/development/compilers/gcc-4.3/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/gcc-4.3/default.nix b/pkgs/development/compilers/gcc-4.3/default.nix
index fe1d98ce51d..afda6474f86 100644
--- a/pkgs/development/compilers/gcc-4.3/default.nix
+++ b/pkgs/development/compilers/gcc-4.3/default.nix
@@ -13,7 +13,7 @@ assert langTreelang -> bison != null && flex != null;
 
 with import ../../../lib;
 
-let version = "4.3.2"; in
+let version = "4.3.3"; in
 
 stdenv.mkDerivation {
   name = "gcc-${version}";
@@ -21,16 +21,16 @@ stdenv.mkDerivation {
   
   src =
     optional /*langC*/ true (fetchurl {
-      url = "mirror://gnu/gcc/gcc-${version}/gcc-core-${version}.tar.bz2";
-      sha256 = "0np7cbqdaajarwwlkvq7d2ifkld1lsh0cfsaqcx9dsvqklkyg1q6";
+      url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2";
+      sha256 = "08yksvipnqmqbmif30rwjkg3y0m6ray5r84wa2argv8q0bpz9426";
     }) ++
     optional langCC (fetchurl {
-      url = "mirror://gnu/gcc/gcc-${version}/gcc-g++-${version}.tar.bz2";
-      sha256 = "105vhmq111l5zyzxdanhhv5lgvl4pr6pq9xj6jb5g5x3bk4jnki5";
+      url = "mirror://gnu/releases/gcc-${version}/gcc-g++-${version}.tar.bz2";
+      sha256 = "12z2zh03yq214qs2cqzh8c64jjfz544nk1lzi9rygjwm8yjsvzm9";
     }) ++
     optional langFortran (fetchurl {
-      url = "mirror://gnu/gcc/gcc-${version}/gcc-fortran-${version}.tar.bz2";
-      sha256 = "1kk3d2n68va5wxpi77cadn4s5b7s39qg1dqyrfppq1nrqwb77acl";
+      url = "mirror://gnu/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2";
+      sha256 = "1b2wbysviyh7l9fqbd6zy5y6y89xgysy99gr8wx8xkc1hy2nwdsq";
     });
     
   patches =

From 76efe57d1be042bb7cdce852106a74bb8b79b2e4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 27 Jan 2009 12:48:32 +0000
Subject: [PATCH 59/60] * GCC mirrors.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13878
---
 pkgs/build-support/fetchurl/mirrors.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index fdf73d8db64..9b8eecf9a95 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -29,6 +29,14 @@ rec {
     http://ftp.gnu.org/pub/gnu/
   ];
 
+  # GCC.
+  gcc = [
+    ftp://ftp.nluug.nl/mirror/languages/gcc/
+    ftp://ftp.fu-berlin.de/unix/languages/gcc/
+    ftp://ftp.irisa.fr/pub/mirrors/gcc.gnu.org/gcc/
+    ftp://gcc.gnu.org/pub/gcc/
+  ];
+
   # GnuPG.
   gnupg = [
     ftp://gd.tuwien.ac.at/privacy/gnupg/

From da4fb573a7bfb2d1ef402ed6081131a8ce893038 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 27 Jan 2009 17:46:07 +0000
Subject: [PATCH 60/60] * Added ATerm 2.8.  Also removed some old versions and
 patches that   were no longer in use.

* A patch for compiling the ATerm library with GCC 4.3.  Without it,
  the code for resizing ATerm tables gets stuck in an infinite loop
  (http://bugzilla.sen.cwi.nl:8080/show_bug.cgi?id=841).  The problem
  is in this bit of code in hash.c, which tries to dynamically figure
  out the maximum signed integer:

    long try_long_max;
    long long_max;
    long delta;

    try_long_max = 1;
    do {
      long_max = try_long_max;
      try_long_max = long_max * 2;
    } while (try_long_max > 0);

  At -O2, GCC 4.3 determines that 1 * 2 * 2 * ... can never be <= 0,
  and so it optimises this into a 1-instruction infinite loop:

    0x0805a782 <keyPut+1282>: jmp  0x805a782 <keyPut+1282>

  Quite beautiful really. ;-)

  The fix is to use the LONG_MAX macro instead.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13888
---
 pkgs/development/libraries/aterm/2.3.nix      |  13 -
 .../libraries/aterm/2.4.2-fixes.nix           |   8 +
 pkgs/development/libraries/aterm/2.4.nix      |  17 -
 pkgs/development/libraries/aterm/2.5.nix      |   5 +
 .../libraries/aterm/{2.7.nix => 2.8.nix}      |  11 +-
 .../libraries/aterm/aterm-alias-fix-2.patch   | 224 ---------
 .../libraries/aterm/aterm-alias-fix.patch     | 445 ------------------
 .../libraries/aterm/max-long.patch            |  77 +++
 .../libraries/aterm/mingw-asm.patch           | 269 -----------
 pkgs/top-level/all-packages.nix               |  20 +-
 10 files changed, 103 insertions(+), 986 deletions(-)
 delete mode 100644 pkgs/development/libraries/aterm/2.3.nix
 delete mode 100644 pkgs/development/libraries/aterm/2.4.nix
 rename pkgs/development/libraries/aterm/{2.7.nix => 2.8.nix} (50%)
 delete mode 100644 pkgs/development/libraries/aterm/aterm-alias-fix-2.patch
 delete mode 100644 pkgs/development/libraries/aterm/aterm-alias-fix.patch
 create mode 100644 pkgs/development/libraries/aterm/max-long.patch
 delete mode 100644 pkgs/development/libraries/aterm/mingw-asm.patch

diff --git a/pkgs/development/libraries/aterm/2.3.nix b/pkgs/development/libraries/aterm/2.3.nix
deleted file mode 100644
index e27acb6a21e..00000000000
--- a/pkgs/development/libraries/aterm/2.3.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "aterm-2.3.1";
-  configureFlags = "--with-gcc";
-
-  src = fetchurl {
-    url = http://nixos.org/tarballs/aterm-2.3.1.tar.gz;
-    md5 = "5a2d70acc45a9d301e0dba12fcaf77e7";
-  };
-
-  patches = [ ./aterm-alias-fix.patch ];
-}
diff --git a/pkgs/development/libraries/aterm/2.4.2-fixes.nix b/pkgs/development/libraries/aterm/2.4.2-fixes.nix
index de1ea95a247..a160d5cd121 100644
--- a/pkgs/development/libraries/aterm/2.4.2-fixes.nix
+++ b/pkgs/development/libraries/aterm/2.4.2-fixes.nix
@@ -2,11 +2,19 @@
 
 stdenv.mkDerivation {
   name = "aterm-2.4.2-fixes-r2";
+  
   src = fetchurl {
     url = http://nixos.org/tarballs/aterm-2.4.2-fixes-r2.tar.bz2;
     sha256 = "1w3bxdpc2hz29li5ssmdcz3x0fn47r7g62ns0v8nazxwf40vff4j";
   };
+
+  patches = [
+    # Fix for http://bugzilla.sen.cwi.nl:8080/show_bug.cgi?id=841
+    ./max-long.patch
+  ];
+  
   doCheck = true;
+
   meta = {
     homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm;
     license = "LGPL";
diff --git a/pkgs/development/libraries/aterm/2.4.nix b/pkgs/development/libraries/aterm/2.4.nix
deleted file mode 100644
index 849faae0251..00000000000
--- a/pkgs/development/libraries/aterm/2.4.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "aterm-2.4.2";
-  src = fetchurl {
-    url = http://nixos.org/tarballs/aterm-2.4.2.tar.gz;
-    md5 = "18617081dd112d85e6c4b1b552628114";
-  };
-  patches = 
-    [./aterm-alias-fix-2.patch] ++
-    (if stdenv ? isMinGW && stdenv.isMinGW then [./mingw-asm.patch] else []);
-  meta = {
-    homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm;
-    license = "LGPL";
-    description = "Library for manipulation of term data structures in C";
-  };
-}
diff --git a/pkgs/development/libraries/aterm/2.5.nix b/pkgs/development/libraries/aterm/2.5.nix
index 88e31d08515..f30bd7d3d5c 100644
--- a/pkgs/development/libraries/aterm/2.5.nix
+++ b/pkgs/development/libraries/aterm/2.5.nix
@@ -8,6 +8,11 @@ stdenv.mkDerivation {
     md5 = "33ddcb1a229baf406ad1f603eb1d5995";
   };
 
+  patches = [
+    # Fix for http://bugzilla.sen.cwi.nl:8080/show_bug.cgi?id=841
+    ./max-long.patch
+  ];
+  
   doCheck = true;
 
   meta = {
diff --git a/pkgs/development/libraries/aterm/2.7.nix b/pkgs/development/libraries/aterm/2.8.nix
similarity index 50%
rename from pkgs/development/libraries/aterm/2.7.nix
rename to pkgs/development/libraries/aterm/2.8.nix
index 43ae0a93a0e..ab92d019f56 100644
--- a/pkgs/development/libraries/aterm/2.7.nix
+++ b/pkgs/development/libraries/aterm/2.8.nix
@@ -1,13 +1,18 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "aterm-2.7";
+  name = "aterm-2.8";
 
   src = fetchurl {
-    url = http://homepages.cwi.nl/~daybuild/releases//aterm-2.7.tar.gz;
-    sha256 = "0zhs0rncn4iankr70kbms64dwxm9i0956gs02dbw7ylx4mln8ynn";
+    url = http://www.meta-environment.org/releases/aterm-2.8.tar.gz;
+    sha256 = "1vq4qpmcww3n9v7bklgp7z1yqi9gmk6hcahqjqdzc5ksa089rdms";
   };
 
+  patches = [
+    # Fix for http://bugzilla.sen.cwi.nl:8080/show_bug.cgi?id=841
+    ./max-long.patch
+  ];
+  
   doCheck = true;
 
   meta = {
diff --git a/pkgs/development/libraries/aterm/aterm-alias-fix-2.patch b/pkgs/development/libraries/aterm/aterm-alias-fix-2.patch
deleted file mode 100644
index c1dfc3e0e73..00000000000
--- a/pkgs/development/libraries/aterm/aterm-alias-fix-2.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-diff -rc aterm-1142707243.10633/aterm/aterm.c aterm/aterm/aterm.c
-*** aterm-1142707243.10633/aterm/aterm.c	2006-02-08 11:35:28.000000000 +0100
---- aterm/aterm/aterm.c	2006-04-25 17:10:52.000000000 +0200
-***************
-*** 193,198 ****
---- 193,199 ----
-    /* that have char == 2 bytes, and sizeof(header_type) == 2 */
-    assert(sizeof(header_type) == sizeof(ATerm *));
-    assert(sizeof(header_type) >= 4);
-+   assert(sizeof(ATerm) == sizeof(MachineWord));
-  
-    /*}}}  */
-    /*{{{  Initialize buffer */
-diff -rc aterm-1142707243.10633/aterm/memory.c aterm/aterm/memory.c
-*** aterm-1142707243.10633/aterm/memory.c	2006-03-09 15:02:56.000000000 +0100
---- aterm/aterm/memory.c	2006-04-25 18:22:00.000000000 +0200
-***************
-*** 119,130 ****
-                          hash_number(tmp,3)) 
-  */
-  
-  #define HASHNUMBER3(t)\
-! FINISH(COMBINE(START(((MachineWord*)t)[0]), ((MachineWord*)t)[2]))
-  
-  #define HASHNUMBER4(t)\
-! FINISH(COMBINE(COMBINE(START(((MachineWord*)t)[0]), \
-! 		       ((MachineWord*)t)[2]),((MachineWord*)t)[3]))
-  
-  #define HASHINT(val) \
-  FINISH(COMBINE(START( (AT_INT<<SHIFT_TYPE) ), val))
---- 119,171 ----
-                          hash_number(tmp,3)) 
-  */
-  
-+ /* The ATerm library use some heavy aliasing.  For instance, the
-+    various ATermXXX structures are referenced through MachineWord
-+    arrays.  This is not generally allowed by the C standard --- see
-+    C99, section 6.5, clause 7.  In particular, this means that you
-+    cannot assign something through an ATermXXX pointer, e.g.,
-+ 
-+      protoAppl->header = header;
-+ 
-+    and then read it through a MachineWord*, e.g.,
-+ 
-+      hnr = hash_number((ATerm) protoAppl, 2);
-+ 
-+    (hash_number walks over the term by casting it to a MachineWord*).
-+ 
-+    However, the same clause of the C standard also specifies that you
-+    *can* read the memory location through a union type that contains
-+    both the original type (e.g. ATermAppl) and the type used to read
-+    the memory location (e.g. MachineWord).  That's what we do
-+    below: we have a union of all the types that occur in the various
-+    ATerm types.  We then read the "w" element of the union.  The
-+    compiler is not allowed to assume absence of aliasing with the
-+    other types in the union.
-+ 
-+    A better solution would be to hash the term through a character
-+    pointer (since *any* memory location can be legally read as a
-+    character), but I'm too lazy right now.  Performance might also
-+    suffer if we do that. */
-+ 
-+ typedef union 
-+ {
-+     MachineWord w;
-+     header_type header;
-+     ATerm term;
-+     ATermList list;
-+     int i;
-+     double d;
-+     void* p;
-+ } Aliaser;
-+ 
-+ #define GET_WORD(t, n) (((Aliaser*) (((MachineWord*) t) + n))->w)
-+ 
-  #define HASHNUMBER3(t)\
-! FINISH(COMBINE(START(GET_WORD(t, 0)), GET_WORD(t, 2)))
-  
-  #define HASHNUMBER4(t)\
-! FINISH(COMBINE(COMBINE(START(GET_WORD(t, 0)), \
-! 		       GET_WORD(t, 2)), GET_WORD(t, 3)))
-  
-  #define HASHINT(val) \
-  FINISH(COMBINE(START( (AT_INT<<SHIFT_TYPE) ), val))
-***************
-*** 132,144 ****
-  
-  #endif /* HASHPEM */
-  
-! #define PROTO_APPL_ARGS ((ATerm *) (protoTerm + ARG_OFFSET))
-  
-  #define SET_PROTO_APPL_ARG(i, a) \
-!   (PROTO_APPL_ARGS[(i)] = (a))
-  
-  #define GET_PROTO_APPL_ARG(i) \
-!   (PROTO_APPL_ARGS[(i)])
-  
-  #define CHECK_TERM(t) \
-    assert((t) != NULL \
---- 173,185 ----
-  
-  #endif /* HASHPEM */
-  
-! #define PROTO_APPL_ARGS (protoTerm + ARG_OFFSET)
-  
-  #define SET_PROTO_APPL_ARG(i, a) \
-!   (PROTO_APPL_ARGS[(i)] = (MachineWord) (a))
-  
-  #define GET_PROTO_APPL_ARG(i) \
-!   ((ATerm) PROTO_APPL_ARGS[(i)])
-  
-  #define CHECK_TERM(t) \
-    assert((t) != NULL \
-***************
-*** 323,336 ****
-  #else
-  static HashNumber hash_number(ATerm t, int size)
-  {
--   MachineWord *words = (MachineWord *) t;
-    int i;
-    HashNumber hnr;
-  
-!   hnr = START(HIDE_AGE_MARK(words[0]));
-    
-    for (i=2; i<size; i++) {
-!     hnr = COMBINE(hnr, words[i]);
-    }
-  
-    return FINISH(hnr);
---- 364,376 ----
-  #else
-  static HashNumber hash_number(ATerm t, int size)
-  {
-    int i;
-    HashNumber hnr;
-  
-!   hnr = START(HIDE_AGE_MARK(GET_WORD(t, 0)));
-    
-    for (i=2; i<size; i++) {
-!     hnr = COMBINE(hnr, GET_WORD(t, i));
-    }
-  
-    return FINISH(hnr);
-***************
-*** 338,351 ****
-  
-  static HashNumber hash_number_anno(ATerm t, int size, ATerm anno)
-  {
--   MachineWord *words = (MachineWord *) t;
-    int i;
-    HashNumber hnr;
-  
-!   hnr = START(HIDE_AGE_MARK(words[0]));
-    
-    for (i=2; i<size; i++) {
-!     hnr = COMBINE(hnr, words[i]);
-    }
-    hnr = COMBINE(hnr, (MachineWord)anno);
-  
---- 378,390 ----
-  
-  static HashNumber hash_number_anno(ATerm t, int size, ATerm anno)
-  {
-    int i;
-    HashNumber hnr;
-  
-!   hnr = START(HIDE_AGE_MARK(GET_WORD(t, 0)));
-    
-    for (i=2; i<size; i++) {
-!     hnr = COMBINE(hnr, GET_WORD(t, i));
-    }
-    hnr = COMBINE(hnr, (MachineWord)anno);
-  
-***************
-*** 1639,1645 ****
-    protoAppl->header = header;
-    CHECK_HEADER(protoAppl->header);
-  
-!   if (args != PROTO_APPL_ARGS) {
-      for (i=0; i<arity; i++) {
-        CHECK_TERM(args[i]);
-        SET_PROTO_APPL_ARG(i, args[i]);
---- 1678,1684 ----
-    protoAppl->header = header;
-    CHECK_HEADER(protoAppl->header);
-  
-!   if (args != (ATerm *) PROTO_APPL_ARGS) {
-      for (i=0; i<arity; i++) {
-        CHECK_TERM(args[i]);
-        SET_PROTO_APPL_ARG(i, args[i]);
-***************
-*** 1680,1686 ****
-      hashtable[hnr] = cur;
-    }
-  
-!   if (args != PROTO_APPL_ARGS) {
-      for (i=0; i<arity; i++) {
-        protected_buffer[i] = NULL;
-      }
---- 1719,1725 ----
-      hashtable[hnr] = cur;
-    }
-  
-!   if (args != (ATerm *) PROTO_APPL_ARGS) {
-      for (i=0; i<arity; i++) {
-        protected_buffer[i] = NULL;
-      }
-***************
-*** 2144,2150 ****
-    }
-    SET_PROTO_APPL_ARG(n, arg);
-  
-!   result = ATmakeApplArray(sym, PROTO_APPL_ARGS);
-    annos = AT_getAnnotations((ATerm)appl);
-    if (annos != NULL) {
-      result = (ATermAppl)AT_setAnnotations((ATerm)result, annos);
---- 2183,2189 ----
-    }
-    SET_PROTO_APPL_ARG(n, arg);
-  
-!   result = ATmakeApplArray(sym, (ATerm *) PROTO_APPL_ARGS);
-    annos = AT_getAnnotations((ATerm)appl);
-    if (annos != NULL) {
-      result = (ATermAppl)AT_setAnnotations((ATerm)result, annos);
diff --git a/pkgs/development/libraries/aterm/aterm-alias-fix.patch b/pkgs/development/libraries/aterm/aterm-alias-fix.patch
deleted file mode 100644
index 33ae5b67ff0..00000000000
--- a/pkgs/development/libraries/aterm/aterm-alias-fix.patch
+++ /dev/null
@@ -1,445 +0,0 @@
-diff -rc aterm-2.3.1-orig/aterm/aterm.c aterm-2.3.1/aterm/aterm.c
-*** aterm-2.3.1-orig/aterm/aterm.c	2004-06-01 10:29:01.000000000 +0200
---- aterm-2.3.1/aterm/aterm.c	2005-05-02 18:32:52.000000000 +0200
-***************
-*** 191,196 ****
---- 191,197 ----
-    /* that have char == 2 bytes, and sizeof(header_type) == 2 */
-    assert(sizeof(header_type) == sizeof(ATerm *));
-    assert(sizeof(header_type) >= 4);
-+   assert(sizeof(ATerm) == sizeof(MachineWord));
-  
-    /*}}}  */
-    /*{{{  Initialize buffer */
-diff -rc aterm-2.3.1-orig/aterm/memory.c aterm-2.3.1/aterm/memory.c
-*** aterm-2.3.1-orig/aterm/memory.c	2004-06-09 10:52:33.000000000 +0200
---- aterm-2.3.1/aterm/memory.c	2005-05-02 18:32:52.000000000 +0200
-***************
-*** 176,182 ****
-   * Static arrays are not guaranteed to be sizeof(double)-aligned.
-   */
-  static MachineWord *protoTerm = NULL;
-- static ATerm *arg_buffer = NULL;
-  
-  static ATerm protected_buffer[MAX_ARITY] = { NULL };
-  
---- 176,181 ----
-***************
-*** 495,501 ****
-    HashNumber hnr;
-  
-    protoTerm  = (MachineWord *) calloc(MAX_TERM_SIZE, sizeof(MachineWord));
--   arg_buffer = (ATerm *) (protoTerm + 2);
-  
-    /*{{{  Analyze arguments */
-  
---- 494,499 ----
-***************
-*** 1032,1043 ****
-    va_list args;
-  
-    protoAppl = (ATermAppl) protoTerm;
-- 
-    va_start(args, sym);
-    for (i=0; i<arity; i++) {
-!     arg_buffer[i] = va_arg(args, ATerm);
-!     protected_buffer[i] = arg_buffer[i];
-!     CHECK_TERM(arg_buffer[i]);
-    }
-    va_end(args);
-  
---- 1030,1040 ----
-    va_list args;
-  
-    protoAppl = (ATermAppl) protoTerm;
-    va_start(args, sym);
-    for (i=0; i<arity; i++) {
-!     protected_buffer[i] = va_arg(args, ATerm);
-!     protoTerm[ARG_OFFSET + i] = (MachineWord) protected_buffer[i];
-!     CHECK_TERM(protected_buffer[i]);
-    }
-    va_end(args);
-  
-***************
-*** 1055,1061 ****
-        appl = (ATermAppl)cur;
-        found = ATtrue;
-        for (i=0; i<arity; i++) {
-! 	if (!ATisEqual(ATgetArgument(appl, i), arg_buffer[i])) {
-  	  found = ATfalse;
-  	  break;
-  	}
---- 1052,1058 ----
-        appl = (ATermAppl)cur;
-        found = ATtrue;
-        for (i=0; i<arity; i++) {
-! 	if (!ATisEqual(ATgetArgument(appl, i), protoTerm[ARG_OFFSET + i])) {
-  	  found = ATfalse;
-  	  break;
-  	}
-***************
-*** 1073,1079 ****
-      cur->header = header;
-      CHECK_HEADER(cur->header);
-      for (i=0; i<arity; i++) {
-!       ATgetArgument(cur, i) = arg_buffer[i];
-        CHECK_ARGUMENT(cur, i);
-      }
-      cur->next = hashtable[hnr];
---- 1070,1076 ----
-      cur->header = header;
-      CHECK_HEADER(cur->header);
-      for (i=0; i<arity; i++) {
-!       ATgetArgument(cur, i) = (ATerm) protoTerm[ARG_OFFSET + i];
-        CHECK_ARGUMENT(cur, i);
-      }
-      cur->next = hashtable[hnr];
-***************
-*** 1164,1170 ****
-    protoAppl = (ATermAppl) protoTerm;
-    protoAppl->header = header;
-    CHECK_HEADER(protoAppl->header);
-!   arg_buffer[0] = arg0;
-    hnr = HASHNUMBER3((ATerm) protoAppl);
-    
-    prev = NULL;
---- 1161,1167 ----
-    protoAppl = (ATermAppl) protoTerm;
-    protoAppl->header = header;
-    CHECK_HEADER(protoAppl->header);
-!   protoTerm[ARG_OFFSET + 0] = (MachineWord) arg0;
-    hnr = HASHNUMBER3((ATerm) protoAppl);
-    
-    prev = NULL;
-***************
-*** 1225,1232 ****
-    protoAppl = (ATermAppl) protoTerm;
-    protoAppl->header = header;
-    CHECK_HEADER(protoAppl->header);
-!   arg_buffer[0] = arg0;
-!   arg_buffer[1] = arg1;
-    hnr = HASHNUMBER4((ATerm) protoAppl);
-  
-    prev = NULL;
---- 1222,1229 ----
-    protoAppl = (ATermAppl) protoTerm;
-    protoAppl->header = header;
-    CHECK_HEADER(protoAppl->header);
-!   protoTerm[ARG_OFFSET + 0] = (MachineWord) arg0;
-!   protoTerm[ARG_OFFSET + 1] = (MachineWord) arg1;
-    hnr = HASHNUMBER4((ATerm) protoAppl);
-  
-    prev = NULL;
-***************
-*** 1287,1295 ****
-    protoAppl = (ATermAppl) protoTerm;
-    protoAppl->header = header;
-    CHECK_HEADER(protoAppl->header);
-!   arg_buffer[0] = arg0;
-!   arg_buffer[1] = arg1;
-!   arg_buffer[2] = arg2;
-    hnr = hash_number((ATerm) protoAppl, 5);
-  
-    cur = hashtable[hnr & table_mask];
---- 1284,1292 ----
-    protoAppl = (ATermAppl) protoTerm;
-    protoAppl->header = header;
-    CHECK_HEADER(protoAppl->header);
-!   protoTerm[ARG_OFFSET + 0] = (MachineWord) arg0;
-!   protoTerm[ARG_OFFSET + 1] = (MachineWord) arg1;
-!   protoTerm[ARG_OFFSET + 2] = (MachineWord) arg2;
-    hnr = hash_number((ATerm) protoAppl, 5);
-  
-    cur = hashtable[hnr & table_mask];
-***************
-*** 1347,1356 ****
-    protoAppl = (ATermAppl) protoTerm;
-    protoAppl->header = header;
-    CHECK_HEADER(protoAppl->header);
-!   arg_buffer[0] = arg0;
-!   arg_buffer[1] = arg1;
-!   arg_buffer[2] = arg2;
-!   arg_buffer[3] = arg3;
-    hnr = hash_number((ATerm) protoAppl, 6);
-  
-    cur = hashtable[hnr & table_mask];
---- 1344,1353 ----
-    protoAppl = (ATermAppl) protoTerm;
-    protoAppl->header = header;
-    CHECK_HEADER(protoAppl->header);
-!   protoTerm[ARG_OFFSET + 0] = (MachineWord) arg0;
-!   protoTerm[ARG_OFFSET + 1] = (MachineWord) arg1;
-!   protoTerm[ARG_OFFSET + 2] = (MachineWord) arg2;
-!   protoTerm[ARG_OFFSET + 3] = (MachineWord) arg3;
-    hnr = hash_number((ATerm) protoAppl, 6);
-  
-    cur = hashtable[hnr & table_mask];
-***************
-*** 1411,1421 ****
-    protoAppl = (ATermAppl) protoTerm;
-    protoAppl->header = header;
-    CHECK_HEADER(protoAppl->header);
-!   arg_buffer[0] = arg0;
-!   arg_buffer[1] = arg1;
-!   arg_buffer[2] = arg2;
-!   arg_buffer[3] = arg3;
-!   arg_buffer[4] = arg4;
-    hnr = hash_number((ATerm) protoAppl, 7);
-  
-    cur = hashtable[hnr & table_mask];
---- 1408,1418 ----
-    protoAppl = (ATermAppl) protoTerm;
-    protoAppl->header = header;
-    CHECK_HEADER(protoAppl->header);
-!   protoTerm[ARG_OFFSET + 0] = (MachineWord) arg0;
-!   protoTerm[ARG_OFFSET + 1] = (MachineWord) arg1;
-!   protoTerm[ARG_OFFSET + 2] = (MachineWord) arg2;
-!   protoTerm[ARG_OFFSET + 3] = (MachineWord) arg3;
-!   protoTerm[ARG_OFFSET + 4] = (MachineWord) arg4;
-    hnr = hash_number((ATerm) protoAppl, 7);
-  
-    cur = hashtable[hnr & table_mask];
-***************
-*** 1479,1490 ****
-    protoAppl = (ATermAppl) protoTerm;
-    protoAppl->header = header;
-    CHECK_HEADER(protoAppl->header);
-!   arg_buffer[0] = arg0;
-!   arg_buffer[1] = arg1;
-!   arg_buffer[2] = arg2;
-!   arg_buffer[3] = arg3;
-!   arg_buffer[4] = arg4;
-!   arg_buffer[5] = arg5;
-    hnr = hash_number((ATerm) protoAppl, 8);
-  
-    cur = hashtable[hnr & table_mask];
---- 1476,1487 ----
-    protoAppl = (ATermAppl) protoTerm;
-    protoAppl->header = header;
-    CHECK_HEADER(protoAppl->header);
-!   protoTerm[ARG_OFFSET + 0] = (MachineWord) arg0;
-!   protoTerm[ARG_OFFSET + 1] = (MachineWord) arg1;
-!   protoTerm[ARG_OFFSET + 2] = (MachineWord) arg2;
-!   protoTerm[ARG_OFFSET + 3] = (MachineWord) arg3;
-!   protoTerm[ARG_OFFSET + 4] = (MachineWord) arg4;
-!   protoTerm[ARG_OFFSET + 5] = (MachineWord) arg5;
-    hnr = hash_number((ATerm) protoAppl, 8);
-  
-    cur = hashtable[hnr & table_mask];
-***************
-*** 1552,1558 ****
-    CHECK_HEADER(protoAppl->header);
-  
-    for (i=0; i<arity; i++) {
-!     arg_buffer[i] = ATgetFirst(args);
-      args = ATgetNext(args);
-    }
-  
---- 1549,1555 ----
-    CHECK_HEADER(protoAppl->header);
-  
-    for (i=0; i<arity; i++) {
-!     protoTerm[ARG_OFFSET + i] = (MachineWord) ATgetFirst(args);
-      args = ATgetNext(args);
-    }
-  
-***************
-*** 1567,1573 ****
-        found = ATtrue;
-        for(i=0; i<arity; i++)
-        {
-! 	if(!ATisEqual(ATgetArgument(appl, i), arg_buffer[i]))
-  	{
-  	  found = ATfalse;
-  	  break;
---- 1564,1570 ----
-        found = ATtrue;
-        for(i=0; i<arity; i++)
-        {
-! 	if(!ATisEqual(ATgetArgument(appl, i), protoTerm[ARG_OFFSET + i]))
-  	{
-  	  found = ATfalse;
-  	  break;
-***************
-*** 1587,1593 ****
-      cur->header = header;
-      CHECK_HEADER(cur->header);
-      for (i=0; i<arity; i++) {
-!       ATgetArgument(cur, i) = arg_buffer[i];
-        CHECK_ARGUMENT(cur, i);
-      }
-      cur->next = hashtable[hnr];
---- 1584,1590 ----
-      cur->header = header;
-      CHECK_HEADER(cur->header);
-      for (i=0; i<arity; i++) {
-!       ATgetArgument(cur, i) = (ATerm) protoTerm[ARG_OFFSET + i];
-        CHECK_ARGUMENT(cur, i);
-      }
-      cur->next = hashtable[hnr];
-***************
-*** 1623,1632 ****
-    protoAppl->header = header;
-    CHECK_HEADER(protoAppl->header);
-  
-!   if (args != arg_buffer) {
-      for (i=0; i<arity; i++) {
-        CHECK_TERM(args[i]);
-!       arg_buffer[i] = args[i];
-        protected_buffer[i] = args[i];
-      }
-    }
---- 1620,1629 ----
-    protoAppl->header = header;
-    CHECK_HEADER(protoAppl->header);
-  
-!   if (args != (ATerm *) (protoTerm + ARG_OFFSET)) {
-      for (i=0; i<arity; i++) {
-        CHECK_TERM(args[i]);
-!       protoTerm[ARG_OFFSET + i] = (MachineWord) args[i];
-        protected_buffer[i] = args[i];
-      }
-    }
-***************
-*** 1639,1645 ****
-        appl = (ATermAppl)cur;
-        found = ATtrue;
-        for(i=0; i<arity; i++) {
-! 	if(!ATisEqual(ATgetArgument(appl, i), arg_buffer[i])) {
-  	  found = ATfalse;
-  	  break;
-  	}
---- 1636,1642 ----
-        appl = (ATermAppl)cur;
-        found = ATtrue;
-        for(i=0; i<arity; i++) {
-! 	if(!ATisEqual(ATgetArgument(appl, i), protoTerm[ARG_OFFSET + i])) {
-  	  found = ATfalse;
-  	  break;
-  	}
-***************
-*** 1657,1670 ****
-      cur->header = header;
-      CHECK_HEADER(cur->header);
-      for (i=0; i<arity; i++) {
-!       ATgetArgument(cur, i) = arg_buffer[i];
-        CHECK_ARGUMENT(cur, i);
-      }
-      cur->next = hashtable[hnr];
-      hashtable[hnr] = cur;
-    }
-  
-!   if (args != arg_buffer) {
-      for (i=0; i<arity; i++) {
-        protected_buffer[i] = NULL;
-      }
---- 1654,1667 ----
-      cur->header = header;
-      CHECK_HEADER(cur->header);
-      for (i=0; i<arity; i++) {
-!       ATgetArgument(cur, i) = (ATerm) protoTerm[ARG_OFFSET + i];
-        CHECK_ARGUMENT(cur, i);
-      }
-      cur->next = hashtable[hnr];
-      hashtable[hnr] = cur;
-    }
-  
-!   if (args != (ATerm *) (protoTerm + ARG_OFFSET)) {
-      for (i=0; i<arity; i++) {
-        protected_buffer[i] = NULL;
-      }
-***************
-*** 2122,2132 ****
-    assert(n >= 0 && n < arity);
-  
-    for (i=0; i<arity; i++) {
-!     arg_buffer[i] = ATgetArgument(appl, i);
-    }
-!   arg_buffer[n] = arg;
-  
-!   result = ATmakeApplArray(sym, arg_buffer);
-    annos = AT_getAnnotations((ATerm)appl);
-    if (annos != NULL) {
-      result = (ATermAppl)AT_setAnnotations((ATerm)result, annos);
---- 2119,2129 ----
-    assert(n >= 0 && n < arity);
-  
-    for (i=0; i<arity; i++) {
-!     protoTerm[ARG_OFFSET + i] = (MachineWord) ATgetArgument(appl, i);
-    }
-!   protoTerm[ARG_OFFSET + n] = (MachineWord) arg;
-  
-!   result = ATmakeApplArray(sym, (ATerm *) (protoTerm + ARG_OFFSET));
-    annos = AT_getAnnotations((ATerm)appl);
-    if (annos != NULL) {
-      result = (ATermAppl)AT_setAnnotations((ATerm)result, annos);
-diff -rc aterm-2.3.1-orig/configure aterm-2.3.1/configure
-*** aterm-2.3.1-orig/configure	2004-12-01 23:03:59.000000000 +0100
---- aterm-2.3.1/configure	2005-05-02 18:36:24.000000000 +0200
-***************
-*** 2890,2896 ****
-  INCL_PROF=""
-  
-  CC_NS=gcc
-! CFLAGS_NS="-Wall -DNDEBUG -O -DXGC_VERBOSE -DWITH_STATS" # " -O2" disabled due to gcc optimizer bugs
-  LFLAGS_NS=""
-  DEFS_NS="\$(DEFS) -DNO_SHARING"
-  INCL_NS=""
---- 2890,2896 ----
-  INCL_PROF=""
-  
-  CC_NS=gcc
-! CFLAGS_NS="-Wall -DNDEBUG -O3 -DXGC_VERBOSE -DWITH_STATS" # " -O2" disabled due to gcc optimizer bugs
-  LFLAGS_NS=""
-  DEFS_NS="\$(DEFS) -DNO_SHARING"
-  INCL_NS=""
-***************
-*** 3379,3385 ****
-    CFLAGS=${withval}
-  else
-    if test "a${GCC}" = "ayes"; then
-!      CFLAGS="-Wall -DNDEBUG -O -DXGC_VERBOSE -DXHASHPEM  -DWITH_STATS" # " -O2" disabled due to gcc optimizer bugs
-     fi;
-  
-  fi;
---- 3379,3385 ----
-    CFLAGS=${withval}
-  else
-    if test "a${GCC}" = "ayes"; then
-!      CFLAGS="-Wall -DNDEBUG -O3 -DXGC_VERBOSE -DXHASHPEM  -DWITH_STATS" # " -O2" disabled due to gcc optimizer bugs
-     fi;
-  
-  fi;
-diff -rc aterm-2.3.1-orig/README aterm-2.3.1/README
-*** aterm-2.3.1-orig/README	2002-01-16 14:19:35.000000000 +0100
---- aterm-2.3.1/README	2005-05-02 18:37:48.000000000 +0200
-***************
-*** 1,27 ****
-  
-- ***NOTE on COMPILER OPTIMIZATIONS:
-- 
--   (added Wed, 16 Jan 2002, <jong@cwi.nl>)
-- 
-- Due to several pending issues with the optimizer in the GNU C Compiler
-- (most noticable to everyone using gcc version over 2.95), we strongly
-- advise AGAINST passing gcc any of its '-O' optimization flags.
-- 
-- More information on GCC optimization bugs can be found at:
--   http://gcc.gnu.org/cgi-bin/gnatsweb.pl?database=gcc&cmd=query
-- 
-- and subsequently selecting the Category:
--   "optimization -- Issues related to optimization"
-- 
-- As a result, the default configuration of the ATerm Library does not
-- pass any optimizer flags to gcc anymore. Should you wish to experiment
-- with specific compiler flags anyway, you can use the "--with-cflags"
-- configure option. Your mileage may vary from the stress-test failing,
-- to coredumps and spontaneous aborts in your program.
-- 
-- 
-- 
-- 
-  README with this version of the aterm library.
-  ==============================================
-  
---- 1,4 ----
diff --git a/pkgs/development/libraries/aterm/max-long.patch b/pkgs/development/libraries/aterm/max-long.patch
new file mode 100644
index 00000000000..a2f260b970b
--- /dev/null
+++ b/pkgs/development/libraries/aterm/max-long.patch
@@ -0,0 +1,77 @@
+diff -rc aterm-2.8-orig/aterm/hash.c aterm-2.8/aterm/hash.c
+*** aterm-2.8-orig/aterm/hash.c	2008-11-10 13:54:22.000000000 +0100
+--- aterm-2.8/aterm/hash.c	2009-01-27 18:14:14.000000000 +0100
+***************
+*** 93,146 ****
+  }
+  
+  /*}}}  */
+- /*{{{  static long calc_long_max() */
+- static long calc_long_max()
+- {
+-   long try_long_max;
+-   long long_max;
+-   long delta;
+- 
+-   try_long_max = 1;
+-   do {
+-     long_max = try_long_max;
+-     try_long_max = long_max * 2;
+-   } while (try_long_max > 0);
+- 
+-   delta = long_max;
+-   while (delta > 1) {
+-     while (long_max + delta < 0) {
+-       delta /= 2;
+-     }
+-     long_max += delta;
+-   }
+- 
+-   return long_max;
+- 
+- }
+- /*}}}  */
+  /*{{{  static long calculateNewSize(sizeMinus1, nrdel, nrentries) */
+  
+  static long calculateNewSize
+  (long sizeMinus1, long nr_deletions, long nr_entries)
+  { 
+- 
+-   /* Hack: LONG_MAX (limits.h) is often unreliable, we need to find
+-    * out the maximum possible value of a signed long dynamically.
+-    */
+-   static long st_long_max = 0;
+- 
+-   /* the resulting length has the form 2^k-1 */
+- 
+    if (nr_deletions >= nr_entries/2) { 
+      return sizeMinus1;
+    }
+  
+!   if (st_long_max == 0) {
+!     st_long_max = calc_long_max();
+!   }
+! 
+!   if (sizeMinus1 > st_long_max / 2) {
+!     return st_long_max-1;
+    }
+  
+    return (2*sizeMinus1)+1;
+--- 93,109 ----
+  }
+  
+  /*}}}  */
+  /*{{{  static long calculateNewSize(sizeMinus1, nrdel, nrentries) */
+  
+  static long calculateNewSize
+  (long sizeMinus1, long nr_deletions, long nr_entries)
+  { 
+    if (nr_deletions >= nr_entries/2) { 
+      return sizeMinus1;
+    }
+  
+!   if (sizeMinus1 > LONG_MAX / 2) {
+!     return LONG_MAX-1;
+    }
+  
+    return (2*sizeMinus1)+1;
diff --git a/pkgs/development/libraries/aterm/mingw-asm.patch b/pkgs/development/libraries/aterm/mingw-asm.patch
deleted file mode 100644
index e1e18f4c334..00000000000
--- a/pkgs/development/libraries/aterm/mingw-asm.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-diff -urN aterm-2.4.2-old/aterm/gc.c aterm-2.4.2/aterm/gc.c
---- aterm-2.4.2-old/aterm/gc.c	2004-06-01 10:29:02.000000000 +0200
-+++ aterm-2.4.2/aterm/gc.c	2006-08-17 15:17:28.000000000 +0200
-@@ -230,71 +230,17 @@
-   AFun oddSym;
- #endif
- 
--#ifdef WIN32
--
--  unsigned int r_eax, r_ebx, r_ecx, r_edx, \
--    r_esi, r_edi, r_esp, r_ebp;
--  ATerm reg[8], *real_term;
--
--  __asm {
--      /* Get the registers into local variables to check them
--         for aterms later. */
--    mov r_eax, eax
--      mov r_ebx, ebx
--      mov r_ecx, ecx
--      mov r_edx, edx
--      mov r_esi, esi
--      mov r_edi, edi
--      mov r_esp, esp
--      mov r_ebp, ebp
--      }
--    /* Put the register-values into an array */
--  reg[0] = (ATerm) r_eax;
--  reg[1] = (ATerm) r_ebx;
--  reg[2] = (ATerm) r_ecx;
--  reg[3] = (ATerm) r_edx;
--  reg[4] = (ATerm) r_esi;
--  reg[5] = (ATerm) r_edi;
--  reg[6] = (ATerm) r_esp;
--  reg[7] = (ATerm) r_ebp;
--
--  for(i=0; i<8; i++) {
--    real_term = AT_isInsideValidTerm(reg[i]);
--    if (real_term != NULL) {
--      AT_markTerm(real_term);
--    }
--    if (AT_isValidSymbol((Symbol)reg[i])) {
--      AT_markSymbol((Symbol)reg[i]);
--    }
--  }
--
--    /* The register variables are on the stack aswell
--       I set them to zero so they won't be processed again when
--       the stack is traversed. The reg-array is also in the stack
--       but that will be adjusted later */
--  r_eax = 0;
--  r_ebx = 0;
--  r_ecx = 0;
--  r_edx = 0;
--  r_esi = 0;
--  r_edi = 0;
--  r_esp = 0;
--  r_ebp = 0;
--
--#else
--  sigjmp_buf env;
-+  jmp_buf env;
- 
-   /* Traverse possible register variables */
--  sigsetjmp(env,0);
-+  setjmp(env);
- 
-   start = (ATerm *)env;
--  stop  = ((ATerm *)(((char *)env) + sizeof(sigjmp_buf)));
-+  stop  = ((ATerm *)(((char *)env) + sizeof(jmp_buf)));
-   mark_memory(start, stop);
--#endif
- 
-   stackTop = stack_top();
- 
--
-   start = MIN(stackTop, stackBot);
-   stop  = MAX(stackTop, stackBot);
- 
-@@ -343,67 +289,14 @@
-   AFun oddSym;
- #endif
- 
--#ifdef WIN32
--
--  unsigned int r_eax, r_ebx, r_ecx, r_edx, \
--    r_esi, r_edi, r_esp, r_ebp;
--  ATerm reg[8], *real_term;
--
--  __asm {
--      /* Get the registers into local variables to check them
--         for aterms later. */
--    mov r_eax, eax
--      mov r_ebx, ebx
--      mov r_ecx, ecx
--      mov r_edx, edx
--      mov r_esi, esi
--      mov r_edi, edi
--      mov r_esp, esp
--      mov r_ebp, ebp
--      }
--    /* Put the register-values into an array */
--  reg[0] = (ATerm) r_eax;
--  reg[1] = (ATerm) r_ebx;
--  reg[2] = (ATerm) r_ecx;
--  reg[3] = (ATerm) r_edx;
--  reg[4] = (ATerm) r_esi;
--  reg[5] = (ATerm) r_edi;
--  reg[6] = (ATerm) r_esp;
--  reg[7] = (ATerm) r_ebp;
--
--  for(i=0; i<8; i++) {
--    real_term = AT_isInsideValidTerm(reg[i]);
--    if (real_term != NULL) {
--      AT_markTerm_young(real_term);
--    }
--    if (AT_isValidSymbol((Symbol)reg[i])) {
--       AT_markSymbol_young((Symbol)reg[i]);
--    }
--  }
--
--    /* The register variables are on the stack aswell
--       I set them to zero so they won't be processed again when
--       the stack is traversed. The reg-array is also in the stack
--       but that will be adjusted later */
--  r_eax = 0;
--  r_ebx = 0;
--  r_ecx = 0;
--  r_edx = 0;
--  r_esi = 0;
--  r_edi = 0;
--  r_esp = 0;
--  r_ebp = 0;
--
--#else
--  sigjmp_buf env;
-+  jmp_buf env;
- 
-     /* Traverse possible register variables */
--  sigsetjmp(env,0);
-+  setjmp(env);
- 
-   start = (ATerm *)env;
--  stop  = ((ATerm *)(((char *)env) + sizeof(sigjmp_buf)));
-+  stop  = ((ATerm *)(((char *)env) + sizeof(jmp_buf)));
-   mark_memory_young(start, stop);
--#endif
- 
-   stackTop = stack_top();
-   start = MIN(stackTop, stackBot);
-diff -urN aterm-2.4.2-old/test/randgen.c aterm-2.4.2/test/randgen.c
---- aterm-2.4.2-old/test/randgen.c	2002-06-06 10:16:29.000000000 +0200
-+++ aterm-2.4.2/test/randgen.c	2006-08-17 16:09:47.000000000 +0200
-@@ -14,8 +14,13 @@
- #if HAVE_LRAND48 && HAVE_SRAND48
-   /* Use the rand48() suite */
- #else
--#define lrand48()   random()
--#define srand48(s)  srandom(s)
-+#  ifdef WIN32
-+#  define lrand48()   rand()
-+#  define srand48(s)  srand(s)
-+#  else
-+#  define lrand48()   random()
-+#  define srand48(s)  srandom(s)
-+#  endif
- #endif
- 
- /*}}}  */
-diff -urN aterm-2.4.2-old/test/termstats.c aterm-2.4.2/test/termstats.c
---- aterm-2.4.2-old/test/termstats.c	2001-10-09 16:35:21.000000000 +0200
-+++ aterm-2.4.2/test/termstats.c	2006-08-17 17:15:53.000000000 +0200
-@@ -1,7 +1,9 @@
- #include <stdio.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#ifndef WIN32
- #include <sys/times.h>
-+#endif
- #include <time.h>
- #include <limits.h>
- 
-@@ -14,7 +16,9 @@
- 
- int main(int argc, char *argv[])
- {
-+#ifndef WIN32
-   struct tms  start, end;
-+#endif
-   ATerm top = NULL;
-   ATerm t, t2;
-   ATbool dobafsize = ATfalse;
-@@ -29,16 +33,24 @@
- 
-   ATinit(argc, argv, &top);
- 
-+#ifndef WIN32
-   times(&start);
-+#endif
-   t = ATreadFromFile(stdin);
-+#ifndef WIN32
-   times(&end);
-   textread = end.tms_utime-start.tms_utime;
-+#endif
- 
-   tmp_file = tmpfile();
-+#ifndef WIN32
-   times(&start);
-+#endif
-   ATwriteToTextFile(t, tmp_file);
-+#ifndef WIN32
-   times(&end);
-   textwrite = end.tms_utime-start.tms_utime;
-+#endif
- 
-   subterms = AT_calcSubterms(t);
-   symbols  = AT_calcUniqueSymbols(t);
-@@ -56,37 +68,52 @@
-   printf("  bytes p/node  : %8.2f\n", ((double)incore)/((double)subterms));
-   printf("text size       : %8d\n",textsize);
-   printf("  bytes p/node  : %8.2f\n", ((double)textsize)/((double)subterms));
-+
-+#ifndef WIN32
-   printf("text read time  : %8.2fs\n", ((double)textread)/((double)CLK_TCK));
-   printf("  per node      : %8.2fus\n", ((double)textread*1000000.0/subterms)/((double)CLK_TCK));
-   printf("text write time : %8.2fs\n", ((double)textwrite)/((double)CLK_TCK));
-   printf("  per node      : %8.2fus\n", ((double)textwrite*1000000.0/subterms)/((double)CLK_TCK));
-+#endif
- 
-   if(dobafsize) {
-     struct stat stats;
-+#ifndef WIN32
-     clock_t bafread, bafwrite;
-+#endif
-     FILE *file = fopen("/tmp/test.baf", "wb+");
-     int fd = fileno(file);
- 
-+#ifndef WIN32
-     times(&start);
-+#endif
-     ATwriteToBinaryFile(t, file);
-+#ifndef WIN32
-     times(&end);
-     bafwrite = end.tms_utime-start.tms_utime;
-+#endif
-     fflush(file);
-     fstat(fd, &stats);
-     bafsize = (int)stats.st_size;
-     fseek(file, 0, SEEK_SET);
-+#ifndef WIN32
-     times(&start);
-+#endif
-     t2 = ATreadFromBinaryFile(file);
-+#ifndef WIN32
-     times(&end);
-     bafread = end.tms_utime-start.tms_utime;
-+#endif
-     printf("baf size        : %8d\n", bafsize);
-     printf("  bytes p/node  : %8.2f\n", ((double)bafsize)/((double)subterms));
-     printf("  bits p/node   : %8.2f\n", ((double)bafsize*8)/((double)subterms));
-     printf("  comp.wrs.text : %8.2f%%\n", 100.0-((double)bafsize*100)/((textsize)));
-+#ifndef WIN32
-     printf("baf write time  : %8.2fs\n", ((double)bafwrite)/((double)CLK_TCK));
-     printf("  per node      : %8.2fus\n", ((double)bafwrite*1000000.0/subterms)/((double)CLK_TCK));
-     printf("baf read time   : %8.2fs\n", ((double)bafread)/((double)CLK_TCK));
-     printf("  per node      : %8.2fus\n", ((double)bafread*1000000.0/subterms)/((double)CLK_TCK));
-+#endif
-     fclose(file);
-   }
- 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 996dee41a30..0d0139be5f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1945,14 +1945,12 @@ let
   };
 
   transformers = import ../development/compilers/transformers {
-    inherit fetchurl pkgconfig sdf stlport;
-    aterm = aterm23;
+    inherit fetchurl pkgconfig sdf stlport aterm;
 
     stdenv = overrideGCC (overrideInStdenv stdenv [gnumake380]) gcc34;
 
     strategoxt = import ../development/compilers/strategoxt/strategoxt-0.14.nix {
-      inherit fetchurl pkgconfig sdf;
-      aterm = aterm23;
+      inherit fetchurl pkgconfig sdf aterm;
       stdenv = overrideGCC (overrideInStdenv stdenv [gnumake380]) gcc34;
     };
   };
@@ -2654,15 +2652,7 @@ let
     inherit fetchurl stdenv aspell which;
   });
 
-  aterm = aterm24;
-
-  aterm23 = import ../development/libraries/aterm/2.3.nix {
-    inherit fetchurl stdenv;
-  };
-
-  aterm24 = lowPrio (import ../development/libraries/aterm/2.4.nix {
-    inherit fetchurl stdenv;
-  });
+  aterm = aterm28;
 
   aterm242fixes = import ../development/libraries/aterm/2.4.2-fixes.nix {
     inherit fetchurl stdenv;
@@ -2672,9 +2662,9 @@ let
     inherit fetchurl stdenv;
   };
 
-  aterm27 = lowPrio (import ../development/libraries/aterm/2.7.nix {
+  aterm28 = import ../development/libraries/aterm/2.8.nix {
     inherit fetchurl stdenv;
-  });
+  };
 
   attr = useFromStdenv "attr"
     (import ../development/libraries/attr {