about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rwxr-xr-xpkgs/MPlayer/MPlayer-build.sh19
-rw-r--r--pkgs/MPlayer/MPlayer.fix21
-rwxr-xr-xpkgs/Xft/Xft-build.sh12
-rw-r--r--pkgs/Xft/Xft.fix16
-rwxr-xr-xpkgs/asfix-tools/asfix-tools-build.sh3
-rw-r--r--pkgs/asfix-tools/asfix-tools.fix19
-rwxr-xr-xpkgs/aterm/aterm-build.sh10
-rw-r--r--pkgs/aterm/aterm.fix12
-rwxr-xr-xpkgs/atk/atk-build.sh13
-rw-r--r--pkgs/atk/atk.fix16
-rwxr-xr-xpkgs/autoxt/autoxt-build.sh3
-rw-r--r--pkgs/autoxt/autoxt.fix13
-rwxr-xr-xpkgs/baseenv/baseenv-build.sh25
-rw-r--r--pkgs/baseenv/baseenv.fix9
-rw-r--r--pkgs/baseenv/gcc-wrapper.sh42
-rw-r--r--pkgs/baseenv/ld-wrapper.sh17
-rw-r--r--pkgs/baseenv/setup.sh40
-rwxr-xr-xpkgs/bash/bash-build.sh10
-rw-r--r--pkgs/bash/bash.fix13
-rwxr-xr-xpkgs/binutils/binutils-build.sh15
-rw-r--r--pkgs/binutils/binutils.fix13
-rwxr-xr-xpkgs/bison/bison-build.sh10
-rw-r--r--pkgs/bison/bison.fix15
-rwxr-xr-xpkgs/boehmgc/boehmgc-build.sh10
-rw-r--r--pkgs/boehmgc/boehmgc.fix12
-rwxr-xr-xpkgs/bzip2/bzip2-build.sh8
-rw-r--r--pkgs/bzip2/bzip2.fix13
-rwxr-xr-xpkgs/coreutils/coreutils-build.sh9
-rw-r--r--pkgs/coreutils/coreutils.fix13
-rwxr-xr-xpkgs/db4/db4-build.sh10
-rw-r--r--pkgs/db4/db4.fix12
-rwxr-xr-xpkgs/diffutils/diffutils-build.sh9
-rw-r--r--pkgs/diffutils/diffutils.fix13
-rwxr-xr-xpkgs/docbook-xml/docbook-xml-build.sh7
-rw-r--r--pkgs/docbook-xml/docbook-xml.fix13
-rwxr-xr-xpkgs/docbook-xsl/docbook-xsl-build.sh10
-rw-r--r--pkgs/docbook-xsl/docbook-xsl.fix12
-rwxr-xr-xpkgs/ed/ed-build.sh9
-rw-r--r--pkgs/ed/ed.fix13
-rwxr-xr-xpkgs/expat/expat-build.sh10
-rw-r--r--pkgs/expat/expat.fix12
-rw-r--r--pkgs/fetchsvn/fetchsvn-native.fix10
-rw-r--r--pkgs/fetchsvn/fetchsvn.fix17
-rwxr-xr-xpkgs/fetchsvn/fetchsvn.sh17
-rwxr-xr-xpkgs/findutils/findutils-build.sh9
-rw-r--r--pkgs/findutils/findutils.fix13
-rwxr-xr-xpkgs/firebird/firebird-build.sh31
-rw-r--r--pkgs/firebird/firebird.fix18
-rwxr-xr-xpkgs/flex/flex-build.sh10
-rw-r--r--pkgs/flex/flex.fix15
-rwxr-xr-xpkgs/fontconfig/fontconfig-build.sh19
-rw-r--r--pkgs/fontconfig/fontconfig.fix17
-rwxr-xr-xpkgs/freetype/freetype-build.sh10
-rw-r--r--pkgs/freetype/freetype.fix12
-rwxr-xr-xpkgs/gawk/gawk-build.sh9
-rw-r--r--pkgs/gawk/gawk.fix13
-rwxr-xr-xpkgs/gcc-2.95/gcc-build.sh50
-rw-r--r--pkgs/gcc-2.95/gcc.fix13
-rwxr-xr-xpkgs/gcc/gcc-build.sh52
-rw-r--r--pkgs/gcc/gcc.fix15
-rwxr-xr-xpkgs/getopt/getopt-build.sh8
-rw-r--r--pkgs/getopt/getopt.fix14
-rwxr-xr-xpkgs/gettext/gettext-build.sh9
-rw-r--r--pkgs/gettext/gettext.fix13
-rwxr-xr-xpkgs/glib-1/glib-build.sh9
-rw-r--r--pkgs/glib-1/glib.fix12
-rwxr-xr-xpkgs/glib/glib-build.sh10
-rw-r--r--pkgs/glib/glib.fix16
-rwxr-xr-xpkgs/glibc/glibc-build.sh20
-rw-r--r--pkgs/glibc/glibc.fix16
-rwxr-xr-xpkgs/gnet/gnet-build.sh13
-rw-r--r--pkgs/gnet/gnet.fix15
-rwxr-xr-xpkgs/gnugrep/gnugrep-build.sh10
-rw-r--r--pkgs/gnugrep/gnugrep.fix14
-rwxr-xr-xpkgs/gnum4/gnum4-build.sh9
-rw-r--r--pkgs/gnum4/gnum4.fix13
-rwxr-xr-xpkgs/gnumake/gnumake-build.sh9
-rw-r--r--pkgs/gnumake/gnumake.fix13
-rwxr-xr-xpkgs/gnupatch/gnupatch-build.sh9
-rw-r--r--pkgs/gnupatch/gnupatch.fix13
-rwxr-xr-xpkgs/gnused/gnused-build.sh9
-rw-r--r--pkgs/gnused/gnused.fix13
-rwxr-xr-xpkgs/gnutar/gnutar-build.sh9
-rw-r--r--pkgs/gnutar/gnutar.fix13
-rwxr-xr-xpkgs/gpp/gpp-build.sh4
-rw-r--r--pkgs/gpp/gpp.fix21
-rwxr-xr-xpkgs/gqview/gqview-build.sh13
-rw-r--r--pkgs/gqview/gqview.fix17
-rwxr-xr-xpkgs/graphviz/graphviz-build.sh12
-rw-r--r--pkgs/graphviz/graphviz.fix19
-rwxr-xr-xpkgs/gtk+-1/gtk+-build.sh12
-rw-r--r--pkgs/gtk+-1/gtk+.fix15
-rwxr-xr-xpkgs/gtk+/gtk+-build.sh18
-rw-r--r--pkgs/gtk+/gtk+.fix23
-rwxr-xr-xpkgs/gtkspell/gtkspell-build.sh14
-rw-r--r--pkgs/gtkspell/gtkspell.fix16
-rwxr-xr-xpkgs/gzip/gzip-build.sh9
-rw-r--r--pkgs/gzip/gzip.fix13
-rwxr-xr-xpkgs/httpd/httpd-build.sh15
-rw-r--r--pkgs/httpd/httpd.fix17
-rwxr-xr-xpkgs/j2re/j2re-sun-linux-build.sh16
-rw-r--r--pkgs/j2re/j2re-sun-linux.fix12
-rwxr-xr-xpkgs/libIDL/libIDL-build.sh14
-rw-r--r--pkgs/libIDL/libIDL.fix17
-rwxr-xr-xpkgs/libjpeg/libjpeg-build.sh15
-rw-r--r--pkgs/libjpeg/libjpeg.fix13
-rwxr-xr-xpkgs/libpng/libpng-build.sh18
-rw-r--r--pkgs/libpng/libpng.fix14
-rwxr-xr-xpkgs/libtiff/libtiff-build.sh16
-rw-r--r--pkgs/libtiff/libtiff.fix15
-rwxr-xr-xpkgs/libxml2/libxml2-build.sh13
-rw-r--r--pkgs/libxml2/libxml2.fix13
-rwxr-xr-xpkgs/libxslt/libxslt-build.sh13
-rw-r--r--pkgs/libxslt/libxslt.fix14
-rwxr-xr-xpkgs/linux-headers/linux-headers-build.sh12
-rw-r--r--pkgs/linux-headers/linux-headers.fix13
-rwxr-xr-xpkgs/nix-dist/nix-dist-build.sh12
-rw-r--r--pkgs/nix-dist/nix-dist.fix23
-rwxr-xr-xpkgs/openssl/openssl-build.sh16
-rw-r--r--pkgs/openssl/openssl.fix14
-rwxr-xr-xpkgs/pan/pan-build.sh11
-rw-r--r--pkgs/pan/pan.fix19
-rwxr-xr-xpkgs/pango/pango-build.sh13
-rw-r--r--pkgs/pango/pango.fix17
-rwxr-xr-xpkgs/pcre/pcre-build.sh9
-rw-r--r--pkgs/pcre/pcre.fix13
-rwxr-xr-xpkgs/perl-BerkeleyDB/perl-BerkeleyDB-build.sh17
-rw-r--r--pkgs/perl-BerkeleyDB/perl-BerkeleyDB.fix14
-rwxr-xr-xpkgs/perl/perl-build.sh26
-rw-r--r--pkgs/perl/perl.fix13
-rwxr-xr-xpkgs/pkgconfig/pkgconfig-build.sh10
-rw-r--r--pkgs/pkgconfig/pkgconfig.fix12
-rwxr-xr-xpkgs/pspell/pspell-build.sh10
-rw-r--r--pkgs/pspell/pspell.fix13
-rwxr-xr-xpkgs/sc/sc-build.sh3
-rw-r--r--pkgs/sc/sc.fix19
-rwxr-xr-xpkgs/sdf2/sdf2-build.sh16
-rw-r--r--pkgs/sdf2/sdf2.fix15
-rwxr-xr-xpkgs/srts/srts-build.sh3
-rw-r--r--pkgs/srts/srts.fix17
-rw-r--r--pkgs/stdenv-linux/setup-nativetools.sh11
-rw-r--r--pkgs/stdenv-linux/setup.sh14
-rwxr-xr-xpkgs/stdenv-linux/stdenv-build.sh35
-rwxr-xr-xpkgs/stdenv-linux/stdenv-nativetools-build.sh10
-rw-r--r--pkgs/stdenv-linux/stdenv-nativetools.fix9
-rw-r--r--pkgs/stdenv-linux/stdenv.fix28
-rw-r--r--pkgs/stdenv-native/setup.sh8
-rwxr-xr-xpkgs/stdenv-native/stdenv-build.sh9
-rw-r--r--pkgs/stdenv-native/stdenv.fix8
-rw-r--r--pkgs/stdenv/stdenv.fix4
-rwxr-xr-xpkgs/stratego-front/stratego-front-build.sh5
-rw-r--r--pkgs/stratego-front/stratego-front.fix19
-rwxr-xr-xpkgs/strategoxt-0.9.2/strategoxt-build.sh9
-rw-r--r--pkgs/strategoxt-0.9.2/strategoxt.fix15
-rw-r--r--pkgs/strategoxt/fetchsvn.fix8
-rwxr-xr-xpkgs/strategoxt/pkg-build.sh21
-rw-r--r--pkgs/strategoxt/pkg.fix16
-rwxr-xr-xpkgs/strategoxt/sdf-import-build.sh3
-rw-r--r--pkgs/strategoxt/sdf-import.fix18
-rwxr-xr-xpkgs/strategoxt/strategoxt-build.sh5
-rw-r--r--pkgs/strategoxt/strategoxt-head.fix4
-rw-r--r--pkgs/strategoxt/strategoxt.fix36
-rwxr-xr-xpkgs/subversion/subversion-build.sh41
-rw-r--r--pkgs/subversion/subversion.fix28
-rwxr-xr-xpkgs/swig/swig-build.sh9
-rw-r--r--pkgs/swig/swig.fix12
-rwxr-xr-xpkgs/sylpheed/sylpheed-build.sh13
-rw-r--r--pkgs/sylpheed/sylpheed.fix15
-rwxr-xr-xpkgs/system/populate-linkdirs.pl72
-rw-r--r--pkgs/system/system-template-everything.fix14
-rw-r--r--pkgs/system/system-template-server.fix10
-rw-r--r--pkgs/system/system.fix34
-rw-r--r--pkgs/uml/config357
-rwxr-xr-xpkgs/uml/uml-build.sh22
-rw-r--r--pkgs/uml/uml.fix23
-rwxr-xr-xpkgs/unzip/unzip-build.sh8
-rw-r--r--pkgs/unzip/unzip.fix13
-rwxr-xr-xpkgs/win32codecs/win32codecs-build.sh9
-rw-r--r--pkgs/win32codecs/win32codecs.fix13
-rwxr-xr-xpkgs/wxPython/wxPython-build.sh17
-rw-r--r--pkgs/wxPython/wxPython.fix15
-rw-r--r--pkgs/xfree86/host.def30
-rwxr-xr-xpkgs/xfree86/xfree86-build.sh18
-rw-r--r--pkgs/xfree86/xfree86.fix27
-rwxr-xr-xpkgs/xtc/xtc-build.sh3
-rw-r--r--pkgs/xtc/xtc-head.fix4
-rwxr-xr-xpkgs/xtc/xtc.fix17
-rwxr-xr-xpkgs/zip/zip-build.sh8
-rw-r--r--pkgs/zip/zip.fix13
-rwxr-xr-xpkgs/zlib/zlib-build.sh10
-rw-r--r--pkgs/zlib/zlib.fix13
192 files changed, 0 insertions, 3176 deletions
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index d4e731eb6432..000000000000
--- a/ChangeLog
+++ /dev/null
@@ -1,12 +0,0 @@
-2003-08-18  Eelco Visser  <visser@cs.uu.nl>
-
-	* pkgs/strategoxt/pkg-build.sh: generic build script for packages
-	with the standard untar; bootstrap; configure; make; make install
-	interface.  The script is parameterized with arguments for
-	configure. That is, all arguments are passed verbatim to
-	configure.
-
-	* asfix-tools, gpp, sc, srts, stratego-front, xtc: Fix expressions
-	and (trivial) build script for basic strategoxt packages. All
-	packages are abstracted on subversion revision.
-
diff --git a/pkgs/MPlayer/MPlayer-build.sh b/pkgs/MPlayer/MPlayer-build.sh
deleted file mode 100755
index ff1742d1dc13..000000000000
--- a/pkgs/MPlayer/MPlayer-build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh
-
-envpkgs="$freetype $x11"
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-tar xvfj $fonts || exit 1
-cd MPlayer-* || exit 1
-./configure --prefix=$out --with-win32libdir=$win32codecs \
- --with-x11incdir=$x11/include --with-x11libdir=$x11/lib \
- --with-reallibdir=$win32codecs \
- --disable-sdl --disable-esd --disable-xanim --disable-cdparanoia --disable-directfb \
- --disable-lirc --disable-svga --disable-libdv \
- --disable-vorbis --disable-png --disable-jpeg --disable-gif \
- --enable-runtime-cpudetection \
- || exit 1
-make || exit 1
-make install || exit 1
-cp -p ../font-arial-iso-8859-1/font-arial-18-iso-8859-1/* $out/share/mplayer/font || exit 1
diff --git a/pkgs/MPlayer/MPlayer.fix b/pkgs/MPlayer/MPlayer.fix
deleted file mode 100644
index 032b7553f964..000000000000
--- a/pkgs/MPlayer/MPlayer.fix
+++ /dev/null
@@ -1,21 +0,0 @@
-Package(
-  [ ("name", "MPlayer-1.0pre2")
-
-  , ("build", Relative("MPlayer/MPlayer-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-1.0pre2.tar.bz2")
-      , ("md5", "a60c179468f85e83e3f9e1922e81ad64")
-      ]))
-
-  , ("fonts", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www2.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2")
-      , ("md5", "1ecd31d17b51f16332b1fcc7da36b312")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("x11", IncludeFix("xfree86/xfree86.fix"))
-  , ("freetype", IncludeFix("freetype/freetype.fix"))
-  , ("win32codecs", IncludeFix("win32codecs/win32codecs.fix"))
-  ]
-)
diff --git a/pkgs/Xft/Xft-build.sh b/pkgs/Xft/Xft-build.sh
deleted file mode 100755
index 4f674b32ad5d..000000000000
--- a/pkgs/Xft/Xft-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-envpkgs="$fontconfig $x11"
-. $stdenv/setup || exit 1
-export PATH=$pkgconfig/bin:$PATH
-
-tar xvfz $src || exit 1
-cd xft-* || exit 1
-./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1
-make || exit 1
-make install || exit 1
-echo $envpkgs > $out/envpkgs || exit 1
diff --git a/pkgs/Xft/Xft.fix b/pkgs/Xft/Xft.fix
deleted file mode 100644
index f2804c7c056f..000000000000
--- a/pkgs/Xft/Xft.fix
+++ /dev/null
@@ -1,16 +0,0 @@
-Package(
-  [ ("name", "Xft-2.1.2")
-
-  , ("build", Relative("Xft/Xft-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://pdx.freedesktop.org/software/fontconfig/releases/xft-2.1.2.tar.gz")
-      , ("md5", "defb7e801d4938b8b15a426ae57e2f3f")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
-  , ("x11", IncludeFix("xfree86/xfree86.fix"))
-  , ("fontconfig", IncludeFix("fontconfig/fontconfig.fix"))
-  ]
-)
diff --git a/pkgs/asfix-tools/asfix-tools-build.sh b/pkgs/asfix-tools/asfix-tools-build.sh
deleted file mode 100755
index 3887279b74c8..000000000000
--- a/pkgs/asfix-tools/asfix-tools-build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-set -e
-$pkgbuild --with-aterm=$aterm --with-sdf=$sdf2 --with-srts=$srts --with-xtc=$xtc
diff --git a/pkgs/asfix-tools/asfix-tools.fix b/pkgs/asfix-tools/asfix-tools.fix
deleted file mode 100644
index c4a3ba7fee9a..000000000000
--- a/pkgs/asfix-tools/asfix-tools.fix
+++ /dev/null
@@ -1,19 +0,0 @@
-Function(["rev"],
-  Package(
-    [ ("name", "asfix-tools")
-
-    , ("build", Relative("asfix-tools/asfix-tools-build.sh"))
-    , ("pkgbuild", Relative("strategoxt/pkg-build.sh"))
-
-    , ("src", App(IncludeFix("strategoxt/fetchsvn.fix"),
-                  [ ("name", "asfix-tools"), ("rev",  Var("rev"))]))
-
-    , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-    , ("aterm",  IncludeFix("aterm/aterm.fix"))
-    , ("sdf2",   IncludeFix("sdf2/sdf2.fix"))
-    , ("autoxt", App(IncludeFix("autoxt/autoxt.fix"),[("rev",Var("rev"))]))
-    , ("srts",   App(IncludeFix("srts/srts.fix"),[("rev",Var("rev"))]))
-    , ("xtc",    App(IncludeFix("xtc/xtc.fix"),[("rev",Var("rev"))]))
-    ]
-  )
-)
diff --git a/pkgs/aterm/aterm-build.sh b/pkgs/aterm/aterm-build.sh
deleted file mode 100755
index 5915dc0f87d1..000000000000
--- a/pkgs/aterm/aterm-build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd aterm-* || exit 1
-./configure --prefix=$out --with-gcc || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1
diff --git a/pkgs/aterm/aterm.fix b/pkgs/aterm/aterm.fix
deleted file mode 100644
index a10e7579f428..000000000000
--- a/pkgs/aterm/aterm.fix
+++ /dev/null
@@ -1,12 +0,0 @@
-Package(
-  [ ("name", "aterm-2.0")
-  , ("build", Relative("aterm/aterm-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.tar.gz")
-      , ("md5", "853474e4bcf4a85f7d38a0676b36bded")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)
diff --git a/pkgs/atk/atk-build.sh b/pkgs/atk/atk-build.sh
deleted file mode 100755
index feae8e8916a5..000000000000
--- a/pkgs/atk/atk-build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-
-envpkgs=$glib
-. $stdenv/setup || exit 1
-export PATH=$pkgconfig/bin:$perl/bin:$PATH
-
-tar xvfj $src || exit 1
-cd atk-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-
-echo $envpkgs > $out/envpkgs || exit 1
diff --git a/pkgs/atk/atk.fix b/pkgs/atk/atk.fix
deleted file mode 100644
index 7954e69cc1ec..000000000000
--- a/pkgs/atk/atk.fix
+++ /dev/null
@@ -1,16 +0,0 @@
-Package(
-  [ ("name", "atk-1.2.4")
-
-  , ("build", Relative("atk/atk-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.gtk.org/pub/gtk/v2.2/atk-1.2.4.tar.bz2")
-      , ("md5", "2d6d50df31abe0e8892b5d3e7676a02d")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
-  , ("glib", IncludeFix("glib/glib.fix"))
-  , ("perl", IncludeFix("perl/perl.fix"))
-  ]
-)
diff --git a/pkgs/autoxt/autoxt-build.sh b/pkgs/autoxt/autoxt-build.sh
deleted file mode 100755
index 465f9c5c196f..000000000000
--- a/pkgs/autoxt/autoxt-build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-set -e
-$pkgbuild
diff --git a/pkgs/autoxt/autoxt.fix b/pkgs/autoxt/autoxt.fix
deleted file mode 100644
index ef6812a38a2d..000000000000
--- a/pkgs/autoxt/autoxt.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Function(["rev"],
-  Package(
-    [ ("name", "autoxt")
-
-    , ("build", Relative("strategoxt/pkg-build.sh"))
-
-    , ("src", App(IncludeFix("strategoxt/fetchsvn.fix"),
-                  [ ("name", "autoxt"), ("rev",  Var("rev"))]))
-
-    , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-    ]
-  )
-)
diff --git a/pkgs/baseenv/baseenv-build.sh b/pkgs/baseenv/baseenv-build.sh
deleted file mode 100755
index b0c7073f0ba3..000000000000
--- a/pkgs/baseenv/baseenv-build.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-mkdir $out || exit 1
-mkdir $out/bin || exit 1
-
-sed \
- -e s^@OUT\@^$out^g \
- < $setup > $out/setup || exit 1
-
-sed \
- -e 's^@GCC\@^$NIX_CC^g' \
- < $gccwrapper > $out/bin/gcc || exit 1
-chmod +x $out/bin/gcc || exit 1
-ln -s gcc $out/bin/cc || exit 1
-
-sed \
- -e 's^@GCC\@^$NIX_CXX^g' \
- < $gccwrapper > $out/bin/g++ || exit 1
-chmod +x $out/bin/g++ || exit 1
-ln -s g++ $out/bin/c++ || exit 1
-
-cp $ldwrapper $out/bin/ld || exit 1
-chmod +x $out/bin/ld || exit 1
diff --git a/pkgs/baseenv/baseenv.fix b/pkgs/baseenv/baseenv.fix
deleted file mode 100644
index 62c8c502e34c..000000000000
--- a/pkgs/baseenv/baseenv.fix
+++ /dev/null
@@ -1,9 +0,0 @@
-Package(
-  [ ("name", "baseenv")
-  , ("build", Relative("baseenv/baseenv-build.sh"))
-
-  , ("setup", Relative("baseenv/setup.sh"))
-  , ("gccwrapper", Relative("baseenv/gcc-wrapper.sh"))
-  , ("ldwrapper", Relative("baseenv/ld-wrapper.sh"))
-  ]
-)
diff --git a/pkgs/baseenv/gcc-wrapper.sh b/pkgs/baseenv/gcc-wrapper.sh
deleted file mode 100644
index f743c96ec2f0..000000000000
--- a/pkgs/baseenv/gcc-wrapper.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-
-IFS=
-
-justcompile=0
-for i in $@; do
-    if test "$i" == "-c"; then
-        justcompile=1
-    elif test "$i" == "-S"; then
-        justcompile=1
-    elif test "$i" == "-E"; then
-        justcompile=1
-    elif test "$i" == "-E"; then
-        justcompile=1
-    elif test "$i" == "-M"; then
-        justcompile=1
-    elif test "$i" == "-MM"; then
-        justcompile=1
-    fi
-done
-
-IFS=" "
-extra=($NIX_CFLAGS_COMPILE)
-if test "$justcompile" != "1"; then
-    extra=(${extra[@]} $NIX_CFLAGS_LINK)
-    for i in $NIX_LDFLAGS; do
-	extra=(${extra[@]} "-Wl,$i")
-    done
-    if test "$NIX_STRIP_DEBUG" == "1"; then
-	extra=(${extra[@]} -g0 -Wl,-s)
-    fi
-fi
-
-if test "$NIX_DEBUG" == "1"; then
-  echo "extra flags to @GCC@:" >&2
-  for i in ${extra[@]}; do
-      echo "  $i" >&2
-  done
-fi
-
-IFS=
-exec @GCC@ $@ ${extra[@]}
diff --git a/pkgs/baseenv/ld-wrapper.sh b/pkgs/baseenv/ld-wrapper.sh
deleted file mode 100644
index e6a2fe74c5e8..000000000000
--- a/pkgs/baseenv/ld-wrapper.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh
-
-IFS=" "
-extra=($NIX_CFLAGS_LINK $NIX_LDFLAGS)
-if test "$NIX_STRIP_DEBUG" == "1"; then
-    extra=(${extra[@]} -s)
-fi
-
-if test "$NIX_DEBUG" == "1"; then
-  echo "extra flags to @LD@:" >&2
-  for i in ${extra[@]}; do
-      echo "  $i" >&2
-  done
-fi
-
-IFS=
-exec $NIX_LD $@ ${extra[@]}
diff --git a/pkgs/baseenv/setup.sh b/pkgs/baseenv/setup.sh
deleted file mode 100644
index 60f71bfddf60..000000000000
--- a/pkgs/baseenv/setup.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-# Add the directory containing the GCC wrappers to the PATH.
-export PATH=@OUT@/bin:$PATH
-
-# Recursively add all envpkgs to the relevant environment variables.
-addtoenv()
-{
-    envpkgs="$envpkgs $1"
-
-    if test -d $1/bin; then
-        export PATH=$1/bin:$PATH
-    fi
-
-    if test -d $1/lib; then
-	export NIX_CFLAGS_LINK="-L$1/lib $NIX_CFLAGS_LINK"
-	export NIX_LDFLAGS="-rpath $1/lib $NIX_LDFLAGS"
-    fi
-
-    if test -d $1/lib/pkgconfig; then
-        export PKG_CONFIG_PATH=$1/lib/pkgconfig:$PKG_CONFIG_PATH
-    fi
-
-    if test -f $1/envpkgs; then
-        for i in $(cat $1/envpkgs); do
-            addtoenv $i
-        done
-    fi
-}
-
-oldenvpkgs=$envpkgs
-envpkgs=
-
-for i in $oldenvpkgs; do
-    addtoenv $i
-done
-
-# Add the output as an rpath.
-export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS"
-
-# Strip debug information by default.
-export NIX_STRIP_DEBUG=1
diff --git a/pkgs/bash/bash-build.sh b/pkgs/bash/bash-build.sh
deleted file mode 100755
index 7b0d093c5760..000000000000
--- a/pkgs/bash/bash-build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd bash-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-(cd $out/bin; ln -s bash sh) || exit 1
diff --git a/pkgs/bash/bash.fix b/pkgs/bash/bash.fix
deleted file mode 100644
index 480f11b02127..000000000000
--- a/pkgs/bash/bash.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "bash-2.05b")
-
-  , ("build", Relative("bash/bash-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/bash/bash-2.05b.tar.gz")
-      , ("md5", "5238251b4926d778dfe162f6ce729733")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
-  ]
-)
diff --git a/pkgs/binutils/binutils-build.sh b/pkgs/binutils/binutils-build.sh
deleted file mode 100755
index 04a1ba4e7084..000000000000
--- a/pkgs/binutils/binutils-build.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd binutils-* || exit 1
-
-# Clear the default library search path.
-echo 'NATIVE_LIB_DIRS=' >> ld/configure.tgt || exit 1
-
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-
-strip -S $out/lib/*.a || exit 1
diff --git a/pkgs/binutils/binutils.fix b/pkgs/binutils/binutils.fix
deleted file mode 100644
index 52749b492af2..000000000000
--- a/pkgs/binutils/binutils.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "binutils-2.14")
-
-  , ("build", Relative("binutils/binutils-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/binutils/binutils-2.14.tar.bz2")
-      , ("md5", "2da8def15d28af3ec6af0982709ae90a")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
-  ]
-)
diff --git a/pkgs/bison/bison-build.sh b/pkgs/bison/bison-build.sh
deleted file mode 100755
index 122be0b05536..000000000000
--- a/pkgs/bison/bison-build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-export PATH=$m4/bin:$PATH
-
-tar xvfj $src || exit 1
-cd bison-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/bison/bison.fix b/pkgs/bison/bison.fix
deleted file mode 100644
index 692b046bc4c2..000000000000
--- a/pkgs/bison/bison.fix
+++ /dev/null
@@ -1,15 +0,0 @@
-Package(
-  [ ("name", "bison-1.875")
-
-  , ("build", Relative("bison/bison-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/bison/bison-1.875.tar.bz2")
-      , ("md5", "b7f8027b249ebd4dd0cc948943a71af0")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("m4", IncludeFix("gnum4/gnum4.fix"))
-  ]
-)
-
diff --git a/pkgs/boehmgc/boehmgc-build.sh b/pkgs/boehmgc/boehmgc-build.sh
deleted file mode 100755
index 0cba442c4232..000000000000
--- a/pkgs/boehmgc/boehmgc-build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd gc* || exit 1
-./configure --prefix=$out --disable-shared || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1
diff --git a/pkgs/boehmgc/boehmgc.fix b/pkgs/boehmgc/boehmgc.fix
deleted file mode 100644
index 1dfa8f165d84..000000000000
--- a/pkgs/boehmgc/boehmgc.fix
+++ /dev/null
@@ -1,12 +0,0 @@
-Package(
-  [ ("name", "boehmgc-6.2")
-  , ("build", Relative("boehmgc/boehmgc-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.2.tar.gz")
-      , ("md5", "15492b14ca7b9a9e035238611e9cd1e3")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)
diff --git a/pkgs/bzip2/bzip2-build.sh b/pkgs/bzip2/bzip2-build.sh
deleted file mode 100755
index 2fa113aa17a6..000000000000
--- a/pkgs/bzip2/bzip2-build.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd bzip2-* || exit 1
-make || exit 1
-make install PREFIX=$out || exit 1
diff --git a/pkgs/bzip2/bzip2.fix b/pkgs/bzip2/bzip2.fix
deleted file mode 100644
index ff9f42b0d160..000000000000
--- a/pkgs/bzip2/bzip2.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "bzip2-1.0.2")
-
-  , ("build", Relative("bzip2/bzip2-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://sources.redhat.com/pub/bzip2/v102/bzip2-1.0.2.tar.gz")
-      , ("md5", "ee76864958d568677f03db8afad92beb")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
-  ]
-)
diff --git a/pkgs/coreutils/coreutils-build.sh b/pkgs/coreutils/coreutils-build.sh
deleted file mode 100755
index 753086391082..000000000000
--- a/pkgs/coreutils/coreutils-build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd coreutils-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/coreutils/coreutils.fix b/pkgs/coreutils/coreutils.fix
deleted file mode 100644
index a799619c4eb4..000000000000
--- a/pkgs/coreutils/coreutils.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "coreutils-5.0")
-
-  , ("build", Relative("coreutils/coreutils-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/coreutils/coreutils-5.0.tar.bz2")
-      , ("md5", "94e5558ee2a65723d4840bfde2d323f0")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
-  ]
-)
diff --git a/pkgs/db4/db4-build.sh b/pkgs/db4/db4-build.sh
deleted file mode 100755
index f32e4ec50dd3..000000000000
--- a/pkgs/db4/db4-build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd db-*/build_unix || exit 1
-../dist/configure --prefix=$out --enable-cxx --enable-compat185 || exit 1
-make || exit 1
-make install || exit 1
-rm -rf $out/doc || exit 1
diff --git a/pkgs/db4/db4.fix b/pkgs/db4/db4.fix
deleted file mode 100644
index 561fcc267e59..000000000000
--- a/pkgs/db4/db4.fix
+++ /dev/null
@@ -1,12 +0,0 @@
-Package(
-  [ ("name", "db4-4.0.14")
-  , ("build", Relative("db4/db4-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz")
-      , ("md5", "12262c64fcd64b772e7cffad8e4d0ebc")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)
diff --git a/pkgs/diffutils/diffutils-build.sh b/pkgs/diffutils/diffutils-build.sh
deleted file mode 100755
index 408b75eb8037..000000000000
--- a/pkgs/diffutils/diffutils-build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd diffutils-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/diffutils/diffutils.fix b/pkgs/diffutils/diffutils.fix
deleted file mode 100644
index 04615b4a703d..000000000000
--- a/pkgs/diffutils/diffutils.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "diffutils-2.8.1")
-
-  , ("build", Relative("diffutils/diffutils-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/diffutils/diffutils-2.8.1.tar.gz")
-      , ("md5", "71f9c5ae19b60608f6c7f162da86a428")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
-  ]
-)
diff --git a/pkgs/docbook-xml/docbook-xml-build.sh b/pkgs/docbook-xml/docbook-xml-build.sh
deleted file mode 100755
index 75ff4d772d00..000000000000
--- a/pkgs/docbook-xml/docbook-xml-build.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-mkdir -p $out/xml/dtd/docbook || exit 1
-cd $out/xml/dtd/docbook || exit 1
-$unzip/bin/unzip $src || exit 1
diff --git a/pkgs/docbook-xml/docbook-xml.fix b/pkgs/docbook-xml/docbook-xml.fix
deleted file mode 100644
index 686d4538f2bd..000000000000
--- a/pkgs/docbook-xml/docbook-xml.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "docbook-xml-4.2")
-  , ("build", Relative("docbook-xml/docbook-xml-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www.oasis-open.org/docbook/xml/4.2/docbook-xml-4.2.zip")
-      , ("md5", "73fe50dfe74ca631c1602f558ed8961f")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("unzip", IncludeFix("unzip/unzip.fix"))
-  ]
-)
diff --git a/pkgs/docbook-xsl/docbook-xsl-build.sh b/pkgs/docbook-xsl/docbook-xsl-build.sh
deleted file mode 100755
index f28afe09465a..000000000000
--- a/pkgs/docbook-xsl/docbook-xsl-build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-mkdir $out || exit 1
-cd $out || exit 1
-tar xvfz $src || exit 1
-mkdir xml || exit 1
-mkdir xml/xsl || exit 1
-mv docbook-xsl-* xml/xsl/docbook || exit 1
diff --git a/pkgs/docbook-xsl/docbook-xsl.fix b/pkgs/docbook-xsl/docbook-xsl.fix
deleted file mode 100644
index ce3998439071..000000000000
--- a/pkgs/docbook-xsl/docbook-xsl.fix
+++ /dev/null
@@ -1,12 +0,0 @@
-Package(
-  [ ("name", "docbook-xsl-1.62.4")
-  , ("build", Relative("docbook-xsl/docbook-xsl-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://belnet.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-1.62.4.tar.gz")
-      , ("md5", "4f33db39db7fa95b50143ad609d734a0")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)
diff --git a/pkgs/ed/ed-build.sh b/pkgs/ed/ed-build.sh
deleted file mode 100755
index ba63de01c950..000000000000
--- a/pkgs/ed/ed-build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd ed-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/ed/ed.fix b/pkgs/ed/ed.fix
deleted file mode 100644
index 04d9f72c0c57..000000000000
--- a/pkgs/ed/ed.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "ed-0.2")
-
-  , ("build", Relative("ed/ed-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.gnu.org/pub/gnu/ed/ed-0.2.tar.gz")
-      , ("md5", "ddd57463774cae9b50e70cd51221281b")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)
diff --git a/pkgs/expat/expat-build.sh b/pkgs/expat/expat-build.sh
deleted file mode 100755
index c5ca8edfb92f..000000000000
--- a/pkgs/expat/expat-build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd expat-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1
diff --git a/pkgs/expat/expat.fix b/pkgs/expat/expat.fix
deleted file mode 100644
index ad30a9906e1c..000000000000
--- a/pkgs/expat/expat.fix
+++ /dev/null
@@ -1,12 +0,0 @@
-Package(
-  [ ("name", "expat-1.95.6")
-  , ("build", Relative("expat/expat-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://belnet.dl.sourceforge.net/sourceforge/expat/expat-1.95.6.tar.gz")
-      , ("md5", "ca78d94e83e9f077b5da2bfe28ba986a")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)
diff --git a/pkgs/fetchsvn/fetchsvn-native.fix b/pkgs/fetchsvn/fetchsvn-native.fix
deleted file mode 100644
index 3265d661b708..000000000000
--- a/pkgs/fetchsvn/fetchsvn-native.fix
+++ /dev/null
@@ -1,10 +0,0 @@
-Function(["name","url","dir","rev"],
-  Package(
-    [ ("name", Var("name"))
-    , ("build", Relative("fetchsvn/fetchsvn.sh"))
-    , ("url",   Var("url"))
-    , ("dir",   Var("dir"))
-    , ("rev",   Var("rev"))
-    ]
-  )
-)
\ No newline at end of file
diff --git a/pkgs/fetchsvn/fetchsvn.fix b/pkgs/fetchsvn/fetchsvn.fix
deleted file mode 100644
index 24e07dba1651..000000000000
--- a/pkgs/fetchsvn/fetchsvn.fix
+++ /dev/null
@@ -1,17 +0,0 @@
-Function(["name","url","dir","rev"],
-  Package(
-    [ ("name", Var("name"))
-    , ("build", Relative("fetchsvn/fetchsvn.sh"))
-    , ("url",   Var("url"))
-    , ("dir",   Var("dir"))
-    , ("rev",   Var("rev"))
-
-    , ("svn", Call(IncludeFix("subversion/subversion.fix"), 
-        [ ("localServer", True)
-        , ("httpsClient", True)
-        , ("httpServer", True)
-        , ("pythonBindings", True)
-        ]))
-    ]
-  )
-)
\ No newline at end of file
diff --git a/pkgs/fetchsvn/fetchsvn.sh b/pkgs/fetchsvn/fetchsvn.sh
deleted file mode 100755
index 07dd310edfae..000000000000
--- a/pkgs/fetchsvn/fetchsvn.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh
-
-set -e
-
-echo "exporting svn repository $url/$dir (at rev $rev) into $out..."
-
-svn export -r $rev $url/$dir $dir
-
-# touch bootstrapped sources because subversion doesn't sets the mtime of files
-# to checkout time, not to the last mtime in the repository.
-MTIME=`date +%Y%m%d%H%M.%S`
-echo "** INFO -- Modification time: $MTIME"
-find $dir -print | xargs touch -t $MTIME
-# end of touch
-
-mkdir $out
-tar zcf $out/$dir.tar.gz $dir
diff --git a/pkgs/findutils/findutils-build.sh b/pkgs/findutils/findutils-build.sh
deleted file mode 100755
index f61ec740c1b8..000000000000
--- a/pkgs/findutils/findutils-build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd findutils-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/findutils/findutils.fix b/pkgs/findutils/findutils.fix
deleted file mode 100644
index 9d85a019000b..000000000000
--- a/pkgs/findutils/findutils.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "findutils-4.1.20")
-
-  , ("build", Relative("findutils/findutils-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://alpha.gnu.org/pub/gnu/findutils/findutils-4.1.20.tar.gz")
-      , ("md5", "e90ce7222daadeb8616b8db461e17cbc")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
-  ]
-)
diff --git a/pkgs/firebird/firebird-build.sh b/pkgs/firebird/firebird-build.sh
deleted file mode 100755
index 40b34acd0b87..000000000000
--- a/pkgs/firebird/firebird-build.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-
-envpkgs="$gtk $libIDL"
-. $stdenv/setup || exit 1
-export PATH=$pkgconfig/bin:$perl/bin:$zip/bin:$unzip/bin:$PATH
-
-tar xvfz $src || exit 1
-cd mozilla || exit 1
-
-cat > .mozconfig <<EOF
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
-ac_add_options --enable-crypto
-ac_add_options --disable-tests
-ac_add_options --disable-debug
-ac_add_options --disable-mailnews
-ac_add_options --disable-composer
-ac_add_options --enable-optimize=-O2
-ac_add_options --disable-ldap
-ac_add_options --disable-mailnews
-ac_add_options --enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help
-ac_add_options --enable-xft
-ac_add_options --enable-swg
-ac_add_options --enable-strip
-ac_add_options --enable-default-toolkit=gtk2
-EOF
-echo "ac_add_options --prefix=$out" >> .mozconfig
-
-./configure || exit 1
-make -f client.mk build || exit 1
-make install || exit 1
diff --git a/pkgs/firebird/firebird.fix b/pkgs/firebird/firebird.fix
deleted file mode 100644
index fe1da909b96c..000000000000
--- a/pkgs/firebird/firebird.fix
+++ /dev/null
@@ -1,18 +0,0 @@
-Package(
-  [ ("name", "firebird-0.7")
-
-  , ("build", Relative("firebird/firebird-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.mozilla.org/pub/mozilla.org/firebird/releases/0.7/MozillaFirebird-source-0.7.tar.gz")
-      , ("md5", "35112566a3dca5bdf363972056afc462")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
-  , ("gtk", IncludeFix("gtk+/gtk+.fix"))
-  , ("perl", IncludeFix("perl/perl.fix"))
-  , ("zip", IncludeFix("zip/zip.fix"))
-  , ("libIDL", IncludeFix("libIDL/libIDL.fix"))
-  ]
-)
diff --git a/pkgs/flex/flex-build.sh b/pkgs/flex/flex-build.sh
deleted file mode 100755
index 79b441d8bb55..000000000000
--- a/pkgs/flex/flex-build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-export PATH=$yacc/bin:$PATH
-
-tar xvfz $src || exit 1
-cd flex-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/flex/flex.fix b/pkgs/flex/flex.fix
deleted file mode 100644
index 7676df6cf469..000000000000
--- a/pkgs/flex/flex.fix
+++ /dev/null
@@ -1,15 +0,0 @@
-Package(
-  [ ("name", "flex-2.5.4a")
-
-  , ("build", Relative("flex/flex-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/flex/flex-2.5.4a.tar.gz")
-      , ("md5", "bd8753d0b22e1f4ec87a553a73021adf")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("yacc", IncludeFix("bison/bison.fix"))
-  ]
-)
-
diff --git a/pkgs/fontconfig/fontconfig-build.sh b/pkgs/fontconfig/fontconfig-build.sh
deleted file mode 100755
index 92b0be5b61bd..000000000000
--- a/pkgs/fontconfig/fontconfig-build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh
-
-envpkgs="$freetype $expat $x11"
-. $stdenv/setup || exit 1
-export PATH=$ed/bin:$PATH
-
-# Fontconfig generates a bad `fonts.conf' file is the timezone is not known
-# (because it calls `date').
-export TZ=UTC
-
-tar xvfz $src || exit 1
-cd fontconfig-* || exit 1
-./configure --prefix=$out --with-confdir=$out/etc/fonts \
- --x-includes=$x11/include --x-libraries=$x11/lib \
- --with-expat-includes=$expat/include --with-expat-lib=$expat/lib || exit 1
-make || exit 1
-make install || exit 1
-
-echo $envpkgs > $out/envpkgs || exit 1
diff --git a/pkgs/fontconfig/fontconfig.fix b/pkgs/fontconfig/fontconfig.fix
deleted file mode 100644
index 3893265e89f4..000000000000
--- a/pkgs/fontconfig/fontconfig.fix
+++ /dev/null
@@ -1,17 +0,0 @@
-Package(
-  [ ("name", "fontconfig-2.2.90")
-
-  , ("build", Relative("fontconfig/fontconfig-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://pdx.freedesktop.org/software/fontconfig/releases/fontconfig-2.2.90.tar.gz")
-      , ("md5", "5cb87476743be1bbf1674ed72a76ae6a")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("x11", IncludeFix("xfree86/xfree86.fix"))
-  , ("freetype", IncludeFix("freetype/freetype.fix"))
-  , ("expat", IncludeFix("expat/expat.fix"))
-  , ("ed", IncludeFix("ed/ed.fix"))
-  ]
-)
diff --git a/pkgs/freetype/freetype-build.sh b/pkgs/freetype/freetype-build.sh
deleted file mode 100755
index 81bd27e48820..000000000000
--- a/pkgs/freetype/freetype-build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd freetype-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1
diff --git a/pkgs/freetype/freetype.fix b/pkgs/freetype/freetype.fix
deleted file mode 100644
index a785fb692951..000000000000
--- a/pkgs/freetype/freetype.fix
+++ /dev/null
@@ -1,12 +0,0 @@
-Package(
-  [ ("name", "freetype-2.1.4")
-  , ("build", Relative("freetype/freetype-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://easynews.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.4.tar.bz2")
-      , ("md5", "1fc0b188f1fe1216776e5855d2da141f")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)
diff --git a/pkgs/gawk/gawk-build.sh b/pkgs/gawk/gawk-build.sh
deleted file mode 100755
index f1a951f1fd5c..000000000000
--- a/pkgs/gawk/gawk-build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd gawk-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/gawk/gawk.fix b/pkgs/gawk/gawk.fix
deleted file mode 100644
index 9ae54e50c772..000000000000
--- a/pkgs/gawk/gawk.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "gawk-3.1.3")
-
-  , ("build", Relative("gawk/gawk-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/gawk/gawk-3.1.3.tar.bz2")
-      , ("md5", "a116eec17e7ba085febb74c7758823bd")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
-  ]
-)
diff --git a/pkgs/gcc-2.95/gcc-build.sh b/pkgs/gcc-2.95/gcc-build.sh
deleted file mode 100755
index 59b4430b7ef4..000000000000
--- a/pkgs/gcc-2.95/gcc-build.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-export PATH=$binutils/bin:$PATH
-
-tar xvfz $src || exit 1
-
-# Disable the standard include directories.
-cd gcc-* || exit 1
-cat >> ./gcc/cppdefault.h <<EOF
-#undef LOCAL_INCLUDE_DIR
-#undef SYSTEM_INCLUDE_DIR
-#undef STANDARD_INCLUDE_DIR
-EOF
-cd .. || exit 1
-
-# Configure.
-mkdir build || exit 1
-cd build || exit 1
-../gcc-*/configure --prefix=$out --enable-languages=c || exit 1
-
-# Patch some of the makefiles to force linking against our own glibc.
-extraflags="-Wl,-s $NIX_CFLAGS_COMPILE $NIX_CFLAGS_LINK"
-for i in $NIX_LDFLAGS; do
-    extraflags="$extraflags -Wl,$i"
-done
-
-mf=Makefile
-sed \
- -e "s^FLAGS_FOR_TARGET =\(.*\)^FLAGS_FOR_TARGET = \1 $extraflags^" \
- < $mf > $mf.tmp || exit 1
-mv $mf.tmp $mf
-
-mf=gcc/Makefile
-sed \
- -e "s^X_CFLAGS =\(.*\)^X_CFLAGS = \1 $extraflags^" \
- < $mf > $mf.tmp || exit 1
-mv $mf.tmp $mf
-
-# Patch gcc/Makefile to prevent fixinc.sh from "fixing" system header files
-# from /usr/include.
-mf=gcc/Makefile
-sed \
- -e "s^NATIVE_SYSTEM_HEADER_DIR =\(.*\)^NATIVE_SYSTEM_HEADER_DIR = /fixinc-disabled^" \
- < $mf > $mf.tmp || exit 1
-mv $mf.tmp $mf
-
-# Build and install.
-make bootstrap || exit 1
-make install || exit 1
diff --git a/pkgs/gcc-2.95/gcc.fix b/pkgs/gcc-2.95/gcc.fix
deleted file mode 100644
index 39785441759a..000000000000
--- a/pkgs/gcc-2.95/gcc.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "gcc-2.95.3")
-
-  , ("build", Relative("gcc-2.95/gcc-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-2.95.3/gcc-2.95.3.tar.gz")
-      , ("md5", "f3ad4f32c2296fad758ed051b5ac8e28")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)
diff --git a/pkgs/gcc/gcc-build.sh b/pkgs/gcc/gcc-build.sh
deleted file mode 100755
index f32f3cc3241e..000000000000
--- a/pkgs/gcc/gcc-build.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-export PATH=$binutils/bin:$PATH
-
-tar xvfj $src || exit 1
-
-# Disable the standard include directories.
-cd gcc-* || exit 1
-cat >> ./gcc/cppdefault.h <<EOF
-#undef LOCAL_INCLUDE_DIR
-#undef SYSTEM_INCLUDE_DIR
-#undef STANDARD_INCLUDE_DIR
-EOF
-cd .. || exit 1
-
-# Configure.
-mkdir build || exit 1
-cd build || exit 1
-../gcc-*/configure --prefix=$out --enable-languages=c,c++ || exit 1
-
-# Patch some of the makefiles to force linking against our own glibc.
-extraflags="-Wl,-s -isystem $linux/include $NIX_CFLAGS_COMPILE $NIX_CFLAGS_LINK"
-for i in $NIX_LDFLAGS; do
-    extraflags="$extraflags -Wl,$i"
-done
-
-mf=Makefile
-sed \
- -e "s^FLAGS_FOR_TARGET =\(.*\)^FLAGS_FOR_TARGET = \1 $extraflags^" \
- < $mf > $mf.tmp || exit 1
-mv $mf.tmp $mf
-
-mf=gcc/Makefile
-sed \
- -e "s^X_CFLAGS =\(.*\)^X_CFLAGS = \1 $extraflags^" \
- < $mf > $mf.tmp || exit 1
-mv $mf.tmp $mf
-
-# Patch gcc/Makefile to prevent fixinc.sh from "fixing" system header files
-# from /usr/include.
-mf=gcc/Makefile
-sed \
- -e "s^NATIVE_SYSTEM_HEADER_DIR =\(.*\)^NATIVE_SYSTEM_HEADER_DIR = /fixinc-disabled^" \
- < $mf > $mf.tmp || exit 1
-mv $mf.tmp $mf
-
-# Build and install.
-make bootstrap || exit 1
-make install || exit 1
-
-find $out -name "*.a" -exec strip -S {} \; || exit 1
diff --git a/pkgs/gcc/gcc.fix b/pkgs/gcc/gcc.fix
deleted file mode 100644
index 1dc57e2211dc..000000000000
--- a/pkgs/gcc/gcc.fix
+++ /dev/null
@@ -1,15 +0,0 @@
-Package(
-  [ ("name", "gcc-3.3.1")
-
-  , ("build", Relative("gcc/gcc-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-3.3.1/gcc-3.3.1.tar.bz2")
-      , ("md5", "1135a104e9fa36fdf7c663598fab5c40")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
-  , ("binutils", IncludeFix("binutils/binutils.fix"))
-  , ("linux", IncludeFix("linux-headers/linux-headers.fix"))
-  ]
-)
diff --git a/pkgs/getopt/getopt-build.sh b/pkgs/getopt/getopt-build.sh
deleted file mode 100755
index 30ac6e3d453d..000000000000
--- a/pkgs/getopt/getopt-build.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd getopt-* || exit 1
-make || exit 1
-make install prefix=$out || exit 1
diff --git a/pkgs/getopt/getopt.fix b/pkgs/getopt/getopt.fix
deleted file mode 100644
index 0ba80e51db5c..000000000000
--- a/pkgs/getopt/getopt.fix
+++ /dev/null
@@ -1,14 +0,0 @@
-Package(
-  [ ("name", "getopt-1.1.3")
-
-  , ("build", Relative("getopt/getopt-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://huizen.dds.nl/~frodol/getopt-1.1.3.tar.gz")
-      , ("md5", "7b7637dcb0ac531f1af29f4d6b018e86")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)
-
diff --git a/pkgs/gettext/gettext-build.sh b/pkgs/gettext/gettext-build.sh
deleted file mode 100755
index 57f18bb3da15..000000000000
--- a/pkgs/gettext/gettext-build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd gettext-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/gettext/gettext.fix b/pkgs/gettext/gettext.fix
deleted file mode 100644
index 825aa7f383d7..000000000000
--- a/pkgs/gettext/gettext.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "gettext-0.12.1")
-
-  , ("build", Relative("gettext/gettext-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/gettext/gettext-0.12.1.tar.gz")
-      , ("md5", "5d4bddd300072315e668247e5b7d5bdb")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)
diff --git a/pkgs/glib-1/glib-build.sh b/pkgs/glib-1/glib-build.sh
deleted file mode 100755
index e6f721de3f4b..000000000000
--- a/pkgs/glib-1/glib-build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd glib-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/glib-1/glib.fix b/pkgs/glib-1/glib.fix
deleted file mode 100644
index 9117321a88d0..000000000000
--- a/pkgs/glib-1/glib.fix
+++ /dev/null
@@ -1,12 +0,0 @@
-Package(
-  [ ("name", "glib-1.2.10")
-  , ("build", Relative("glib-1/glib-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz")
-      , ("md5", "6fe30dad87c77b91b632def29dd69ef9")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)
diff --git a/pkgs/glib/glib-build.sh b/pkgs/glib/glib-build.sh
deleted file mode 100755
index 54e70b73434f..000000000000
--- a/pkgs/glib/glib-build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-export PATH=$pkgconfig/bin:$gettext/bin:$perl/bin:$PATH
-
-tar xvfj $src || exit 1
-cd glib-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/glib/glib.fix b/pkgs/glib/glib.fix
deleted file mode 100644
index beca151b147d..000000000000
--- a/pkgs/glib/glib.fix
+++ /dev/null
@@ -1,16 +0,0 @@
-Package(
-  [ ("name", "glib-2.2.3")
-
-  , ("build", Relative("glib/glib-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-2.2.3.tar.bz2")
-      , ("md5", "aa214a10d873b68ddd67cd9de2ccae55")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
-  , ("gettext", IncludeFix("gettext/gettext.fix"))
-  , ("perl", IncludeFix("perl/perl.fix"))
-  ]
-)
diff --git a/pkgs/glibc/glibc-build.sh b/pkgs/glibc/glibc-build.sh
deleted file mode 100755
index 138585ddf949..000000000000
--- a/pkgs/glibc/glibc-build.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-tar xvfj $glibcSrc || exit 1
-(cd glibc-* && tar xvfj $linuxthreadsSrc) || exit 1
-
-mkdir build || exit 1
-cd build || exit 1
-LDFLAGS=-Wl,-S ../glibc-*/configure --prefix=$out --enable-add-ons --disable-profile || exit 1
-
-make || exit 1
-make install || exit 1
-make localedata/install-locales || exit 1
-strip -S $out/lib/*.a $out/lib/*.so $out/lib/gconv/*.so
-strip -s $out/bin/* $out/sbin/* $out/libexec/*
-
-ln -sf /etc/ld.so.cache $out/etc/ld.so.cache || exit 1
-
-exit 0
diff --git a/pkgs/glibc/glibc.fix b/pkgs/glibc/glibc.fix
deleted file mode 100644
index 7d26b9d3442a..000000000000
--- a/pkgs/glibc/glibc.fix
+++ /dev/null
@@ -1,16 +0,0 @@
-Package(
-  [ ("name", "glibc-2.3.2")
-
-  , ("build", Relative("glibc/glibc-build.sh"))
-
-  , ("glibcSrc", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nl.net/pub/gnu/glibc/glibc-2.3.2.tar.bz2")
-      , ("md5", "ede969aad568f48083e413384f20753c")
-      ]))
-
-  , ("linuxthreadsSrc", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nl.net/pub/gnu/glibc/glibc-linuxthreads-2.3.2.tar.bz2")
-      , ("md5", "894b8969cfbdf787c73e139782167607")
-      ]))
-  ]
-)
diff --git a/pkgs/gnet/gnet-build.sh b/pkgs/gnet/gnet-build.sh
deleted file mode 100755
index 2a0102969a2a..000000000000
--- a/pkgs/gnet/gnet-build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-
-envpkgs="$glib"
-. $stdenv/setup || exit 1
-export PATH=$pkgconfig/bin:$PATH
-
-tar xvfz $src || exit 1
-cd gnet-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-
-echo $envpkgs > $out/envpkgs || exit 1
diff --git a/pkgs/gnet/gnet.fix b/pkgs/gnet/gnet.fix
deleted file mode 100644
index 10a0b1f671e6..000000000000
--- a/pkgs/gnet/gnet.fix
+++ /dev/null
@@ -1,15 +0,0 @@
-Package(
-  [ ("name", "gnet-2.0.4")
-
-  , ("build", Relative("gnet/gnet-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www.gnetlibrary.org/src/gnet-2.0.4.tar.gz")
-      , ("md5", "b43e728391143214e2cfd0b835b6fd2a")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
-  , ("glib", IncludeFix("glib/glib.fix"))
-  ]
-)
diff --git a/pkgs/gnugrep/gnugrep-build.sh b/pkgs/gnugrep/gnugrep-build.sh
deleted file mode 100755
index 9f2607b7d016..000000000000
--- a/pkgs/gnugrep/gnugrep-build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-envpkgs="$pcre"
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd grep-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/gnugrep/gnugrep.fix b/pkgs/gnugrep/gnugrep.fix
deleted file mode 100644
index 2b7de64e0590..000000000000
--- a/pkgs/gnugrep/gnugrep.fix
+++ /dev/null
@@ -1,14 +0,0 @@
-Package(
-  [ ("name", "gnugrep-2.5.1")
-
-  , ("build", Relative("gnugrep/gnugrep-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/grep/grep-2.5.1.tar.bz2")
-      , ("md5", "ddd99e2d5d4f4611357e31e97f080cf2")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
-  , ("pcre", IncludeFix("pcre/pcre.fix"))
-  ]
-)
diff --git a/pkgs/gnum4/gnum4-build.sh b/pkgs/gnum4/gnum4-build.sh
deleted file mode 100755
index 03f201582bb7..000000000000
--- a/pkgs/gnum4/gnum4-build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd m4-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/gnum4/gnum4.fix b/pkgs/gnum4/gnum4.fix
deleted file mode 100644
index 7c11e834df70..000000000000
--- a/pkgs/gnum4/gnum4.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "gnum4-1.4")
-
-  , ("build", Relative("gnum4/gnum4-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/m4/m4-1.4.tar.gz")
-      , ("md5", "9eb2dd07740b2d2f3c7adb3e8d299bda")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)
diff --git a/pkgs/gnumake/gnumake-build.sh b/pkgs/gnumake/gnumake-build.sh
deleted file mode 100755
index 362de7cd9a88..000000000000
--- a/pkgs/gnumake/gnumake-build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd make-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/gnumake/gnumake.fix b/pkgs/gnumake/gnumake.fix
deleted file mode 100644
index aced91b42732..000000000000
--- a/pkgs/gnumake/gnumake.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "gnumake-3.80")
-
-  , ("build", Relative("gnumake/gnumake-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/make/make-3.80.tar.bz2")
-      , ("md5", "0bbd1df101bc0294d440471e50feca71")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
-  ]
-)
diff --git a/pkgs/gnupatch/gnupatch-build.sh b/pkgs/gnupatch/gnupatch-build.sh
deleted file mode 100755
index 0b7210beff44..000000000000
--- a/pkgs/gnupatch/gnupatch-build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd patch-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/gnupatch/gnupatch.fix b/pkgs/gnupatch/gnupatch.fix
deleted file mode 100644
index c2a207d614e8..000000000000
--- a/pkgs/gnupatch/gnupatch.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "gnupatch-2.5.4")
-
-  , ("build", Relative("gnupatch/gnupatch-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/patch/patch-2.5.4.tar.gz")
-      , ("md5", "ee5ae84d115f051d87fcaaef3b4ae782")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)
diff --git a/pkgs/gnused/gnused-build.sh b/pkgs/gnused/gnused-build.sh
deleted file mode 100755
index 126635327925..000000000000
--- a/pkgs/gnused/gnused-build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd sed-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/gnused/gnused.fix b/pkgs/gnused/gnused.fix
deleted file mode 100644
index 1ad3b03635ad..000000000000
--- a/pkgs/gnused/gnused.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "gnused-4.0.7")
-
-  , ("build", Relative("gnused/gnused-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/sed/sed-4.0.7.tar.gz")
-      , ("md5", "005738e7f97bd77d95b6907156c8202a")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
-  ]
-)
diff --git a/pkgs/gnutar/gnutar-build.sh b/pkgs/gnutar/gnutar-build.sh
deleted file mode 100755
index f79d158b86a5..000000000000
--- a/pkgs/gnutar/gnutar-build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd tar-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/gnutar/gnutar.fix b/pkgs/gnutar/gnutar.fix
deleted file mode 100644
index d5c2cc340bf2..000000000000
--- a/pkgs/gnutar/gnutar.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "gnutar-1.13.25")
-
-  , ("build", Relative("gnutar/gnutar-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://alpha.gnu.org/gnu/tar/tar-1.13.25.tar.gz")
-      , ("md5", "6ef8c906e81eee441f8335652670ac4a")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
-  ]
-)
diff --git a/pkgs/gpp/gpp-build.sh b/pkgs/gpp/gpp-build.sh
deleted file mode 100755
index 78cedd70c329..000000000000
--- a/pkgs/gpp/gpp-build.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/sh
-set -e
-$pkgbuild --with-aterm=$aterm --with-sdf=$sdf2 --with-srts=$srts --with-xtc=$xtc \
-    --with-stratego-front=$stratego_front
diff --git a/pkgs/gpp/gpp.fix b/pkgs/gpp/gpp.fix
deleted file mode 100644
index e019fde7f0cb..000000000000
--- a/pkgs/gpp/gpp.fix
+++ /dev/null
@@ -1,21 +0,0 @@
-Function(["rev"],
-  Package(
-    [ ("name", "gpp")
-
-    , ("build", Relative("gpp/gpp-build.sh"))
-    , ("pkgbuild", Relative("strategoxt/pkg-build.sh"))
-
-    , ("src", App(IncludeFix("strategoxt/fetchsvn.fix"),
-                  [ ("name", "gpp"), ("rev",  Var("rev"))]))
-
-    , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-    , ("aterm",  IncludeFix("aterm/aterm.fix"))
-    , ("sdf2",   IncludeFix("sdf2/sdf2.fix"))
-    , ("autoxt", App(IncludeFix("autoxt/autoxt.fix"),[("rev",Var("rev"))]))
-    , ("srts",   App(IncludeFix("srts/srts.fix"),[("rev",Var("rev"))]))
-    , ("xtc",    App(IncludeFix("xtc/xtc.fix"),[("rev",Var("rev"))]))
-    , ("stratego_front",    
-	App(IncludeFix("stratego-front/stratego-front.fix"),[("rev",Var("rev"))]))
-    ]
-  )
-)
diff --git a/pkgs/gqview/gqview-build.sh b/pkgs/gqview/gqview-build.sh
deleted file mode 100755
index 337b379e0311..000000000000
--- a/pkgs/gqview/gqview-build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-
-envpkgs="$gtk $libpng $zlib"
-. $stdenv/setup || exit 1
-export PATH=$pkgconfig/bin:$PATH
-
-NIX_CFLAGS_COMPILE="-I$libpng/include -I$zlib/include $NIX_CFLAGS_COMPILE"
-
-tar xvfz $src || exit 1
-cd gqview-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/gqview/gqview.fix b/pkgs/gqview/gqview.fix
deleted file mode 100644
index 742d6de50e57..000000000000
--- a/pkgs/gqview/gqview.fix
+++ /dev/null
@@ -1,17 +0,0 @@
-Package(
-  [ ("name", "gqview-1.3.2")
-
-  , ("build", Relative("gqview/gqview-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://heanet.dl.sourceforge.net/sourceforge/gqview/gqview-1.3.2.tar.gz")
-      , ("md5", "0f2ce36475b2cdc8013545f5e3268034")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
-  , ("gtk", IncludeFix("gtk+/gtk+.fix"))
-  , ("libpng", IncludeFix("libpng/libpng.fix"))
-  , ("zlib", IncludeFix("zlib/zlib.fix"))
-  ]
-)
diff --git a/pkgs/graphviz/graphviz-build.sh b/pkgs/graphviz/graphviz-build.sh
deleted file mode 100755
index 74d026f3ee63..000000000000
--- a/pkgs/graphviz/graphviz-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-envpkgs="$zlib $libpng $libjpeg $expat $freetype"
-. $stdenv/setup || exit 1
-
-NIX_CFLAGS_COMPILE="-I$zlib/include -I$libpng/include -I$libjpeg/include -I$expat/include $NIX_CFLAGS_COMPILE"
-
-tar xvfz $src || exit 1
-cd graphviz-* || exit 1
-./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/graphviz/graphviz.fix b/pkgs/graphviz/graphviz.fix
deleted file mode 100644
index b7a78891ba91..000000000000
--- a/pkgs/graphviz/graphviz.fix
+++ /dev/null
@@ -1,19 +0,0 @@
-Package(
-  [ ("name", "graphviz-1.10")
-
-  , ("build", Relative("graphviz/graphviz-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.10.tar.gz")
-      , ("md5", "e1402531abff68d146bf94e72b44dc2a")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("x11", IncludeFix("xfree86/xfree86.fix"))
-  , ("zlib", IncludeFix("zlib/zlib.fix"))
-  , ("libpng", IncludeFix("libpng/libpng.fix"))
-  , ("libjpeg", IncludeFix("libjpeg/libjpeg.fix"))
-  , ("expat", IncludeFix("expat/expat.fix"))
-  , ("freetype", IncludeFix("freetype/freetype.fix"))
-  ]
-)
diff --git a/pkgs/gtk+-1/gtk+-build.sh b/pkgs/gtk+-1/gtk+-build.sh
deleted file mode 100755
index 05f73cb77ef8..000000000000
--- a/pkgs/gtk+-1/gtk+-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-envpkgs="$glib $x11"
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd gtk+-* || exit 1
-./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1
-make || exit 1
-make install || exit 1
-
-echo $envpkgs > $out/envpkgs || exit 1
diff --git a/pkgs/gtk+-1/gtk+.fix b/pkgs/gtk+-1/gtk+.fix
deleted file mode 100644
index f4a24dfb928b..000000000000
--- a/pkgs/gtk+-1/gtk+.fix
+++ /dev/null
@@ -1,15 +0,0 @@
-Package(
-  [ ("name", "gtk+-1.2.10")
-
-  , ("build", Relative("gtk+-1/gtk+-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz")
-      , ("md5", "4d5cb2fc7fb7830e4af9747a36bfce20")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("x11", IncludeFix("xfree86/xfree86.fix"))
-  , ("glib", IncludeFix("glib-1/glib.fix"))
-  ]
-)
diff --git a/pkgs/gtk+/gtk+-build.sh b/pkgs/gtk+/gtk+-build.sh
deleted file mode 100755
index 52c3bd07ed94..000000000000
--- a/pkgs/gtk+/gtk+-build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh
-
-envpkgs="$glib $atk $pango $tiff $jpeg $png $x11"
-. $stdenv/setup || exit 1
-export PATH=$pkgconfig/bin:$perl/bin:$PATH
-
-# !!! abstraction problem: libtiff optionally needs libjpeg's headers.
-# idem for libpng depending on zlib
-export NIX_CFLAGS_COMPILE="-I$tiff/include -I$jpeg/include -I$png/include -I$zlib/include $NIX_CFLAGS_COMPILE"
-
-tar xvfj $src || exit 1
-cd gtk+-* || exit 1
-./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib \
- --with-libtiff=$tiff || exit 1
-make || exit 1
-make install || exit 1
-
-echo $envpkgs > $out/envpkgs || exit 1
diff --git a/pkgs/gtk+/gtk+.fix b/pkgs/gtk+/gtk+.fix
deleted file mode 100644
index 2303c516e9e8..000000000000
--- a/pkgs/gtk+/gtk+.fix
+++ /dev/null
@@ -1,23 +0,0 @@
-Package(
-  [ ("name", "gtk+-2.2.4")
-
-  , ("build", Relative("gtk+/gtk+-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.4.tar.bz2")
-      , ("md5", "605332199533e73bc6eec481fb4f1671")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
-  , ("x11", IncludeFix("xfree86/xfree86.fix"))
-  , ("glib", IncludeFix("glib/glib.fix"))
-  , ("atk", IncludeFix("atk/atk.fix"))
-  , ("pango", IncludeFix("pango/pango.fix"))
-  , ("perl", IncludeFix("perl/perl.fix"))
-  , ("tiff", IncludeFix("libtiff/libtiff.fix"))
-  , ("jpeg", IncludeFix("libjpeg/libjpeg.fix"))
-  , ("png", IncludeFix("libpng/libpng.fix"))
-  , ("zlib", IncludeFix("zlib/zlib.fix"))
-  ]
-)
diff --git a/pkgs/gtkspell/gtkspell-build.sh b/pkgs/gtkspell/gtkspell-build.sh
deleted file mode 100755
index 514d51c9b025..000000000000
--- a/pkgs/gtkspell/gtkspell-build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-envpkgs="$gtk $pspell"
-. $stdenv/setup || exit 1
-export PATH=$pkgconfig/bin:$PATH
-export NIX_CFLAGS_COMPILE="-I$pspell/include $NIX_CFLAGS_COMPILE"
-
-tar xvfz $src || exit 1
-cd gtkspell-* || exit 1
-./configure --prefix=$out --disable-gtk-doc || exit 1
-make || exit 1
-make install || exit 1
-
-echo $envpkgs > $out/envpkgs || exit 1
diff --git a/pkgs/gtkspell/gtkspell.fix b/pkgs/gtkspell/gtkspell.fix
deleted file mode 100644
index a8bbde45366a..000000000000
--- a/pkgs/gtkspell/gtkspell.fix
+++ /dev/null
@@ -1,16 +0,0 @@
-Package(
-  [ ("name", "gtkspell-2.0.4")
-
-  , ("build", Relative("gtkspell/gtkspell-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://gtkspell.sourceforge.net/download/gtkspell-2.0.4.tar.gz")
-      , ("md5", "4ded985b8eefdf9ac6fbf79cad69ccbd")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
-  , ("gtk", IncludeFix("gtk+/gtk+.fix"))
-  , ("pspell", IncludeFix("pspell/pspell.fix"))
-  ]
-)
diff --git a/pkgs/gzip/gzip-build.sh b/pkgs/gzip/gzip-build.sh
deleted file mode 100755
index 0254e252958a..000000000000
--- a/pkgs/gzip/gzip-build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd gzip-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/gzip/gzip.fix b/pkgs/gzip/gzip.fix
deleted file mode 100644
index 81d905157d5f..000000000000
--- a/pkgs/gzip/gzip.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "gzip-1.3.3")
-
-  , ("build", Relative("gzip/gzip-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www.gzip.org/gzip-1.3.3.tar.gz")
-      , ("md5", "52eaf713673507d21f7abefee98ba662")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
-  ]
-)
diff --git a/pkgs/httpd/httpd-build.sh b/pkgs/httpd/httpd-build.sh
deleted file mode 100755
index 6e06570a97c4..000000000000
--- a/pkgs/httpd/httpd-build.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/sh
-
-envpkgs="$ssl $db4 $expat"
-. $stdenv/setup || exit 1
-export PATH=$perl/bin:$PATH
-
-tar xvfz $src || exit 1
-cd httpd-* || exit 1
-./configure --prefix=$out --enable-ssl --with-ssl=$ssl --with-berkeley-db=$db4 \
- --with-expat=$expat --enable-mods-shared=all --without-gdbm \
- --enable-threads --with-devrandom=/dev/urandom || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1
-rm -rf $out/manual || exit 1
diff --git a/pkgs/httpd/httpd.fix b/pkgs/httpd/httpd.fix
deleted file mode 100644
index 52e78e1ec159..000000000000
--- a/pkgs/httpd/httpd.fix
+++ /dev/null
@@ -1,17 +0,0 @@
-Package(
-  [ ("name", "httpd-2.0.47")
-
-  , ("build", Relative("httpd/httpd-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://apache.cs.uu.nl/dist/httpd/httpd-2.0.47.tar.gz")
-      , ("md5", "63f16638c18b140b649fab32b54d7f9c")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("ssl", IncludeFix("openssl/openssl.fix"))
-  , ("db4", IncludeFix("db4/db4.fix"))
-  , ("expat", IncludeFix("expat/expat.fix"))
-  , ("perl", IncludeFix("perl/perl.fix"))
-  ]
-)
diff --git a/pkgs/j2re/j2re-sun-linux-build.sh b/pkgs/j2re/j2re-sun-linux-build.sh
deleted file mode 100755
index 8fc4545332b3..000000000000
--- a/pkgs/j2re/j2re-sun-linux-build.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-
-mkdir -p $out    || exit 1
-cd $out          || exit 1
-tail +473 $binzip > j2re.exe || exit 1
-chmod u+x j2re.exe || exit 1
-./j2re.exe      || exit 1
-rm j2re.exe     || exit 1
-mv j2re1.4.2/* . || exit 1
-rmdir j2re1.4.2  || exit 1
-
-PACKED_JARS="lib/rt lib/jsse lib/charsets lib/ext/localedata lib/plugin javaws/javaws"
-
-for i in $PACKED_JARS; do
-  lib/unpack $i.pack $i.jar || exit 1
-done
\ No newline at end of file
diff --git a/pkgs/j2re/j2re-sun-linux.fix b/pkgs/j2re/j2re-sun-linux.fix
deleted file mode 100644
index 83249cca8140..000000000000
--- a/pkgs/j2re/j2re-sun-linux.fix
+++ /dev/null
@@ -1,12 +0,0 @@
-Package(
-  [ ("name", "j2re-sun-linux-1.4.2")
-  , ("build", Relative("j2re/j2re-sun-linux-build.sh"))
-
-  , ("binzip", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://java.sun.com/webapps/download/AutoDL?BundleId=8573")
-      , ("md5", "2f0ab3bdc03ea51a2da6d0b33e4360f4")
-      ]))
-
-  , ("glibc", IncludeFix("glibc/glibc.fix"))
-  ]
-)
\ No newline at end of file
diff --git a/pkgs/libIDL/libIDL-build.sh b/pkgs/libIDL/libIDL-build.sh
deleted file mode 100755
index 4b4c9285dc6d..000000000000
--- a/pkgs/libIDL/libIDL-build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-envpkgs="$glib"
-. $stdenv/setup || exit 1
-export PATH=$pkgconfig/bin:$lex/bin:$yacc/bin:$PATH
-
-tar xvfj $src || exit 1
-cd libIDL-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1
-
-echo $envpkgs > $out/envpkgs || exit 1
diff --git a/pkgs/libIDL/libIDL.fix b/pkgs/libIDL/libIDL.fix
deleted file mode 100644
index 3edfbedc981b..000000000000
--- a/pkgs/libIDL/libIDL.fix
+++ /dev/null
@@ -1,17 +0,0 @@
-Package(
-  [ ("name", "libIDL-0.8.2")
-
-  , ("build", Relative("libIDL/libIDL-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-0.8.2.tar.bz2")
-      , ("md5", "a75d2dbf3a3c66b567047c94245f8b82")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
-  , ("glib", IncludeFix("glib/glib.fix"))
-  , ("lex", IncludeFix("flex/flex.fix"))
-  , ("yacc", IncludeFix("bison/bison.fix"))
-  ]
-)
diff --git a/pkgs/libjpeg/libjpeg-build.sh b/pkgs/libjpeg/libjpeg-build.sh
deleted file mode 100755
index 9a27a8545c45..000000000000
--- a/pkgs/libjpeg/libjpeg-build.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd jpeg-* || exit 1
-./configure --prefix=$out --enable-shared || exit 1
-make || exit 1
-mkdir $out || exit 1
-mkdir $out/bin || exit 1
-mkdir $out/lib || exit 1
-mkdir $out/include || exit 1
-mkdir $out/man || exit 1
-mkdir $out/man/man1 || exit 1
-make install || exit 1
diff --git a/pkgs/libjpeg/libjpeg.fix b/pkgs/libjpeg/libjpeg.fix
deleted file mode 100644
index 28d7698ef049..000000000000
--- a/pkgs/libjpeg/libjpeg.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "libjpeg-6b")
-
-  , ("build", Relative("libjpeg/libjpeg-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www.ijg.org/files/jpegsrc.v6b.tar.gz")
-      , ("md5", "dbd5f3b47ed13132f04c685d608a7547")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)
diff --git a/pkgs/libpng/libpng-build.sh b/pkgs/libpng/libpng-build.sh
deleted file mode 100755
index dec5856ab84c..000000000000
--- a/pkgs/libpng/libpng-build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh
-
-envpkgs="$zlib"
-. $stdenv/setup || exit 1
-
-export NIX_CFLAGS_COMPILE="-I$zlib/include $NIX_CFLAGS_COMPILE"
-
-tar xvfj $src || exit 1
-cd libpng-* || exit 1
-make -f scripts/makefile.linux || exit 1
-mkdir $out || exit 1
-mkdir $out/bin || exit 1
-mkdir $out/lib || exit 1
-mkdir $out/include || exit 1
-make -f scripts/makefile.linux install prefix=$out || exit 1
-strip -S $out/lib/*.a || exit 1
-
-echo $envpkgs > $out/envpkgs || exit 1
diff --git a/pkgs/libpng/libpng.fix b/pkgs/libpng/libpng.fix
deleted file mode 100644
index bc1232f261d4..000000000000
--- a/pkgs/libpng/libpng.fix
+++ /dev/null
@@ -1,14 +0,0 @@
-Package(
-  [ ("name", "libpng-1.2.5")
-
-  , ("build", Relative("libpng/libpng-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://heanet.dl.sourceforge.net/sourceforge/png-mng/libpng-1.2.5.tar.bz2")
-      , ("md5", "3fc28af730f12ace49b14568de4ad934")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("zlib", IncludeFix("zlib/zlib.fix"))
-  ]
-)
diff --git a/pkgs/libtiff/libtiff-build.sh b/pkgs/libtiff/libtiff-build.sh
deleted file mode 100755
index 6f7b3b168dca..000000000000
--- a/pkgs/libtiff/libtiff-build.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-
-envpkgs="$zlib $jpeg"
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd tiff-* || exit 1
-./configure --prefix=$out --with-DIR_MAN=$out/man \
- --with-ZIP --with-JPEG \
- --with-DIRS_LIBINC="$zlib/include $jpeg/include" || exit 1
-make || exit 1
-mkdir $out || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1
-
-echo $envpkgs > $out/envpkgs || exit 1
diff --git a/pkgs/libtiff/libtiff.fix b/pkgs/libtiff/libtiff.fix
deleted file mode 100644
index 6e2fcd62e493..000000000000
--- a/pkgs/libtiff/libtiff.fix
+++ /dev/null
@@ -1,15 +0,0 @@
-Package(
-  [ ("name", "libtiff-3.5.7")
-
-  , ("build", Relative("libtiff/libtiff-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.remotesensing.org/pub/libtiff/tiff-v3.5.7.tar.gz")
-      , ("md5", "82243b5ae9b7c9e492aeebc501680990")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("zlib", IncludeFix("zlib/zlib.fix"))
-  , ("jpeg", IncludeFix("libjpeg/libjpeg.fix"))
-  ]
-)
diff --git a/pkgs/libxml2/libxml2-build.sh b/pkgs/libxml2/libxml2-build.sh
deleted file mode 100755
index 2d6d3b36d08c..000000000000
--- a/pkgs/libxml2/libxml2-build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-
-envpkgs="$zlib"
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd libxml2-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1
-
-echo $envpkgs > $out/envpkgs || exit 1
diff --git a/pkgs/libxml2/libxml2.fix b/pkgs/libxml2/libxml2.fix
deleted file mode 100644
index 458008a2f1e7..000000000000
--- a/pkgs/libxml2/libxml2.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "libxml2-2.5.9")
-  , ("build", Relative("libxml2/libxml2-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://rpmfind.net/pub/libxml/libxml2-2.5.9.tar.gz")
-      , ("md5", "e69c69e1f051567d298224b886a90583")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("zlib", IncludeFix("zlib/zlib.fix"))
-  ]
-)
diff --git a/pkgs/libxslt/libxslt-build.sh b/pkgs/libxslt/libxslt-build.sh
deleted file mode 100755
index 1dee15e2579d..000000000000
--- a/pkgs/libxslt/libxslt-build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-
-envpkgs="$libxml"
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd libxslt-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1
-
-echo $envpkgs > $out/envpkgs || exit 1
diff --git a/pkgs/libxslt/libxslt.fix b/pkgs/libxslt/libxslt.fix
deleted file mode 100644
index 8d767fd0a7c8..000000000000
--- a/pkgs/libxslt/libxslt.fix
+++ /dev/null
@@ -1,14 +0,0 @@
-Package(
-  [ ("name", "libxslt-1.0.31")
-
-  , ("build", Relative("libxslt/libxslt-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://xmlsoft.org/libxslt-1.0.31.tar.gz")
-      , ("md5", "7dbc66a3db621d3f2a6fac4a91ff9af9")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("libxml", IncludeFix("libxml2/libxml2.fix"))
-  ]
-)
diff --git a/pkgs/linux-headers/linux-headers-build.sh b/pkgs/linux-headers/linux-headers-build.sh
deleted file mode 100755
index 3afc94f02463..000000000000
--- a/pkgs/linux-headers/linux-headers-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd linux-* || exit 1
-make include/linux/version.h || exit 1
-mkdir $out || exit 1
-mkdir $out/include || exit 1
-cp -prvd include/linux include/asm-i386 $out/include || exit 1
-cd $out/include || exit 1
-ln -s asm-i386 asm || exit 1
diff --git a/pkgs/linux-headers/linux-headers.fix b/pkgs/linux-headers/linux-headers.fix
deleted file mode 100644
index baf7c1de6585..000000000000
--- a/pkgs/linux-headers/linux-headers.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "linux-headers-2.4.22-i386")
-
-  , ("build", Relative("linux-headers/linux-headers-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.4/linux-2.4.22.tar.bz2")
-      , ("md5", "75dc85149b06ac9432106b8941eb9f7b")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
-  ]
-)
diff --git a/pkgs/nix-dist/nix-dist-build.sh b/pkgs/nix-dist/nix-dist-build.sh
deleted file mode 100755
index e7d0b88a625b..000000000000
--- a/pkgs/nix-dist/nix-dist-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-cp --preserve=all -rv $src nix
-cd nix || exit 1
-cp -p $bdbSrc externals/db-4.0.14.tar.gz || exit 1
-cp -p $atermSrc externals/aterm-2.0.tar.gz || exit 1
-autoreconf -i || exit 1
-./configure || exit 1 
-make dist || exit 1
-cp nix-0.2pre1.tar.gz $out || exit 1
diff --git a/pkgs/nix-dist/nix-dist.fix b/pkgs/nix-dist/nix-dist.fix
deleted file mode 100644
index 6d722d29aad6..000000000000
--- a/pkgs/nix-dist/nix-dist.fix
+++ /dev/null
@@ -1,23 +0,0 @@
-Package(
-  [ ("name", "nix-dist")
-  , ("build", Relative("nix-dist/nix-dist-build.sh"))
-
-  , ("src", App(IncludeFix("fetchsvn/fetchsvn.fix"),
-      [ ("name", "nix")
-      , ("url", "http://losser.st-lab.cs.uu.nl:12080/repos/trace/nix/trunk")
-      , ("rev", "300")
-      ]))
-
-  , ("bdbSrc", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz")
-      , ("md5", "12262c64fcd64b772e7cffad8e4d0ebc")
-      ]))
-
-  , ("atermSrc", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.tar.gz")
-      , ("md5", "853474e4bcf4a85f7d38a0676b36bded")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)
diff --git a/pkgs/openssl/openssl-build.sh b/pkgs/openssl/openssl-build.sh
deleted file mode 100755
index c1493365ae6c..000000000000
--- a/pkgs/openssl/openssl-build.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-export PATH=$perl/bin:$PATH
-
-tar xvfz $src || exit 1
-cd openssl-* || exit 1
-./config --prefix=$out shared || exit 1
-make || exit 1
-mkdir $out || exit 1
-make install || exit 1
-
-# Bug fix: openssl does a `chmod 644' on the pkgconfig directory.
-chmod 755 $out/lib/pkgconfig || exit 1
-
-echo $envpkgs > $out/envpkgs || exit 1
diff --git a/pkgs/openssl/openssl.fix b/pkgs/openssl/openssl.fix
deleted file mode 100644
index b553034d5a0b..000000000000
--- a/pkgs/openssl/openssl.fix
+++ /dev/null
@@ -1,14 +0,0 @@
-Package(
-  [ ("name", "openssl-0.9.7c")
-
-  , ("build", Relative("openssl/openssl-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www.openssl.org/source/openssl-0.9.7c.tar.gz")
-      , ("md5", "c54fb36218adaaaba01ef733cd88c8ec")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("perl", IncludeFix("perl/perl.fix"))
-  ]
-)
diff --git a/pkgs/pan/pan-build.sh b/pkgs/pan/pan-build.sh
deleted file mode 100755
index 2da902dc3c22..000000000000
--- a/pkgs/pan/pan-build.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-envpkgs="$gtk $gnet $libxml"
-. $stdenv/setup || exit 1
-export PATH=$pkgconfig/bin:$perl/bin:$PATH
-
-tar xvfj $src || exit 1
-cd pan-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/pan/pan.fix b/pkgs/pan/pan.fix
deleted file mode 100644
index 70c9ff0ea53e..000000000000
--- a/pkgs/pan/pan.fix
+++ /dev/null
@@ -1,19 +0,0 @@
-Package(
-  [ ("name", "pan-0.14.2")
-
-  , ("build", Relative("pan/pan-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://pan.rebelbase.com/download/releases/0.14.2/SOURCE/pan-0.14.2.tar.bz2")
-      , ("md5", "ed3188e7059bb6d6c209ee5d46ac1852")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
-  , ("gtk", IncludeFix("gtk+/gtk+.fix"))
-  , ("gtkspell", IncludeFix("gtkspell/gtkspell.fix"))
-  , ("gnet", IncludeFix("gnet/gnet.fix"))
-  , ("libxml", IncludeFix("libxml2/libxml2.fix"))
-  , ("perl", IncludeFix("perl/perl.fix"))
-  ]
-)
diff --git a/pkgs/pango/pango-build.sh b/pkgs/pango/pango-build.sh
deleted file mode 100755
index 978a74e6099f..000000000000
--- a/pkgs/pango/pango-build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-
-envpkgs="$glib $Xft $x11"
-. $stdenv/setup || exit 1
-export PATH=$pkgconfig/bin:$PATH
-
-tar xvfj $src || exit 1
-cd pango-* || exit 1
-./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1
-make || exit 1
-make install || exit 1
-
-echo $envpkgs > $out/envpkgs || exit 1
diff --git a/pkgs/pango/pango.fix b/pkgs/pango/pango.fix
deleted file mode 100644
index d1300632534a..000000000000
--- a/pkgs/pango/pango.fix
+++ /dev/null
@@ -1,17 +0,0 @@
-Package(
-  [ ("name", "pango-1.2.5")
-
-  , ("build", Relative("pango/pango-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.gtk.org/pub/gtk/v2.2/pango-1.2.5.tar.bz2")
-      , ("md5", "df00fe3e71cd297010f24f439b6c8ee6")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
-  , ("x11", IncludeFix("xfree86/xfree86.fix"))
-  , ("glib", IncludeFix("glib/glib.fix"))
-  , ("Xft", IncludeFix("Xft/Xft.fix"))
-  ]
-)
diff --git a/pkgs/pcre/pcre-build.sh b/pkgs/pcre/pcre-build.sh
deleted file mode 100755
index dea883667fcc..000000000000
--- a/pkgs/pcre/pcre-build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd pcre-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/pcre/pcre.fix b/pkgs/pcre/pcre.fix
deleted file mode 100644
index 833151351d07..000000000000
--- a/pkgs/pcre/pcre.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "pcre-4.3")
-
-  , ("build", Relative("pcre/pcre-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-4.3.tar.bz2")
-      , ("md5", "7bc7d5b590a41e6f9ede30f272002a02")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
-  ]
-)
diff --git a/pkgs/perl-BerkeleyDB/perl-BerkeleyDB-build.sh b/pkgs/perl-BerkeleyDB/perl-BerkeleyDB-build.sh
deleted file mode 100755
index d1fe3321b3cb..000000000000
--- a/pkgs/perl-BerkeleyDB/perl-BerkeleyDB-build.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh
-
-envpkgs="$db4"
-. $stdenv/setup || exit 1
-export PATH=$perl/bin:$PATH
-
-tar xvfz $src || exit 1
-cd BerkeleyDB-* || exit 1
-
-echo "LIB = $db4/lib" > config.in
-echo "INCLUDE = $db4/include" >> config.in
-
-perl Makefile.PL || exit 1
-make || exit 1
-make install PREFIX=$out || exit 1
-
-echo $envpkgs > $out/envpkgs || exit 1
diff --git a/pkgs/perl-BerkeleyDB/perl-BerkeleyDB.fix b/pkgs/perl-BerkeleyDB/perl-BerkeleyDB.fix
deleted file mode 100644
index 075100c6873a..000000000000
--- a/pkgs/perl-BerkeleyDB/perl-BerkeleyDB.fix
+++ /dev/null
@@ -1,14 +0,0 @@
-Package(
-  [ ("name", "perl-BerkeleyDB-0.23")
-  , ("build", Relative("perl-BerkeleyDB/perl-BerkeleyDB-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://archive.cs.uu.nl/mirror/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-0.23.tar.gz")
-      , ("md5", "d97b85ea5b61bde7de4a998c91ef29c7")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("perl", IncludeFix("perl/perl.fix"))
-  , ("db4", IncludeFix("db4/db4.fix"))
-  ]
-)
diff --git a/pkgs/perl/perl-build.sh b/pkgs/perl/perl-build.sh
deleted file mode 100755
index 7a925e6dbfd8..000000000000
--- a/pkgs/perl/perl-build.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd perl-* || exit 1
-
-# Perl's Configure messes with PATH.  We can't have that, so we patch it.
-# Yeah, this is an ugly hack.
-cat Configure | \
- grep -v '^paths=' | \
- grep -v '^locincpth=' | \
- grep -v '^xlibpth=' | \
- grep -v '^glibpth=' | \
- grep -v '^loclibpth=' | \
- grep -v '^locincpth=' | \
- cat > Configure.tmp || exit 1
-mv Configure.tmp Configure || exit 1
-chmod +x Configure || exit 1
-
-./Configure -de -Dcc=gcc -Dprefix=$out -Uinstallusrbinperl \
- -Dlocincpth="$NIX_LIBC_INCLUDES" \
- -Dloclibpth="$NIX_LIBC_LIBS" \
- || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/perl/perl.fix b/pkgs/perl/perl.fix
deleted file mode 100644
index e92312f46cde..000000000000
--- a/pkgs/perl/perl.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "perl-5.8.0")
-
-  , ("build", Relative("perl/perl-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.cs.uu.nl/mirror/CPAN/src/5.0/perl-5.8.0.tar.gz")
-      , ("md5", "d9bdb180620306023fd35901a2878b62")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)
diff --git a/pkgs/pkgconfig/pkgconfig-build.sh b/pkgs/pkgconfig/pkgconfig-build.sh
deleted file mode 100755
index 5ec940cb03a8..000000000000
--- a/pkgs/pkgconfig/pkgconfig-build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd pkgconfig-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-mkdir $out || exit 1
-make install || exit 1
diff --git a/pkgs/pkgconfig/pkgconfig.fix b/pkgs/pkgconfig/pkgconfig.fix
deleted file mode 100644
index f9dfdd984a8f..000000000000
--- a/pkgs/pkgconfig/pkgconfig.fix
+++ /dev/null
@@ -1,12 +0,0 @@
-Package(
-  [ ("name", "pkgconfig-0.15.0")
-  , ("build", Relative("pkgconfig/pkgconfig-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.15.0.tar.gz")
-      , ("md5", "a7e4f60a6657dbc434334deb594cc242")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)
diff --git a/pkgs/pspell/pspell-build.sh b/pkgs/pspell/pspell-build.sh
deleted file mode 100755
index eb1a7e9484ed..000000000000
--- a/pkgs/pspell/pspell-build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd pspell-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1
diff --git a/pkgs/pspell/pspell.fix b/pkgs/pspell/pspell.fix
deleted file mode 100644
index ac435f679076..000000000000
--- a/pkgs/pspell/pspell.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "pspell-.12.2")
-
-  , ("build", Relative("pspell/pspell-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://belnet.dl.sourceforge.net/sourceforge/pspell/pspell-.12.2.tar.gz")
-      , ("md5", "cfd3816b2372932a1b71c0ce4e9f881e")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)
diff --git a/pkgs/sc/sc-build.sh b/pkgs/sc/sc-build.sh
deleted file mode 100755
index 3887279b74c8..000000000000
--- a/pkgs/sc/sc-build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-set -e
-$pkgbuild --with-aterm=$aterm --with-sdf=$sdf2 --with-srts=$srts --with-xtc=$xtc
diff --git a/pkgs/sc/sc.fix b/pkgs/sc/sc.fix
deleted file mode 100644
index b12bbbb11436..000000000000
--- a/pkgs/sc/sc.fix
+++ /dev/null
@@ -1,19 +0,0 @@
-Function(["rev"],
-  Package(
-    [ ("name", "sc")
-
-    , ("build", Relative("sc/sc-build.sh"))
-    , ("pkgbuild", Relative("strategoxt/pkg-build.sh"))
-
-    , ("src", App(IncludeFix("strategoxt/fetchsvn.fix"),
-                  [ ("name", "sc"), ("rev",  Var("rev"))]))
-
-    , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-    , ("aterm",  IncludeFix("aterm/aterm.fix"))
-    , ("sdf2",   IncludeFix("sdf2/sdf2.fix"))
-    , ("autoxt", App(IncludeFix("autoxt/autoxt.fix"),[("rev",Var("rev"))]))
-    , ("srts",   App(IncludeFix("srts/srts.fix"),[("rev",Var("rev"))]))
-    , ("xtc",    App(IncludeFix("xtc/xtc.fix"),[("rev",Var("rev"))]))
-    ]
-  )
-)
diff --git a/pkgs/sdf2/sdf2-build.sh b/pkgs/sdf2/sdf2-build.sh
deleted file mode 100755
index 07dc26a3bda8..000000000000
--- a/pkgs/sdf2/sdf2-build.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd sdf2-* || exit 1
-./configure --prefix=$out --with-aterm=$aterm || exit 1
-make || exit 1
-make install || exit 1
-
-# Replace the call to getopt in sdf2table with an absolute path (so that the
-# users of sdf2table don't have to explicitly declare getopt as an input).
-sdf2table=$out/bin/sdf2table
-sed s^getopt^$getopt/bin/getopt^ < $sdf2table > $sdf2table.tmp || exit 1
-mv $sdf2table.tmp $sdf2table || exit 1
-chmod +x $sdf2table || exit 1
diff --git a/pkgs/sdf2/sdf2.fix b/pkgs/sdf2/sdf2.fix
deleted file mode 100644
index 1a0f00f70426..000000000000
--- a/pkgs/sdf2/sdf2.fix
+++ /dev/null
@@ -1,15 +0,0 @@
-Package(
-  [ ("name", "sdf2-1.6")
-
-  , ("build", Relative("sdf2/sdf2-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://losser.st-lab.cs.uu.nl/~eelco/mirror/sdf2-bundle-1.6.tar.gz")
-      , ("md5", "283be0b4c7c9575c1b5cc735316e6192")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("aterm", IncludeFix("aterm/aterm.fix"))
-  , ("getopt", IncludeFix("getopt/getopt.fix"))
-  ]
-)
diff --git a/pkgs/srts/srts-build.sh b/pkgs/srts/srts-build.sh
deleted file mode 100755
index 03ad3ee35c1d..000000000000
--- a/pkgs/srts/srts-build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-set -e
-$pkgbuild --with-aterm=$aterm
diff --git a/pkgs/srts/srts.fix b/pkgs/srts/srts.fix
deleted file mode 100644
index dc121c28b47a..000000000000
--- a/pkgs/srts/srts.fix
+++ /dev/null
@@ -1,17 +0,0 @@
-Function(["rev"],
-  Package(
-    [ ("name", "srts")
-
-    , ("build", Relative("srts/srts-build.sh"))
-    , ("pkgbuild", Relative("strategoxt/pkg-build.sh"))
-
-    , ("src", App(IncludeFix("strategoxt/fetchsvn.fix"),
-                  [ ("name", "srts"), ("rev",  Var("rev"))]))
-
-    , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-    , ("aterm",  IncludeFix("aterm/aterm.fix"))
-    , ("autoxt", App(IncludeFix("autoxt/autoxt.fix"),[("rev",Var("rev"))]))
-    ]
-  )
-) 
-
diff --git a/pkgs/stdenv-linux/setup-nativetools.sh b/pkgs/stdenv-linux/setup-nativetools.sh
deleted file mode 100644
index f675389306d3..000000000000
--- a/pkgs/stdenv-linux/setup-nativetools.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-export PATH=/usr/local/bin:/usr/bin:/bin
-export SHELL=/bin/sh
-
-. @BASEENV@/setup
-
-export NIX_CFLAGS_COMPILE="-isystem @GLIBC@/include $NIX_CFLAGS_COMPILE"
-export NIX_CFLAGS_LINK="-L@GLIBC@/lib $NIX_CFLAGS_LINK"
-export NIX_LDFLAGS="-dynamic-linker @GLIBC@/lib/ld-linux.so.2 -rpath @GLIBC@/lib $NIX_LDFLAGS"
-export NIX_CC=/usr/bin/gcc
-export NIX_CXX=/usr/bin/g++
-export NIX_LD=/usr/bin/ld
diff --git a/pkgs/stdenv-linux/setup.sh b/pkgs/stdenv-linux/setup.sh
deleted file mode 100644
index 5c7fce62feca..000000000000
--- a/pkgs/stdenv-linux/setup.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-export PATH=@PATH@
-export SHELL=@SHELL@
-
-. @BASEENV@/setup
-
-export NIX_CFLAGS_COMPILE="-isystem @GLIBC@/include -isystem @LINUX@/include $NIX_CFLAGS_COMPILE"
-export NIX_CFLAGS_LINK="-L@GLIBC@/lib -L@GCC@/lib $NIX_CFLAGS_LINK"
-export NIX_LDFLAGS="-dynamic-linker @GLIBC@/lib/ld-linux.so.2 -rpath @GLIBC@/lib -rpath @GCC@/lib $NIX_LDFLAGS"
-export NIX_CC=@CC@
-export NIX_CXX=@CXX@
-export NIX_LD=@LD@
-
-export NIX_LIBC_INCLUDES="@GLIBC@/include"
-export NIX_LIBC_LIBS="@GLIBC@/lib"
diff --git a/pkgs/stdenv-linux/stdenv-build.sh b/pkgs/stdenv-linux/stdenv-build.sh
deleted file mode 100755
index 437707f74126..000000000000
--- a/pkgs/stdenv-linux/stdenv-build.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-mkdir $out || exit 1
-
-p=
-first=1
-for i in $tools $gcc $binutils $shell; do
-    if test "$first" == 1; then
-	first=
-    else
-	p=$p:
-    fi
-    p=$p$i/bin
-done
-
-cc=$gcc/bin/gcc
-cxx=$gcc/bin/g++
-ld=$binutils/bin/ld
-shell=$shell/bin/sh
-
-echo "########## $p"
-
-sed \
- -e s^@GLIBC\@^$glibc^g \
- -e s^@LINUX\@^$linux^g \
- -e s^@GCC\@^$gcc^g \
- -e s^@CC\@^$cc^g \
- -e s^@CXX\@^$cxx^g \
- -e s^@LD\@^$ld^g \
- -e s^@BASEENV\@^$baseenv^g \
- -e s^@PATH\@^$p^g \
- -e s^@SHELL\@^$shell^g \
- < $setup > $out/setup || exit 1
diff --git a/pkgs/stdenv-linux/stdenv-nativetools-build.sh b/pkgs/stdenv-linux/stdenv-nativetools-build.sh
deleted file mode 100755
index 16ac884f7e1e..000000000000
--- a/pkgs/stdenv-linux/stdenv-nativetools-build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-export PATH=/usr/local/bin:/usr/bin:/bin
-
-mkdir $out || exit 1
-
-sed \
- -e s^@GLIBC\@^$glibc^g \
- -e s^@BASEENV\@^$baseenv^g \
- < $setup > $out/setup || exit 1
diff --git a/pkgs/stdenv-linux/stdenv-nativetools.fix b/pkgs/stdenv-linux/stdenv-nativetools.fix
deleted file mode 100644
index 28a7f8095398..000000000000
--- a/pkgs/stdenv-linux/stdenv-nativetools.fix
+++ /dev/null
@@ -1,9 +0,0 @@
-Package(
-  [ ("name", "stdenv-nativetools")
-  , ("build", Relative("stdenv-linux/stdenv-nativetools-build.sh"))
-
-  , ("setup", Relative("stdenv-linux/setup-nativetools.sh"))
-  , ("baseenv", IncludeFix("baseenv/baseenv.fix"))
-  , ("glibc", IncludeFix("glibc/glibc.fix"))
-  ]
-)
diff --git a/pkgs/stdenv-linux/stdenv.fix b/pkgs/stdenv-linux/stdenv.fix
deleted file mode 100644
index 75457300baf6..000000000000
--- a/pkgs/stdenv-linux/stdenv.fix
+++ /dev/null
@@ -1,28 +0,0 @@
-Package(
-  [ ("name", "stdenv-linux")
-  , ("build", Relative("stdenv-linux/stdenv-build.sh"))
-
-  , ("setup", Relative("stdenv-linux/setup.sh"))
-  , ("baseenv", IncludeFix("baseenv/baseenv.fix"))
-  , ("glibc", IncludeFix("glibc/glibc.fix"))
-  , ("linux", IncludeFix("linux-headers/linux-headers.fix"))
-
-  , ("tools", 
-      [ IncludeFix("coreutils/coreutils.fix")
-      , IncludeFix("findutils/findutils.fix")
-      , IncludeFix("gnused/gnused.fix")
-      , IncludeFix("gnugrep/gnugrep.fix")
-      , IncludeFix("gawk/gawk.fix")
-      , IncludeFix("gnutar/gnutar.fix")
-      , IncludeFix("diffutils/diffutils.fix")
-      , IncludeFix("gzip/gzip.fix")
-      , IncludeFix("bzip2/bzip2.fix")
-      , IncludeFix("gnumake/gnumake.fix")
-      , IncludeFix("bash/bash.fix")
-      ])
-
-  , ("gcc", IncludeFix("gcc/gcc.fix"))
-  , ("binutils", IncludeFix("binutils/binutils.fix"))
-  , ("shell", IncludeFix("bash/bash.fix"))
-  ]
-)
diff --git a/pkgs/stdenv-native/setup.sh b/pkgs/stdenv-native/setup.sh
deleted file mode 100644
index 570e9ef81c2c..000000000000
--- a/pkgs/stdenv-native/setup.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-export PATH=/usr/local/bin:/usr/bin:/bin
-export SHELL=/bin/sh
-
-. @BASEENV@/setup
-
-export NIX_CC=/usr/bin/gcc
-export NIX_CXX=/usr/bin/g++
-export NIX_LD=/usr/bin/ld
diff --git a/pkgs/stdenv-native/stdenv-build.sh b/pkgs/stdenv-native/stdenv-build.sh
deleted file mode 100755
index dcac7c7264e4..000000000000
--- a/pkgs/stdenv-native/stdenv-build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-export PATH=/usr/local/bin:/usr/bin:/bin
-
-mkdir $out || exit 1
-
-sed \
- -e s^@BASEENV\@^$baseenv^g \
- < $setup > $out/setup || exit 1
diff --git a/pkgs/stdenv-native/stdenv.fix b/pkgs/stdenv-native/stdenv.fix
deleted file mode 100644
index f3e86d5c61c3..000000000000
--- a/pkgs/stdenv-native/stdenv.fix
+++ /dev/null
@@ -1,8 +0,0 @@
-Package(
-  [ ("name", "stdenv-native")
-  , ("build", Relative("stdenv-native/stdenv-build.sh"))
-
-  , ("setup", Relative("stdenv-native/setup.sh"))
-  , ("baseenv", IncludeFix("baseenv/baseenv.fix"))
-  ]
-)
diff --git a/pkgs/stdenv/stdenv.fix b/pkgs/stdenv/stdenv.fix
deleted file mode 100644
index 7e91efd56131..000000000000
--- a/pkgs/stdenv/stdenv.fix
+++ /dev/null
@@ -1,4 +0,0 @@
-If ( HasSubstr(Platform(), "linux")
-   , IncludeFix("stdenv-linux/stdenv.fix")
-   , IncludeFix("stdenv-native/stdenv.fix")
-   )
diff --git a/pkgs/stratego-front/stratego-front-build.sh b/pkgs/stratego-front/stratego-front-build.sh
deleted file mode 100755
index 286d2c51da79..000000000000
--- a/pkgs/stratego-front/stratego-front-build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-set -e
-$pkgbuild --with-aterm=$aterm --with-sdf=$sdf2 --with-srts=$srts --with-xtc=$xtc
-
-$xtc/bin/xtc -r $(REPOSITORY) import
\ No newline at end of file
diff --git a/pkgs/stratego-front/stratego-front.fix b/pkgs/stratego-front/stratego-front.fix
deleted file mode 100644
index d5538024c6d0..000000000000
--- a/pkgs/stratego-front/stratego-front.fix
+++ /dev/null
@@ -1,19 +0,0 @@
-Function(["rev"],
-  Package(
-    [ ("name", "stratego-front")
-
-    , ("build", Relative("stratego-front/stratego-front-build.sh"))
-    , ("pkgbuild", Relative("strategoxt/pkg-build.sh"))
-
-    , ("src", App(IncludeFix("strategoxt/fetchsvn.fix"),
-                  [ ("name", "stratego-front"), ("rev",  Var("rev"))]))
-
-    , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-    , ("aterm",  IncludeFix("aterm/aterm.fix"))
-    , ("sdf2",   IncludeFix("sdf2/sdf2.fix"))
-    , ("autoxt", App(IncludeFix("autoxt/autoxt.fix"),[("rev",Var("rev"))]))
-    , ("srts",   App(IncludeFix("srts/srts.fix"),[("rev",Var("rev"))]))
-    , ("xtc",    App(IncludeFix("xtc/xtc.fix"),[("rev",Var("rev"))]))
-    ]
-  )
-)
diff --git a/pkgs/strategoxt-0.9.2/strategoxt-build.sh b/pkgs/strategoxt-0.9.2/strategoxt-build.sh
deleted file mode 100755
index bf5387949028..000000000000
--- a/pkgs/strategoxt-0.9.2/strategoxt-build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd strategoxt-* || exit 1
-./configure --prefix=$out --with-aterm=$aterm --with-sdf=$sdf2 || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/strategoxt-0.9.2/strategoxt.fix b/pkgs/strategoxt-0.9.2/strategoxt.fix
deleted file mode 100644
index 3caac18c42b7..000000000000
--- a/pkgs/strategoxt-0.9.2/strategoxt.fix
+++ /dev/null
@@ -1,15 +0,0 @@
-Package(
-  [ ("name", "strategoxt-0.9.2")
-
-  , ("build", Relative("strategoxt-0.9.2/strategoxt-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://losser.st-lab.cs.uu.nl/~eelco/mirror/strategoxt-0.9.2-3067.tar.gz")
-      , ("md5", "0d849a9409c40cdc66cbdee4d00726b2")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("aterm", IncludeFix("aterm/aterm.fix"))
-  , ("sdf2", IncludeFix("sdf2/sdf2.fix"))
-  ]
-)
diff --git a/pkgs/strategoxt/fetchsvn.fix b/pkgs/strategoxt/fetchsvn.fix
deleted file mode 100644
index 5bcbad45dc34..000000000000
--- a/pkgs/strategoxt/fetchsvn.fix
+++ /dev/null
@@ -1,8 +0,0 @@
-Function(["name", "rev"],
-  App(IncludeFix("fetchsvn/fetchsvn.fix"),
-      [ ("name", Var("name"))
-      , ("url",  "http://losser.labs.cs.uu.nl:12080/repos/StrategoXT/trunk/StrategoXT")
-      , ("dir",  Var("name"))
-      , ("rev",  Var("rev"))
-      ])
-)
\ No newline at end of file
diff --git a/pkgs/strategoxt/pkg-build.sh b/pkgs/strategoxt/pkg-build.sh
deleted file mode 100755
index 988553d2364f..000000000000
--- a/pkgs/strategoxt/pkg-build.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-
-set -e
-
-export NIX_LDFLAGS=-Wl,-s
-
-. $stdenv/setup
-
-export PATH=$autoxt/bin:$PATH
-
-ls -l
-pwd
-
-gtar zxf $src/$name.tar.gz
-
-cd $name
-./bootstrap
-./configure --prefix=$out $*
-make
-make install
-
diff --git a/pkgs/strategoxt/pkg.fix b/pkgs/strategoxt/pkg.fix
deleted file mode 100644
index d401a33b8888..000000000000
--- a/pkgs/strategoxt/pkg.fix
+++ /dev/null
@@ -1,16 +0,0 @@
-Function(["name","rev"],
-  Package(
-    [ ("name", Var("name"))
-
-    , ("build", Relative("pkg/pkg-build.sh"))
-
-    , ("src", App(IncludeFix("strategoxt/fetchsvn-native.fix"),
-                  [ ("name", Var("name")), ("rev",  Var("rev"))]))
-
-    , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-    , ("aterm",  IncludeFix("aterm/aterm.fix"))
-    , ("autoxt", App(IncludeFix("autoxt/autoxt.fix"),[("rev",Var("rev"))]))
-    , ("srts",   App(IncludeFix("srts/srts.fix"),[("rev",Var("rev"))]))
-    ]
-  )
-)
\ No newline at end of file
diff --git a/pkgs/strategoxt/sdf-import-build.sh b/pkgs/strategoxt/sdf-import-build.sh
deleted file mode 100755
index 5f8a29dda208..000000000000
--- a/pkgs/strategoxt/sdf-import-build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh -v
-set -e
-$pkgbuild --with-aterm=$aterm --with-xtc=$xtc --with-sdf=$sdf2
\ No newline at end of file
diff --git a/pkgs/strategoxt/sdf-import.fix b/pkgs/strategoxt/sdf-import.fix
deleted file mode 100644
index 0615418800e8..000000000000
--- a/pkgs/strategoxt/sdf-import.fix
+++ /dev/null
@@ -1,18 +0,0 @@
-Function(["rev"],
-  Package(
-    [ ("name", "sdf-import")
-
-    , ("build", Relative("strategoxt/sdf-import-build.sh"))
-    , ("pkgbuild", Relative("strategoxt/pkg-build.sh"))
-
-    , ("src", App(IncludeFix("strategoxt/fetchsvn.fix"),
-                  [ ("name", "sdf-import"), ("rev",  Var("rev"))]))
-
-    , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-    , ("aterm",  IncludeFix("aterm/aterm.fix"))
-    , ("sdf2",   IncludeFix("sdf2/sdf2.fix"))
-    , ("autoxt", App(IncludeFix("autoxt/autoxt.fix"),[("rev",Var("rev"))]))
-    , ("xtc",    App(IncludeFix("xtc/xtc.fix"),[("rev",Var("rev"))]))
-    ]
-  )
-)
diff --git a/pkgs/strategoxt/strategoxt-build.sh b/pkgs/strategoxt/strategoxt-build.sh
deleted file mode 100755
index a2f1641bf238..000000000000
--- a/pkgs/strategoxt/strategoxt-build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-mkdir $out
-
-exit 0
\ No newline at end of file
diff --git a/pkgs/strategoxt/strategoxt-head.fix b/pkgs/strategoxt/strategoxt-head.fix
deleted file mode 100644
index 9ac72ab32bf8..000000000000
--- a/pkgs/strategoxt/strategoxt-head.fix
+++ /dev/null
@@ -1,4 +0,0 @@
-App(
-  IncludeFix("strategoxt/strategoxt.fix")
-  , [("rev", "3395")]
-)
\ No newline at end of file
diff --git a/pkgs/strategoxt/strategoxt.fix b/pkgs/strategoxt/strategoxt.fix
deleted file mode 100644
index 8c24a1538abf..000000000000
--- a/pkgs/strategoxt/strategoxt.fix
+++ /dev/null
@@ -1,36 +0,0 @@
-Function(["rev"],
-  Package(
-    [ ("name", "strategoxt")
-
-    , ("build", Relative("system/populate-linkdirs.pl"))
-
-    , ("act-sdf2",  
-	IncludeFix("sdf2/sdf2.fix"))
-
-    , ("act-autoxt", 
-	App(IncludeFix("autoxt/autoxt.fix"), [("rev",Var("rev"))]))
-
-    , ("act-srts",   
-	App(IncludeFix("srts/srts.fix"), [("rev", Var("rev"))]))
-
-    , ("act-xtc",    
-	App(IncludeFix("xtc/xtc.fix"),[("rev", Var("rev"))]))
-
-    , ("act-sdf-import",    
-	App(IncludeFix("strategoxt/sdf-import.fix"),[("rev", Var("rev"))]))
-
-    , ("act-stratego-front",
-	App(IncludeFix("stratego-front/stratego-front.fix"),[("rev", Var("rev"))]))
-
-    , ("act-asfix-tools",    
-	App(IncludeFix("asfix-tools/asfix-tools.fix"),[("rev", Var("rev"))]))
-
-    , ("act-sc",    
-	App(IncludeFix("sc/sc.fix"),[("rev", Var("rev"))]))
-
-    , ("act-gpp",    
-	App(IncludeFix("gpp/gpp.fix"),[("rev", Var("rev"))]))
-
-    ]
-  )
-)
diff --git a/pkgs/subversion/subversion-build.sh b/pkgs/subversion/subversion-build.sh
deleted file mode 100755
index f3fc3b70591d..000000000000
--- a/pkgs/subversion/subversion-build.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-
-envpkgs="$ssl $db4 $httpd $swig $libxml"
-. $stdenv/setup || exit 1
-
-if test $localServer; then
-    extraflags="--with-berkeley-db=$db4 $extraflags"
-fi
-
-if test $httpsClient; then
-    extraflags="--with-ssl --with-libs=$ssl $extraflags"
-fi
-
-if test $httpServer; then
-    extraflags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $extraflags"
-    extramakeflags="APACHE_LIBEXECDIR=$out/modules $extramakeflags"
-else
-    NIX_CFLAGS_COMPILE="-I$expat/include $NIX_CFLAGS_COMPILE"
-    NIX_CFLAGS_LINK="-L$expat/lib $NIX_CFLAGS_LINK"
-    NIX_LDFLAGS="-rpath $expat/lib $NIX_LDFLAGS"
-fi
-
-if test $pythonBindings; then
-    extraflags="--with-swig=$swig $extraflags"
-fi
-
-echo "extra flags: $extraflags"
-
-tar xvfz $src || exit 1
-cd subversion-* || exit 1
-./configure --prefix=$out $extraflags \
- --without-gdbm --disable-static || exit 1
-make $extramakeflags || exit 1
-make install $extramakeflags || exit 1
-
-if test $pythonBindings; then
-    make swig-py || exit 1
-    make install-swig-py || exit 1
-fi
-
-echo $envpkgs > $out/envpkgs || exit 1
diff --git a/pkgs/subversion/subversion.fix b/pkgs/subversion/subversion.fix
deleted file mode 100644
index 0b4eb3b45530..000000000000
--- a/pkgs/subversion/subversion.fix
+++ /dev/null
@@ -1,28 +0,0 @@
-Function(["localServer", "httpsClient", "httpServer", "pythonBindings"],
-
-  Package(
-    [ ("name", "subversion-0.30.0")
-
-    , ("build", Relative("subversion/subversion-build.sh"))
-
-    , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-        [ ("url", "http://svn.collab.net/tarballs/subversion-0.30.0.tar.gz")
-        , ("md5", "9dac76a67a217dc6b7f63259761ff93f")
-        ]))
-
-    , ("localServer", Var("localServer"))
-    , ("httpsClient", Var("httpsClient"))
-    , ("httpServer", Var("httpServer"))
-    , ("httpsServer", True)
-    , ("pythonBindings", Var("pythonBindings"))
-
-    , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-    , ("ssl", If(Var("httpsClient"), IncludeFix("openssl/openssl.fix"), ""))
-    , ("swig", If(Var("pythonBindings"), IncludeFix("swig/swig.fix"), ""))
-    , ("httpd", If(Var("httpServer"), IncludeFix("httpd/httpd.fix"), ""))
-    , ("db4", If(Var("localServer"), IncludeFix("db4/db4.fix"), ""))
-    , ("libxml", IncludeFix("libxml2/libxml2.fix"))
-    , ("expat", If(Var("httpServer"), "", IncludeFix("expat/expat.fix")))
-    ]
-  )
-)
diff --git a/pkgs/swig/swig-build.sh b/pkgs/swig/swig-build.sh
deleted file mode 100755
index 1a28bae858cd..000000000000
--- a/pkgs/swig/swig-build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd SWIG-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/swig/swig.fix b/pkgs/swig/swig.fix
deleted file mode 100644
index 88555c6f29c6..000000000000
--- a/pkgs/swig/swig.fix
+++ /dev/null
@@ -1,12 +0,0 @@
-Package(
-  [ ("name", "swig-1.3.19")
-  , ("build", Relative("swig/swig-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://heanet.dl.sourceforge.net/sourceforge/swig/swig-1.3.19.tar.gz")
-      , ("md5", "a733455544426b31868dd87fc162e750")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)
diff --git a/pkgs/sylpheed/sylpheed-build.sh b/pkgs/sylpheed/sylpheed-build.sh
deleted file mode 100755
index fa2fd2827f4e..000000000000
--- a/pkgs/sylpheed/sylpheed-build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-
-envpkgs="$gtk $ssl"
-. $stdenv/setup || exit 1
-
-export C_INCLUDE_PATH=$ssl/include:$C_INCLUDE_PATH
-
-tar xvfj $src || exit 1
-cd sylpheed-* || exit 1
-./configure --prefix=$out --enable-ssl --disable-gdk-pixbuf --disable-imlibtest || exit 1
-make || exit 1
-make install || exit 1
-echo $envpkgs > $out/envpkgs || exit 1
diff --git a/pkgs/sylpheed/sylpheed.fix b/pkgs/sylpheed/sylpheed.fix
deleted file mode 100644
index bbeab310ee5f..000000000000
--- a/pkgs/sylpheed/sylpheed.fix
+++ /dev/null
@@ -1,15 +0,0 @@
-Package(
-  [ ("name", "sylpheed-0.9.6")
-
-  , ("build", Relative("sylpheed/sylpheed-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://heanet.dl.sourceforge.net/sourceforge/sylpheed-claws/sylpheed-0.9.6.tar.bz2")
-      , ("md5", "07217db4f989f3a8552d6e5a14e5e924")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("gtk", IncludeFix("gtk+-1/gtk+.fix"))
-  , ("ssl", IncludeFix("openssl/openssl.fix"))
-  ]
-)
diff --git a/pkgs/system/populate-linkdirs.pl b/pkgs/system/populate-linkdirs.pl
deleted file mode 100755
index 6462c543e07a..000000000000
--- a/pkgs/system/populate-linkdirs.pl
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /usr/bin/perl -w
-
-use strict;
-use Cwd;
-
-my $selfdir = $ENV{"out"};
-mkdir "$selfdir", 0755 || die "error creating $selfdir";
-
-# For each activated package, create symlinks.
-
-sub createLinks {
-    my $srcdir = shift;
-    my $dstdir = shift;
-
-    my @srcfiles = glob("$srcdir/*");
-
-    foreach my $srcfile (@srcfiles) {
-        my $basename = $srcfile;
-        $basename =~ s/^.*\///g; # strip directory
-        my $dstfile = "$dstdir/$basename";
-	if ($srcfile =~ /\/envpkgs$/) {
-	} elsif (-d $srcfile) {
-            # !!! hack for resolving name clashes
-            if (!-e $dstfile) {
-                mkdir $dstfile, 0755 || 
-                    die "error creating directory $dstfile";
-            }
-            -d $dstfile or die "$dstfile is not a directory";
-            createLinks($srcfile, $dstfile);
-        } elsif (-l $dstfile) {
-            my $target = readlink($dstfile);
-            die "collission between $srcfile and $target";
-        } else {
-#            print "linking $dstfile to $srcfile\n";
-            symlink($srcfile, $dstfile) ||
-                die "error creating link $dstfile";
-        }
-    }
-}
-
-my %done;
-
-sub addPkg {
-    my $pkgdir = shift;
-
-    return if (defined $done{$pkgdir});
-    $done{$pkgdir} = 1;
-
-    print "merging $pkgdir\n";
-
-    createLinks("$pkgdir", "$selfdir");
-
-#    if (-f "$pkgdir/envpkgs") {
-#	my $envpkgs = `cat $pkgdir/envpkgs`;
-#	chomp $envpkgs;
-#	my @envpkgs = split / +/, $envpkgs;
-#	foreach my $envpkg (@envpkgs) {
-#	    addPkg($envpkg);
-#	}
-#    }
-}
-
-
-foreach my $name (keys %ENV) {
-
-    next unless $name =~ /^act.*$/;
-
-    my $pkgdir = $ENV{$name};
-    next unless $pkgdir =~ /^\//;
-
-    addPkg($pkgdir);
-}
diff --git a/pkgs/system/system-template-everything.fix b/pkgs/system/system-template-everything.fix
deleted file mode 100644
index 13ad61f370f3..000000000000
--- a/pkgs/system/system-template-everything.fix
+++ /dev/null
@@ -1,14 +0,0 @@
-Call(IncludeFix("system/system.fix"),
-  [ ("subversion", True)
-  , ("strategoxt", True)
-  , ("pan", True)
-  , ("mplayer", True)
-  , ("sylpheed", True)
-  , ("libxslt", True)
-  , ("libxml", True)
-  , ("docbook", True)
-  , ("httpd", True)
-  , ("firebird", True)
-  , ("graphviz", True)
-  , ("gqview", True)
-  ])
diff --git a/pkgs/system/system-template-server.fix b/pkgs/system/system-template-server.fix
deleted file mode 100644
index 2de4a28cbc60..000000000000
--- a/pkgs/system/system-template-server.fix
+++ /dev/null
@@ -1,10 +0,0 @@
-Call(IncludeFix("system/system.fix"),
-  [ ("subversion", True)
-  , ("strategoxt", False)
-  , ("pan", False)
-  , ("mplayer", False)
-  , ("sylpheed", False)
-  , ("libxslt", False)
-  , ("docbook", False)
-  , ("httpd", True)
-  ])
diff --git a/pkgs/system/system.fix b/pkgs/system/system.fix
deleted file mode 100644
index f53db5e469da..000000000000
--- a/pkgs/system/system.fix
+++ /dev/null
@@ -1,34 +0,0 @@
-Function(
-  [ "subversion", "strategoxt", "pan", "mplayer", "sylpheed", "libxslt", "libxml"
-  ,  "docbook", "httpd", "firebird", "graphviz", "gqview"
-  ],
-  Package(
-    [ ("name", "system")
-    , ("build", Relative("system/populate-linkdirs.pl"))
-
-    , ("actSubversion",
-        If(Var("subversion"),
-          Call(IncludeFix("subversion/subversion.fix"), 
-            [ ("localServer", True)
-            , ("httpsClient", True)
-            , ("httpServer", True)
-            , ("pythonBindings", False)
-            ]),
-          ""))
-
-    , ("actStrategoXT", If(Var("strategoxt"), IncludeFix("strategoxt-0.9.2/strategoxt.fix"), ""))
-    , ("actATerm", If(Var("strategoxt"), IncludeFix("aterm/aterm.fix"), ""))
-    , ("actPan", If(Var("pan"), IncludeFix("pan/pan.fix"), ""))
-    , ("actMPlayer", If(Var("mplayer"), IncludeFix("MPlayer/MPlayer.fix"), ""))
-    , ("actSylpheed", If(Var("sylpheed"), IncludeFix("sylpheed/sylpheed.fix"), ""))
-    , ("actLibXslt", If(Var("libxslt"), IncludeFix("libxslt/libxslt.fix"), ""))
-    , ("actLibXml", If(Var("libxml"), IncludeFix("libxml2/libxml2.fix"), ""))
-    , ("actDocbookXml", If(Var("docbook"), IncludeFix("docbook-xml/docbook-xml.fix"), ""))
-    , ("actDocbookXsl", If(Var("docbook"), IncludeFix("docbook-xsl/docbook-xsl.fix"), ""))
-    , ("actHttpd", If(Var("httpd"), IncludeFix("httpd/httpd.fix"), ""))
-    , ("actFirebird", If(Var("firebird"), IncludeFix("firebird/firebird.fix"), ""))
-    , ("actGraphviz", If(Var("graphviz"), IncludeFix("graphviz/graphviz.fix"), ""))
-    , ("actGQView", If(Var("gqview"), IncludeFix("gqview/gqview.fix"), ""))
-    ]
-  )
-)
diff --git a/pkgs/uml/config b/pkgs/uml/config
deleted file mode 100644
index 078b5477c107..000000000000
--- a/pkgs/uml/config
+++ /dev/null
@@ -1,357 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_USERMODE=y
-# CONFIG_ISA is not set
-# CONFIG_SBUS is not set
-# CONFIG_PCI is not set
-CONFIG_UID16=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-
-#
-# General Setup
-#
-# CONFIG_MODE_SKAS is not set
-CONFIG_MODE_TT=y
-CONFIG_MODE_TT=y
-CONFIG_NET=y
-CONFIG_SYSVIPC=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_SYSCTL=y
-CONFIG_BINFMT_AOUT=y
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_MISC=y
-CONFIG_HOSTFS=y
-# CONFIG_HPPFS is not set
-CONFIG_MCONSOLE=y
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_HOST_2G_2G is not set
-# CONFIG_UML_SMP is not set
-# CONFIG_SMP is not set
-CONFIG_NEST_LEVEL=0
-CONFIG_KERNEL_HALF_GIGS=1
-# CONFIG_HIGHMEM is not set
-# CONFIG_PROC_MM is not set
-CONFIG_KERNEL_STACK_ORDER=2
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_KMOD=y
-
-#
-# Character Devices
-#
-CONFIG_STDIO_CONSOLE=y
-CONFIG_SSL=y
-CONFIG_FD_CHAN=y
-# CONFIG_NULL_CHAN is not set
-CONFIG_PORT_CHAN=y
-CONFIG_PTY_CHAN=y
-CONFIG_TTY_CHAN=y
-CONFIG_XTERM_CHAN=y
-CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
-CONFIG_CON_CHAN="xterm"
-CONFIG_SSL_CHAN="pty"
-CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX98_PTY_COUNT=256
-# CONFIG_WATCHDOG is not set
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_UML_WATCHDOG is not set
-CONFIG_UML_SOUND=y
-CONFIG_SOUND=y
-CONFIG_HOSTAUDIO=y
-# CONFIG_TTY_LOG is not set
-
-#
-# Block Devices
-#
-CONFIG_BLK_DEV_UBD=y
-# CONFIG_BLK_DEV_UBD_SYNC is not set
-CONFIG_COW=y
-CONFIG_COW_COMMON=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_NBD=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_MMAPPER is not set
-CONFIG_NETDEVICES=y
-
-#
-# Network Devices
-#
-CONFIG_UML_NET=y
-CONFIG_UML_NET_ETHERTAP=y
-CONFIG_UML_NET_TUNTAP=y
-CONFIG_UML_NET_SLIP=y
-# CONFIG_UML_NET_SLIRP is not set
-CONFIG_UML_NET_DAEMON=y
-CONFIG_UML_NET_MCAST=y
-# CONFIG_UML_NET_PCAP is not set
-CONFIG_DUMMY=y
-CONFIG_BONDING=m
-CONFIG_EQUALIZER=m
-CONFIG_TUN=y
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-# CONFIG_PPP_FILTER is not set
-# CONFIG_PPP_ASYNC is not set
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPPOE=m
-CONFIG_SLIP=m
-# CONFIG_SLIP_COMPRESSED is not set
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-# CONFIG_NETLINK_DEV is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_FILTER is not set
-CONFIG_UNIX=y
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-# CONFIG_INET_ECN is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_IPV6 is not set
-# CONFIG_KHTTPD is not set
-# CONFIG_ATM is not set
-# CONFIG_VLAN_8021Q is not set
-
-#
-#  
-#
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-
-#
-# Appletalk devices
-#
-# CONFIG_DEV_APPLETALK is not set
-# CONFIG_DECNET is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_LLC is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_FASTROUTE is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-
-#
-# File systems
-#
-CONFIG_QUOTA=y
-# CONFIG_QFMT_V2 is not set
-CONFIG_AUTOFS_FS=m
-CONFIG_AUTOFS4_FS=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-CONFIG_ADFS_FS=m
-# CONFIG_ADFS_FS_RW is not set
-CONFIG_AFFS_FS=m
-CONFIG_HFS_FS=m
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BEFS_DEBUG is not set
-CONFIG_BFS_FS=m
-CONFIG_EXT3_FS=y
-CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_UMSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
-# CONFIG_JFFS2_FS is not set
-CONFIG_CRAMFS=m
-CONFIG_TMPFS=y
-CONFIG_RAMFS=y
-CONFIG_ISO9660_FS=y
-# CONFIG_JOLIET is not set
-# CONFIG_ZISOFS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_MINIX_FS=m
-CONFIG_VXFS_FS=m
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
-CONFIG_HPFS_FS=m
-CONFIG_PROC_FS=y
-CONFIG_DEVFS_FS=y
-CONFIG_DEVFS_MOUNT=y
-# CONFIG_DEVFS_DEBUG is not set
-CONFIG_DEVPTS_FS=y
-CONFIG_QNX4FS_FS=m
-# CONFIG_QNX4FS_RW is not set
-CONFIG_ROMFS_FS=m
-CONFIG_EXT2_FS=y
-CONFIG_SYSV_FS=m
-CONFIG_UDF_FS=m
-# CONFIG_UDF_RW is not set
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-
-#
-# Network File Systems
-#
-# CONFIG_CODA_FS is not set
-# CONFIG_INTERMEZZO_FS is not set
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_ROOT_NFS is not set
-CONFIG_NFSD=y
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_TCP is not set
-CONFIG_SUNRPC=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-# CONFIG_SMB_FS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
-# CONFIG_NCPFS_NFS_NS is not set
-# CONFIG_NCPFS_OS2_NS is not set
-# CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_NLS is not set
-# CONFIG_NCPFS_EXTRAS is not set
-# CONFIG_ZISOFS_FS is not set
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_SMB_NLS is not set
-CONFIG_NLS=y
-
-#
-# Native Language Support
-#
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ISO8859_1 is not set
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-
-#
-# SCSI support
-#
-CONFIG_SCSI=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-# CONFIG_BLK_DEV_SD is not set
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_CHR_DEV_SG is not set
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-# CONFIG_SCSI_DEBUG_QUEUES is not set
-# CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI_DEBUG=m
-
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-# CONFIG_BLK_DEV_MD is not set
-# CONFIG_MD_LINEAR is not set
-# CONFIG_MD_RAID0 is not set
-# CONFIG_MD_RAID1 is not set
-# CONFIG_MD_RAID5 is not set
-# CONFIG_MD_MULTIPATH is not set
-# CONFIG_BLK_DEV_LVM is not set
-
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-
-#
-# Library routines
-#
-# CONFIG_CRC32 is not set
-CONFIG_ZLIB_INFLATE=m
-CONFIG_ZLIB_DEFLATE=m
-
-#
-# Kernel hacking
-#
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUGSYM is not set
-# CONFIG_PT_PROXY is not set
-# CONFIG_GPROF is not set
-# CONFIG_GCOV is not set
diff --git a/pkgs/uml/uml-build.sh b/pkgs/uml/uml-build.sh
deleted file mode 100755
index 4a7d5ba28f82..000000000000
--- a/pkgs/uml/uml-build.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-export PATH=$perl/bin:$m4/bin:$PATH
-
-export NIX_CC=$gcc/bin/gcc
-
-tar xvfj $linuxSrc || exit 1
-cd linux-* || exit 1
-bunzip2 < $umlSrc | $patch/bin/patch -p1 || exit 1
-cp $config .config || exit 1
-make oldconfig ARCH=um || exit 1
-
-make linux ARCH=um || exit 1
-strip linux || exit 1
-make modules ARCH=um || exit 1
-
-mkdir $out || exit 1
-mkdir $out/bin || exit 1
-cp -p linux $out/bin || exit 1
-make modules_install INSTALL_MOD_PATH=$out ARCH=um || exit 1
-
diff --git a/pkgs/uml/uml.fix b/pkgs/uml/uml.fix
deleted file mode 100644
index 705520ea484c..000000000000
--- a/pkgs/uml/uml.fix
+++ /dev/null
@@ -1,23 +0,0 @@
-Package(
-  [ ("name", "uml-2.4.22-3")
-
-  , ("build", Relative("uml/uml-build.sh"))
-  , ("config", Relative("uml/config"))
-
-  , ("linuxSrc", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.4/linux-2.4.22.tar.bz2")
-      , ("md5", "75dc85149b06ac9432106b8941eb9f7b")
-      ]))
-
-  , ("umlSrc", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://uml-pub.ists.dartmouth.edu/uml/uml-patch-2.4.22-3.bz2")
-      , ("md5", "1ffa698fed37d14c6750ec841b7d9858")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("gcc", IncludeFix("gcc-2.95/gcc.fix"))
-  , ("patch", IncludeFix("gnupatch/gnupatch.fix"))
-  , ("perl", IncludeFix("perl/perl.fix"))
-  , ("m4", IncludeFix("gnum4/gnum4.fix"))
-  ]
-)
diff --git a/pkgs/unzip/unzip-build.sh b/pkgs/unzip/unzip-build.sh
deleted file mode 100755
index 90613620c7b9..000000000000
--- a/pkgs/unzip/unzip-build.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd unzip-* || exit 1
-make -f unix/Makefile generic || exit 1
-make -f unix/Makefile prefix=$out install || exit 1
diff --git a/pkgs/unzip/unzip.fix b/pkgs/unzip/unzip.fix
deleted file mode 100644
index 55b19c22af6b..000000000000
--- a/pkgs/unzip/unzip.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "unzip-5.50")
-
-  , ("build", Relative("unzip/unzip-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.info-zip.org/pub/infozip/src/unzip550.tar.gz")
-      , ("md5", "798592d62e37f92571184236947122ed")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)
diff --git a/pkgs/win32codecs/win32codecs-build.sh b/pkgs/win32codecs/win32codecs-build.sh
deleted file mode 100755
index 9b76079acabb..000000000000
--- a/pkgs/win32codecs/win32codecs-build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-mkdir $out || exit 1
-cd $out || exit 1
-tar xvfj $src || exit 1
-mv extralite/* . || exit 1
-rmdir extralite || exit 1
diff --git a/pkgs/win32codecs/win32codecs.fix b/pkgs/win32codecs/win32codecs.fix
deleted file mode 100644
index 081628001697..000000000000
--- a/pkgs/win32codecs/win32codecs.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "win32codecs-1")
-
-  , ("build", Relative("win32codecs/win32codecs-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www2.mplayerhq.hu/MPlayer/releases/codecs/extralite.tar.bz2")
-      , ("md5", "4748ecae87f71e8bda9cb2e2a9bd30b4")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)
diff --git a/pkgs/wxPython/wxPython-build.sh b/pkgs/wxPython/wxPython-build.sh
deleted file mode 100755
index fc626caba500..000000000000
--- a/pkgs/wxPython/wxPython-build.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-export PATH=$pkgconfig/bin:$PATH
-envpkgs="$gtk"
-. $setenv || exit 1
-
-tar xvfz $src || exit 1
-cd wxPythonSrc-* || exit 1
-./configure --prefix=$out --enable-gtk2 --enable-rpath=$out/lib --with-opengl || exit 1
-make || exit 1
-make install || exit 1
-cd wxPython || exit 1
-python setup.py WX_CONFIG=$out/bin/wx-config WXPORT=gtk2 build install --root=$out/python || exit 1
-
-echo $envpkgs > $out/envpkgs || exit 1
diff --git a/pkgs/wxPython/wxPython.fix b/pkgs/wxPython/wxPython.fix
deleted file mode 100644
index af11edec7236..000000000000
--- a/pkgs/wxPython/wxPython.fix
+++ /dev/null
@@ -1,15 +0,0 @@
-Package(
-  [ ("name", "wxPython-2.4.1.2")
-
-  , ("build", Relative("wxPython/wxPython-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://belnet.dl.sourceforge.net/sourceforge/wxpython/wxPythonSrc-2.4.1.2.tar.gz")
-      , ("md5", "515fa95c5c0497404a858213b6586411")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
-  , ("gtk", IncludeFix("gtk+/gtk+.fix"))
-  ]
-)
diff --git a/pkgs/xfree86/host.def b/pkgs/xfree86/host.def
deleted file mode 100644
index 0085f9dab259..000000000000
--- a/pkgs/xfree86/host.def
+++ /dev/null
@@ -1,30 +0,0 @@
-#define BuildServer		NO
-#define BuildFontServer         NO
-#define BuildSpeedo             NO
-#define BuildType1              NO
-#define BuildCID                NO
-#define BuildFreeType           NO
-#define BuildXTrueType          NO
-#define BuildFonts              NO
-#define BuildXftLibrary		NO
-#define BuildXft1Library	NO
-#define BuildClients		NO
-#define BuildDocs		NO
-#define BuildLibraries		YES
-#define BuildGLXLibrary		NO
-#define BuildOSMesaLib		NO
-#define BuildOSMesaLib		NO
-#define BuildXvMCExt		NO
-#define BuildXvMCLibrary	NO
-
-#define XF86Server              NO
-#define XnestServer             NO
-#define XVirtualFramebufferServer	NO
-#define XprtServer		NO
-#define XF86CardDrivers
-#define XInputDrivers
-
-#define ProjectRoot @OUT@
-#define NothingOutsideProjectRoot YES
-#define EtcX11Directory ProjectRoot/etc
-#define UseSeparateConfDir	NO
diff --git a/pkgs/xfree86/xfree86-build.sh b/pkgs/xfree86/xfree86-build.sh
deleted file mode 100755
index 2097d50ed59c..000000000000
--- a/pkgs/xfree86/xfree86-build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-export PATH=$bison/bin:$flex/bin:$PATH
-
-# For libfl.a (flex); assuming it's a static library. 
-export NIX_CFLAGS_LINK="-L$flex/lib $NIX_CFLAGS_LINK"
-
-tar xvfz $src1 || exit 1
-tar xvfz $src2 || exit 1
-tar xvfz $src3 || exit 1
-cd xc || exit 1
-sed "s^@OUT@^$out^" < $hostdef > config/cf/host.def
-make World || exit 1
-make install || exit 1
-
-# Hack to get fontconfig to work.
-ln -s /usr/X11R6/lib/X11/fonts $out/lib/X11/fonts
diff --git a/pkgs/xfree86/xfree86.fix b/pkgs/xfree86/xfree86.fix
deleted file mode 100644
index 499e38d47a97..000000000000
--- a/pkgs/xfree86/xfree86.fix
+++ /dev/null
@@ -1,27 +0,0 @@
-Package(
-  [ ("name", "xfree86-4.3")
-
-  , ("build", Relative("xfree86/xfree86-build.sh"))
-
-  , ("src1", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://gnu.kookel.org/pub/XFree86/4.3.0/source/X430src-1.tgz")
-      , ("md5", "4f241a4f867363f40efa2b00dca292af")
-      ]))
-
-  , ("src2", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://gnu.kookel.org/pub/XFree86/4.3.0/source/X430src-2.tgz")
-      , ("md5", "844c2ee908d21dbf8911fd13115bf8b4")
-      ]))
-
-  , ("src3", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://gnu.kookel.org/pub/XFree86/4.3.0/source/X430src-3.tgz")
-      , ("md5", "b82a0443e1b7bf860e4343e6b6766cb6")
-      ]))
-
-  , ("hostdef", Relative("xfree86/host.def"))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("bison", IncludeFix("bison/bison.fix"))
-  , ("flex", IncludeFix("flex/flex.fix"))
-  ]
-)
diff --git a/pkgs/xtc/xtc-build.sh b/pkgs/xtc/xtc-build.sh
deleted file mode 100755
index 89d2e1a319bc..000000000000
--- a/pkgs/xtc/xtc-build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-set -e
-$pkgbuild --with-aterm=$aterm --with-srts=$srts
diff --git a/pkgs/xtc/xtc-head.fix b/pkgs/xtc/xtc-head.fix
deleted file mode 100644
index 7ab6fd1d850b..000000000000
--- a/pkgs/xtc/xtc-head.fix
+++ /dev/null
@@ -1,4 +0,0 @@
-App(
-  IncludeFix("xtc/xtc.fix")
-  , [("rev", "3385")]
-)
\ No newline at end of file
diff --git a/pkgs/xtc/xtc.fix b/pkgs/xtc/xtc.fix
deleted file mode 100755
index fbe1933906f3..000000000000
--- a/pkgs/xtc/xtc.fix
+++ /dev/null
@@ -1,17 +0,0 @@
-Function(["rev"],
-  Package(
-    [ ("name", "xtc")
-
-    , ("build", Relative("xtc/xtc-build.sh"))
-    , ("pkgbuild", Relative("strategoxt/pkg-build.sh"))
-
-    , ("src", App(IncludeFix("strategoxt/fetchsvn.fix"),
-                  [ ("name", "xtc"), ("rev",  Var("rev"))]))
-
-    , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-    , ("aterm",  IncludeFix("aterm/aterm.fix"))
-    , ("autoxt", App(IncludeFix("autoxt/autoxt.fix"),[("rev",Var("rev"))]))
-    , ("srts",   App(IncludeFix("srts/srts.fix"),[("rev",Var("rev"))]))
-    ]
-  )
-)
diff --git a/pkgs/zip/zip-build.sh b/pkgs/zip/zip-build.sh
deleted file mode 100755
index b68fdfe32b83..000000000000
--- a/pkgs/zip/zip-build.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd zip-* || exit 1
-make -f unix/Makefile generic || exit 1
-make -f unix/Makefile prefix=$out install || exit 1
diff --git a/pkgs/zip/zip.fix b/pkgs/zip/zip.fix
deleted file mode 100644
index 7c3ff62bac71..000000000000
--- a/pkgs/zip/zip.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "zip-2.3")
-
-  , ("build", Relative("zip/zip-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.info-zip.org/pub/infozip/src/zip23.tar.gz")
-      , ("md5", "5206a99541f3b0ab90f1baa167392c4f")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)
diff --git a/pkgs/zlib/zlib-build.sh b/pkgs/zlib/zlib-build.sh
deleted file mode 100755
index 4ca1a8305440..000000000000
--- a/pkgs/zlib/zlib-build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd zlib-* || exit 1
-./configure --prefix=$out --shared || exit 1
-make || exit 1
-mkdir $out || exit 1
-make install || exit 1
diff --git a/pkgs/zlib/zlib.fix b/pkgs/zlib/zlib.fix
deleted file mode 100644
index d57ec454c12e..000000000000
--- a/pkgs/zlib/zlib.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "zlib-1.1.4")
-
-  , ("build", Relative("zlib/zlib-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www.gzip.org/zlib/zlib-1.1.4.tar.gz")
-      , ("md5", "abc405d0bdd3ee22782d7aa20e440f08")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)