summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/applications/audio/bmp/default.nix2
-rw-r--r--pkgs/applications/editors/joe/test.nix1
-rw-r--r--pkgs/development/compilers/strategoxt/strategoxt-0.10.nix18
-rw-r--r--pkgs/development/compilers/strategoxt/strategoxt-0.11.nix18
-rw-r--r--pkgs/development/compilers/strategoxt/strategoxt-0.12.nix14
-rw-r--r--pkgs/development/compilers/strategoxt/strategoxt-0.13.nix18
-rw-r--r--pkgs/development/compilers/strategoxt/strategoxt-0.15.nix15
-rw-r--r--pkgs/development/compilers/strategoxt/strategoxt-0.9.4.nix14
-rw-r--r--pkgs/development/interpreters/toolbus/default.nix18
-rw-r--r--pkgs/development/interpreters/toolbus/test.nix1
-rw-r--r--pkgs/development/interpreters/toolbus/toolbus-1.2.2.nix17
-rw-r--r--pkgs/development/libraries/freetype/freetype-2.2.1.nix7
-rw-r--r--pkgs/development/libraries/gnome/gnome-icon-theme/default.nix2
-rw-r--r--pkgs/development/libraries/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.nix13
-rw-r--r--pkgs/development/libraries/gnome/libgnomeprint/libgnomeprint-2.12.1.nix12
-rw-r--r--pkgs/development/libraries/libpng/libpng-1.2.12.nix13
-rw-r--r--pkgs/development/libraries/libxml2/default.nix21
-rw-r--r--pkgs/development/libraries/libxml2/libxml2-2.6.23.nix20
-rw-r--r--pkgs/development/libraries/libxml2/libxml2-2.6.26.nix20
-rw-r--r--pkgs/development/libraries/libxslt/default.nix13
-rw-r--r--pkgs/development/libraries/libxslt/libxslt-1.1.15.nix12
-rw-r--r--pkgs/development/libraries/libxslt/libxslt-1.1.17.nix12
-rw-r--r--pkgs/development/libraries/neon/neon-0.24.7.nix10
-rw-r--r--pkgs/development/libraries/neon/neon-0.26.1.nix10
-rw-r--r--pkgs/development/libraries/openssl-0.9.8/builder.sh12
-rw-r--r--pkgs/development/libraries/openssl-0.9.8/default.nix13
-rw-r--r--pkgs/development/libraries/openssl-0.9.8/dylib.patch30
-rw-r--r--pkgs/development/libraries/sqlite/default.nix (renamed from pkgs/development/libraries/sqlite-3.3/default.nix)0
-rw-r--r--pkgs/development/libraries/toolbuslib/test.nix1
-rw-r--r--pkgs/development/tools/misc/gnum4/default.nix9
-rw-r--r--pkgs/development/tools/misc/gnum4/m4-1.4.7.nix8
-rw-r--r--pkgs/development/tools/misc/swig/swig-1.3.29.nix22
-rw-r--r--pkgs/development/tools/parsing/asc-support/asc-support-1.8.nix12
-rw-r--r--pkgs/development/tools/parsing/asc-support/asc-support-1.9.nix12
-rw-r--r--pkgs/development/tools/parsing/asc-support/asc-support-2.0.nix12
-rw-r--r--pkgs/development/tools/parsing/asc-support/builder.sh3
-rw-r--r--pkgs/development/tools/parsing/asf-library/asf-library-1.0.nix10
-rw-r--r--pkgs/development/tools/parsing/asf-library/asf-library-1.1.nix10
-rw-r--r--pkgs/development/tools/parsing/asf-support/asf-support-1.2.nix12
-rw-r--r--pkgs/development/tools/parsing/asf-support/asf-support-1.3.nix12
-rw-r--r--pkgs/development/tools/parsing/asf-support/asf-support-1.4.nix12
-rw-r--r--pkgs/development/tools/parsing/asf-support/builder.sh5
-rw-r--r--pkgs/development/tools/parsing/error-support/builder.sh3
-rw-r--r--pkgs/development/tools/parsing/error-support/error-support-0.1.1.nix12
-rw-r--r--pkgs/development/tools/parsing/error-support/error-support-0.1.nix12
-rw-r--r--pkgs/development/tools/parsing/pgen/builder.sh9
-rw-r--r--pkgs/development/tools/parsing/pgen/pgen-2.0.nix13
-rw-r--r--pkgs/development/tools/parsing/pgen/pgen-2.1.nix13
-rw-r--r--pkgs/development/tools/parsing/pgen/pgen-2.2.nix13
-rw-r--r--pkgs/development/tools/parsing/pt-support/builder.sh3
-rw-r--r--pkgs/development/tools/parsing/pt-support/pt-support-1.0.nix12
-rw-r--r--pkgs/development/tools/parsing/pt-support/pt-support-1.1.nix12
-rw-r--r--pkgs/development/tools/parsing/pt-support/pt-support-1.2.nix12
-rw-r--r--pkgs/development/tools/parsing/sdf-support/builder.sh3
-rw-r--r--pkgs/development/tools/parsing/sdf-support/sdf-support-2.0.nix12
-rw-r--r--pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.1.nix12
-rw-r--r--pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.nix12
-rw-r--r--pkgs/development/tools/parsing/sdf/sdf2-bundle-2.3.1.nix12
-rw-r--r--pkgs/development/tools/parsing/sdf/sdf2-bundle-2.3.2.nix12
-rw-r--r--pkgs/development/tools/parsing/sdf/sdf2-bundle-2.3.nix14
-rw-r--r--pkgs/development/tools/parsing/sglr/builder.sh3
-rw-r--r--pkgs/development/tools/parsing/sglr/sglr-3.10.2.nix12
-rw-r--r--pkgs/development/tools/parsing/sglr/sglr-3.11.nix12
-rw-r--r--pkgs/development/tools/parsing/sglr/sglr-3.12.nix12
-rw-r--r--pkgs/development/tools/parsing/sglr/sglr-3.14.nix12
-rw-r--r--pkgs/tools/misc/coreutils/coreutils-6.3.nix9
-rw-r--r--pkgs/tools/misc/getopt/default.nix6
-rw-r--r--pkgs/tools/misc/getopt/getopt-1.1.4.nix10
-rw-r--r--pkgs/tools/networking/openssh/openssh-4.3p2.nix17
-rw-r--r--pkgs/top-level/all-packages.nix11
70 files changed, 65 insertions, 726 deletions
diff --git a/pkgs/applications/audio/bmp/default.nix b/pkgs/applications/audio/bmp/default.nix
index 27c8399c1b3..1dc06d69987 100644
--- a/pkgs/applications/audio/bmp/default.nix
+++ b/pkgs/applications/audio/bmp/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation {
   ];
 
   meta = {
-    description = "Beep Media Player, a XMMS fork";
+    description = "Beep Media Player, an XMMS fork";
   };
 }
diff --git a/pkgs/applications/editors/joe/test.nix b/pkgs/applications/editors/joe/test.nix
deleted file mode 100644
index 7d7dc1064ea..00000000000
--- a/pkgs/applications/editors/joe/test.nix
+++ /dev/null
@@ -1 +0,0 @@
-(import ../../../../pkgs/system/i686-linux.nix).joe
diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.10.nix b/pkgs/development/compilers/strategoxt/strategoxt-0.10.nix
deleted file mode 100644
index 848874ecf66..00000000000
--- a/pkgs/development/compilers/strategoxt/strategoxt-0.10.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl, aterm, sdf}:
-
-stdenv.mkDerivation {
-
-  name = "strategoxt-0.10";
-
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.10.tar.gz;
-    md5 = "526a28e84248b649bb098b22d227cd26";
-  };
-
-  inherit aterm;
-  inherit (sdf) sglr pgen ptsupport asflibrary;
-
-  buildInputs = [aterm sdf.pgen];
-}
diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.11.nix b/pkgs/development/compilers/strategoxt/strategoxt-0.11.nix
deleted file mode 100644
index 2e431e8c093..00000000000
--- a/pkgs/development/compilers/strategoxt/strategoxt-0.11.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl, aterm, sdf}:
-
-stdenv.mkDerivation {
-
-  name = "strategoxt-0.11";
-
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.11.tar.gz;
-    md5 = "bf6c38179f6883b01fa3e548c4f45f1c";
-  };
-
-  inherit aterm;
-  inherit (sdf) sglr pgen ptsupport asflibrary;
-
-  buildInputs = [aterm sdf.pgen];
-}
diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.12.nix b/pkgs/development/compilers/strategoxt/strategoxt-0.12.nix
deleted file mode 100644
index 2672fca17d8..00000000000
--- a/pkgs/development/compilers/strategoxt/strategoxt-0.12.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, aterm, sdf}:
-
-stdenv.mkDerivation {
-  name = "strategoxt-0.12";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.12.tar.gz;
-    md5 = "bc2b14d9b53a07fc0047c16f2c6edf0c";
-  };
-
-  inherit aterm sdf;
-  buildInputs = [aterm sdf];
-}
diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.13.nix b/pkgs/development/compilers/strategoxt/strategoxt-0.13.nix
deleted file mode 100644
index 28b09ee29ea..00000000000
--- a/pkgs/development/compilers/strategoxt/strategoxt-0.13.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl, aterm, sdf}:
-
-stdenv.mkDerivation {
-
-  name = "strategoxt-0.13";
-
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.13/strategoxt-0.13.tar.gz;
-    md5 = "783bea5d5ebc0604e7ecf5bfb8f7f7b1";
-  };
-
-  inherit aterm;
-  inherit (sdf) sglr pgen ptsupport asflibrary;
-
-  buildInputs = [aterm sdf.pgen];
-}
diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.15.nix b/pkgs/development/compilers/strategoxt/strategoxt-0.15.nix
deleted file mode 100644
index 2251f2d66f2..00000000000
--- a/pkgs/development/compilers/strategoxt/strategoxt-0.15.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{stdenv, fetchurl, aterm, sdf, pkgconfig}:
-
-stdenv.mkDerivation {
-
-  name = "strategoxt-0.15";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.15/strategoxt-0.15.tar.gz;
-    md5 = "2f6dbbf09abe3b2fb14c2a5126e5c970";
-  };
-
-  inherit aterm sdf;
-  buildInputs = [pkgconfig aterm sdf];
-}
diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.9.4.nix b/pkgs/development/compilers/strategoxt/strategoxt-0.9.4.nix
deleted file mode 100644
index f6be1082668..00000000000
--- a/pkgs/development/compilers/strategoxt/strategoxt-0.9.4.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, aterm, sdf}: derivation {
-  name = "strategoxt-0.9.4";
-  system = stdenv.system;
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/~eelco/stratego/strategoxt-0.9.4/strategoxt-0.9.4.tar.gz;
-    md5 = "4a689e753969ce653b6ea83853890529";
-  };
-  stdenv = stdenv;
-  aterm = aterm;
-  sdf = sdf;
-  tarfile = "true";
-  dir = "strategoxt";
-}
diff --git a/pkgs/development/interpreters/toolbus/default.nix b/pkgs/development/interpreters/toolbus/default.nix
index ca976c0f064..5acc1f780bc 100644
--- a/pkgs/development/interpreters/toolbus/default.nix
+++ b/pkgs/development/interpreters/toolbus/default.nix
@@ -1 +1,17 @@
-import ./toolbus-1.2.2.nix
+{javaAdapter ? false,
+ jdk ? null,
+   stdenv, fetchurl, toolbuslib, atermjava, aterm, yacc, flex, tcltk} :
+
+stdenv.mkDerivation {
+   name = "toolbus-1.2.2";
+   builder = ./builder.sh;
+   src = fetchurl {
+            url = http://nix.cs.uu.nl/dist/tarballs/toolbus-1.2.2.tar.gz;
+            md5 = "887349b097006c0883e1948797349a50";
+         };
+   java = if javaAdapter then true else false;
+   jdk = if javaAdapter then jdk else null;
+
+   inherit toolbuslib atermjava aterm yacc flex tcltk;
+   buildInputs = [toolbuslib atermjava aterm yacc flex jdk tcltk] ;
+}
diff --git a/pkgs/development/interpreters/toolbus/test.nix b/pkgs/development/interpreters/toolbus/test.nix
deleted file mode 100644
index b2252a0cd61..00000000000
--- a/pkgs/development/interpreters/toolbus/test.nix
+++ /dev/null
@@ -1 +0,0 @@
-(import ../../../../pkgs/system/i686-linux.nix).toolbus
diff --git a/pkgs/development/interpreters/toolbus/toolbus-1.2.2.nix b/pkgs/development/interpreters/toolbus/toolbus-1.2.2.nix
deleted file mode 100644
index 5acc1f780bc..00000000000
--- a/pkgs/development/interpreters/toolbus/toolbus-1.2.2.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{javaAdapter ? false,
- jdk ? null,
-   stdenv, fetchurl, toolbuslib, atermjava, aterm, yacc, flex, tcltk} :
-
-stdenv.mkDerivation {
-   name = "toolbus-1.2.2";
-   builder = ./builder.sh;
-   src = fetchurl {
-            url = http://nix.cs.uu.nl/dist/tarballs/toolbus-1.2.2.tar.gz;
-            md5 = "887349b097006c0883e1948797349a50";
-         };
-   java = if javaAdapter then true else false;
-   jdk = if javaAdapter then jdk else null;
-
-   inherit toolbuslib atermjava aterm yacc flex tcltk;
-   buildInputs = [toolbuslib atermjava aterm yacc flex jdk tcltk] ;
-}
diff --git a/pkgs/development/libraries/freetype/freetype-2.2.1.nix b/pkgs/development/libraries/freetype/freetype-2.2.1.nix
deleted file mode 100644
index 134f97cb197..00000000000
--- a/pkgs/development/libraries/freetype/freetype-2.2.1.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
-  name = "freetype-2.2.1";
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/freetype-2.2.1.tar.bz2;
-    md5 = "5b2f827082c544392a7701f7423f0781";
-  };
-}
diff --git a/pkgs/development/libraries/gnome/gnome-icon-theme/default.nix b/pkgs/development/libraries/gnome/gnome-icon-theme/default.nix
index b043a122562..e5c7d408c65 100644
--- a/pkgs/development/libraries/gnome/gnome-icon-theme/default.nix
+++ b/pkgs/development/libraries/gnome/gnome-icon-theme/default.nix
@@ -8,4 +8,6 @@ stdenv.mkDerivation {
 
   # TODO: maybe this package as dependency on gnome-themes?
   configureFlags = "--disable-hicolor-check";
+
+  patches = [./gnome-icon-theme-2.14.2.patch];
 }
diff --git a/pkgs/development/libraries/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.nix b/pkgs/development/libraries/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.nix
deleted file mode 100644
index e5c7d408c65..00000000000
--- a/pkgs/development/libraries/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser}:
-
-assert pkgconfig != null && perl != null;
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-  buildInputs = [pkgconfig perl perlXMLParser];
-
-  # TODO: maybe this package as dependency on gnome-themes?
-  configureFlags = "--disable-hicolor-check";
-
-  patches = [./gnome-icon-theme-2.14.2.patch];
-}
diff --git a/pkgs/development/libraries/gnome/libgnomeprint/libgnomeprint-2.12.1.nix b/pkgs/development/libraries/gnome/libgnomeprint/libgnomeprint-2.12.1.nix
deleted file mode 100644
index 6a44c549f4c..00000000000
--- a/pkgs/development/libraries/gnome/libgnomeprint/libgnomeprint-2.12.1.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{input, stdenv, fetchurl, perl, perlXMLParser, pkgconfig, glib, pango, libart, libxml2, popt, bison, flex}:
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-
-  buildInputs = [
-    perl perlXMLParser pkgconfig popt libxml2
-    glib pango bison flex
-  ];
-
-  propagatedBuildInputs = [libxml2 libart];
-}
diff --git a/pkgs/development/libraries/libpng/libpng-1.2.12.nix b/pkgs/development/libraries/libpng/libpng-1.2.12.nix
deleted file mode 100644
index d3e4378a4d4..00000000000
--- a/pkgs/development/libraries/libpng/libpng-1.2.12.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, zlib}:
-
-assert zlib != null;
-
-stdenv.mkDerivation {
-  name = "libpng-1.2.12";
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/libpng-1.2.12.tar.bz2;
-    md5 = "2287cfaad53a714acdf6eb75a7c1d15f";
-  };
-  propagatedBuildInputs = [zlib];
-  inherit zlib;
-}
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 9d4090eb5e8..12ebf6a9646 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1 +1,20 @@
-import ./libxml2-2.6.26.nix
+{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}:
+
+assert zlib != null;
+assert pythonSupport -> python != null;
+
+stdenv.mkDerivation {
+  name = "libxml2-2.6.26";
+  builder = ./builder.sh;
+
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/libxml2-2.6.26.tar.gz;
+    md5 = "2d8d3805041edab967368b497642f981";
+  };
+
+  python = if pythonSupport then python else null;
+  inherit pythonSupport zlib;
+
+  buildInputs =  if pythonSupport then [python] else [];
+  propagatedBuildInputs = [zlib];
+}
diff --git a/pkgs/development/libraries/libxml2/libxml2-2.6.23.nix b/pkgs/development/libraries/libxml2/libxml2-2.6.23.nix
deleted file mode 100644
index fbd59629cd9..00000000000
--- a/pkgs/development/libraries/libxml2/libxml2-2.6.23.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}:
-
-assert zlib != null;
-assert pythonSupport -> python != null;
-
-stdenv.mkDerivation {
-  name = "libxml2-2.6.23";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/libxml2-2.6.23.tar.gz;
-    md5 = "0f37385e3ad73cc94db43d6873f4fc3b";
-  };
-
-  python = if pythonSupport then python else null;
-  inherit pythonSupport zlib;
-
-  buildInputs =  if pythonSupport then [python] else [];
-  propagatedBuildInputs = [zlib];
-}
diff --git a/pkgs/development/libraries/libxml2/libxml2-2.6.26.nix b/pkgs/development/libraries/libxml2/libxml2-2.6.26.nix
deleted file mode 100644
index 12ebf6a9646..00000000000
--- a/pkgs/development/libraries/libxml2/libxml2-2.6.26.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}:
-
-assert zlib != null;
-assert pythonSupport -> python != null;
-
-stdenv.mkDerivation {
-  name = "libxml2-2.6.26";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/libxml2-2.6.26.tar.gz;
-    md5 = "2d8d3805041edab967368b497642f981";
-  };
-
-  python = if pythonSupport then python else null;
-  inherit pythonSupport zlib;
-
-  buildInputs =  if pythonSupport then [python] else [];
-  propagatedBuildInputs = [zlib];
-}
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index ac278784b0d..f9e6817b18e 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -1 +1,12 @@
-import ./libxslt-1.1.15.nix
+{stdenv, fetchurl, libxml2}:
+
+assert libxml2 != null;
+
+stdenv.mkDerivation {
+  name = "libxslt-1.1.17";
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/libxslt-1.1.17.tar.gz;
+    md5 = "fde6a7a93c0eb14cba628692fa3a1000";
+  };
+  buildInputs = [libxml2];
+}
diff --git a/pkgs/development/libraries/libxslt/libxslt-1.1.15.nix b/pkgs/development/libraries/libxslt/libxslt-1.1.15.nix
deleted file mode 100644
index e1010b2fd98..00000000000
--- a/pkgs/development/libraries/libxslt/libxslt-1.1.15.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, libxml2}:
-
-assert libxml2 != null;
-
-stdenv.mkDerivation {
-  name = "libxslt-1.1.15";
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/libxslt-1.1.15.tar.gz;
-    md5 = "238de9eda71b570ff7b78aaf65308fc6";
-  };
-  buildInputs = [libxml2];
-}
diff --git a/pkgs/development/libraries/libxslt/libxslt-1.1.17.nix b/pkgs/development/libraries/libxslt/libxslt-1.1.17.nix
deleted file mode 100644
index f9e6817b18e..00000000000
--- a/pkgs/development/libraries/libxslt/libxslt-1.1.17.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, libxml2}:
-
-assert libxml2 != null;
-
-stdenv.mkDerivation {
-  name = "libxslt-1.1.17";
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/libxslt-1.1.17.tar.gz;
-    md5 = "fde6a7a93c0eb14cba628692fa3a1000";
-  };
-  buildInputs = [libxml2];
-}
diff --git a/pkgs/development/libraries/neon/neon-0.24.7.nix b/pkgs/development/libraries/neon/neon-0.24.7.nix
deleted file mode 100644
index 24e35e736a2..00000000000
--- a/pkgs/development/libraries/neon/neon-0.24.7.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl, libxml2}:
-
-stdenv.mkDerivation {
-  name = "neon-0.24.7";
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/neon-0.24.7.tar.gz;
-    md5 = "5108bcbe41de4afe2e19cc58500fb9f2";
-  };
-  buildInputs = [libxml2];
-}
diff --git a/pkgs/development/libraries/neon/neon-0.26.1.nix b/pkgs/development/libraries/neon/neon-0.26.1.nix
deleted file mode 100644
index 632ab9e67d3..00000000000
--- a/pkgs/development/libraries/neon/neon-0.26.1.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl, libxml2}:
-
-stdenv.mkDerivation {
-  name = "neon-0.26.1";
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/neon-0.26.1.tar.gz;
-    md5 = "3bb7a82bddfc1c56d2f9dba849aecd1f";
-  };
-  buildInputs = [libxml2];
-}
diff --git a/pkgs/development/libraries/openssl-0.9.8/builder.sh b/pkgs/development/libraries/openssl-0.9.8/builder.sh
deleted file mode 100644
index 1004d279a51..00000000000
--- a/pkgs/development/libraries/openssl-0.9.8/builder.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-source $stdenv/setup
-
-configureScript=./config
-configureFlags=shared
-
-postInstall=postInstall
-postInstall() {
-    # Bug fix: openssl does a `chmod 644' on the pkgconfig directory.
-    chmod 755 $out/lib/pkgconfig || exit 1
-}
-
-genericBuild
diff --git a/pkgs/development/libraries/openssl-0.9.8/default.nix b/pkgs/development/libraries/openssl-0.9.8/default.nix
deleted file mode 100644
index da0b88e98c2..00000000000
--- a/pkgs/development/libraries/openssl-0.9.8/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, perl}: stdenv.mkDerivation {
-  name = "openssl-0.9.8";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/openssl-0.9.8.tar.gz;
-    md5 = "9da21071596a124acde6080552deac16";
-  };
-  buildInputs = [perl];
-
-  # Quick fix for a Makefile bug in openssl-0.9.8 (`make install'
-  # tries to copy .so files, instead of .dylib files).
-  patches = if stdenv.isDarwin then [./dylib.patch] else [];
-}
diff --git a/pkgs/development/libraries/openssl-0.9.8/dylib.patch b/pkgs/development/libraries/openssl-0.9.8/dylib.patch
deleted file mode 100644
index ee3e31d4571..00000000000
--- a/pkgs/development/libraries/openssl-0.9.8/dylib.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -rc openssl-0.9.8-orig/engines/Makefile openssl-0.9.8/engines/Makefile
-*** openssl-0.9.8-orig/engines/Makefile	2005-06-28 11:10:18.000000000 +0200
---- openssl-0.9.8/engines/Makefile	2005-07-13 13:19:09.000000000 +0200
-***************
-*** 91,102 ****
-  		for l in $(LIBNAMES); do \
-  			( echo installing $$l; \
-  			  if [ "$(PLATFORM)" != "Cygwin" ]; then \
-! 				  cp lib$$l.so $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.so.new; \
-  			  else \
-! 				  cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.so.new; \
-  			  fi; \
-! 			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.so.new; \
-! 			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.so.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.so ); \
-  		done; \
-  	fi
-  
---- 91,102 ----
-  		for l in $(LIBNAMES); do \
-  			( echo installing $$l; \
-  			  if [ "$(PLATFORM)" != "Cygwin" ]; then \
-! 				  cp lib$$l.dylib $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.dylib.new; \
-  			  else \
-! 				  cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.dylib.new; \
-  			  fi; \
-! 			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.dylib.new; \
-! 			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.dylib.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.dylib ); \
-  		done; \
-  	fi
-  
diff --git a/pkgs/development/libraries/sqlite-3.3/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 18c6db545df..18c6db545df 100644
--- a/pkgs/development/libraries/sqlite-3.3/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
diff --git a/pkgs/development/libraries/toolbuslib/test.nix b/pkgs/development/libraries/toolbuslib/test.nix
deleted file mode 100644
index 53f968725d8..00000000000
--- a/pkgs/development/libraries/toolbuslib/test.nix
+++ /dev/null
@@ -1 +0,0 @@
-(import ../../../../pkgs/system/i686-linux.nix).toolbuslib
diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index ee92b01c0f8..90adb1a9f2a 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -1 +1,8 @@
-import ./m4-1.4.7.nix
+{stdenv, fetchurl}:
+stdenv.mkDerivation {
+  name = "gnum4-1.4.7";
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/m4-1.4.7.tar.bz2;
+    md5 = "0115a354217e36ca396ad258f6749f51";
+  };
+}
diff --git a/pkgs/development/tools/misc/gnum4/m4-1.4.7.nix b/pkgs/development/tools/misc/gnum4/m4-1.4.7.nix
deleted file mode 100644
index 90adb1a9f2a..00000000000
--- a/pkgs/development/tools/misc/gnum4/m4-1.4.7.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{stdenv, fetchurl}:
-stdenv.mkDerivation {
-  name = "gnum4-1.4.7";
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/m4-1.4.7.tar.bz2;
-    md5 = "0115a354217e36ca396ad258f6749f51";
-  };
-}
diff --git a/pkgs/development/tools/misc/swig/swig-1.3.29.nix b/pkgs/development/tools/misc/swig/swig-1.3.29.nix
deleted file mode 100644
index 6fd4bcb4d68..00000000000
--- a/pkgs/development/tools/misc/swig/swig-1.3.29.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ perlSupport, pythonSupport, javaSupport
-, stdenv, fetchurl, perl ? null, python ? null, jdk ? null}:
-
-assert perlSupport -> perl != null;
-assert pythonSupport -> python != null;
-assert javaSupport -> jdk != null;
-
-stdenv.mkDerivation {
-  name = "swig-1.3.29";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/swig-1.3.29.tar.gz;
-    md5 = "44c6f6d8d724cf7fa4a5109e6f63c9b1";
-  };
-
-  inherit perlSupport pythonSupport javaSupport;
-
-  perl = if perlSupport then perl else null;
-  python = if pythonSupport then python else null;
-  jdk = if javaSupport then jdk else null;
-}
diff --git a/pkgs/development/tools/parsing/asc-support/asc-support-1.8.nix b/pkgs/development/tools/parsing/asc-support/asc-support-1.8.nix
deleted file mode 100644
index ec173ba86fd..00000000000
--- a/pkgs/development/tools/parsing/asc-support/asc-support-1.8.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, aterm, toolbuslib, ptsupport, asfsupport}:
-
-stdenv.mkDerivation {
-  name = "asc-support-1.8";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/asc-support-1.8.tar.gz;
-    md5 = "e85a790c6004dfb974d79fc9699f69f4";
-  };
-  inherit stdenv aterm ptsupport toolbuslib asfsupport;
-  buildInputs = [stdenv aterm ptsupport toolbuslib asfsupport];
-}
diff --git a/pkgs/development/tools/parsing/asc-support/asc-support-1.9.nix b/pkgs/development/tools/parsing/asc-support/asc-support-1.9.nix
deleted file mode 100644
index 4aa1c92d080..00000000000
--- a/pkgs/development/tools/parsing/asc-support/asc-support-1.9.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, aterm, toolbuslib, ptsupport, asfsupport, errorsupport, sglr}:
-
-stdenv.mkDerivation {
-  name = "asc-support-1.9";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/asc-support-1.9.tar.gz;
-    md5 = "0c395efec4d3b582af016ab03306ed0a";
-  };
-  inherit stdenv aterm ptsupport toolbuslib asfsupport errorsupport sglr;
-  buildInputs = [stdenv aterm ptsupport toolbuslib asfsupport errorsupport sglr];
-}
diff --git a/pkgs/development/tools/parsing/asc-support/asc-support-2.0.nix b/pkgs/development/tools/parsing/asc-support/asc-support-2.0.nix
deleted file mode 100644
index de23398cccb..00000000000
--- a/pkgs/development/tools/parsing/asc-support/asc-support-2.0.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, aterm, toolbuslib, ptsupport, asfsupport, errorsupport, sglr}:
-
-stdenv.mkDerivation {
-  name = "asc-support-2.0";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/asc-support-2.0.tar.gz;
-    md5 = "34368ca79e524157bf6e89281371cb5a";
-  };
-  inherit stdenv aterm ptsupport toolbuslib asfsupport errorsupport sglr;
-  buildInputs = [stdenv aterm ptsupport toolbuslib asfsupport errorsupport sglr];
-}
diff --git a/pkgs/development/tools/parsing/asc-support/builder.sh b/pkgs/development/tools/parsing/asc-support/builder.sh
deleted file mode 100644
index c3167b6c1f3..00000000000
--- a/pkgs/development/tools/parsing/asc-support/builder.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-source $stdenv/setup
-configureFlags="--with-aterm=$aterm --with-toolbuslib=$toolbuslib --with-pt-support=$ptsupport --with-asf-support=$asfsupport"
-genericBuild
\ No newline at end of file
diff --git a/pkgs/development/tools/parsing/asf-library/asf-library-1.0.nix b/pkgs/development/tools/parsing/asf-library/asf-library-1.0.nix
deleted file mode 100644
index c577d07db07..00000000000
--- a/pkgs/development/tools/parsing/asf-library/asf-library-1.0.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "asf-library-1.0";
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/asf-library-1.0.tar.gz;
-    md5 = "e531f78941e2d2dab1b87a56522e9fb5";
-  };
-}
-
diff --git a/pkgs/development/tools/parsing/asf-library/asf-library-1.1.nix b/pkgs/development/tools/parsing/asf-library/asf-library-1.1.nix
deleted file mode 100644
index 6344b3a47ac..00000000000
--- a/pkgs/development/tools/parsing/asf-library/asf-library-1.1.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "asf-library-1.1";
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/asf-library-1.1.tar.gz;
-    md5 = "09b2ccbd115434cedb180e5575d0fa98";
-  };
-}
-
diff --git a/pkgs/development/tools/parsing/asf-support/asf-support-1.2.nix b/pkgs/development/tools/parsing/asf-support/asf-support-1.2.nix
deleted file mode 100644
index fbbf8b69ce7..00000000000
--- a/pkgs/development/tools/parsing/asf-support/asf-support-1.2.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, aterm, ptsupport}:
-
-stdenv.mkDerivation {
-  name = "asf-support-1.2";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/asf-support-1.2.tar.gz;
-    md5 = "f32de4c97e62486b67e0af4408585980";
-  };
-  inherit stdenv aterm ptsupport;
-  buildInputs = [stdenv aterm ptsupport];
-}
diff --git a/pkgs/development/tools/parsing/asf-support/asf-support-1.3.nix b/pkgs/development/tools/parsing/asf-support/asf-support-1.3.nix
deleted file mode 100644
index a0cd69f15dd..00000000000
--- a/pkgs/development/tools/parsing/asf-support/asf-support-1.3.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, aterm, ptsupport, errorsupport}:
-
-stdenv.mkDerivation {
-  name = "asf-support-1.3";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/asf-support-1.3.tar.gz;
-    md5 = "23539387ff9b0423c1c1933a8ff75d27";
-  };
-  inherit stdenv aterm ptsupport errorsupport;
-  buildInputs = [stdenv aterm ptsupport errorsupport];
-}
diff --git a/pkgs/development/tools/parsing/asf-support/asf-support-1.4.nix b/pkgs/development/tools/parsing/asf-support/asf-support-1.4.nix
deleted file mode 100644
index 4bb2c3d5c66..00000000000
--- a/pkgs/development/tools/parsing/asf-support/asf-support-1.4.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, aterm, ptsupport, errorsupport}:
-
-stdenv.mkDerivation {
-  name = "asf-support-1.4";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/asf-support-1.4.tar.gz;
-    md5 = "520ea7d73094346d3010187f22927870";
-  };
-  inherit stdenv aterm ptsupport errorsupport;
-  buildInputs = [stdenv aterm ptsupport errorsupport];
-}
diff --git a/pkgs/development/tools/parsing/asf-support/builder.sh b/pkgs/development/tools/parsing/asf-support/builder.sh
deleted file mode 100644
index ae812d4aee2..00000000000
--- a/pkgs/development/tools/parsing/asf-support/builder.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-source $stdenv/setup
-configureFlags="--with-aterm=$aterm --with-pt-support=$ptsupport"
-genericBuild
-
-
diff --git a/pkgs/development/tools/parsing/error-support/builder.sh b/pkgs/development/tools/parsing/error-support/builder.sh
deleted file mode 100644
index b0927b28dbf..00000000000
--- a/pkgs/development/tools/parsing/error-support/builder.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-source $stdenv/setup
-configureFlags="--with-aterm=$aterm --with-toolbuslib=$toolbuslib"
-genericBuild
diff --git a/pkgs/development/tools/parsing/error-support/error-support-0.1.1.nix b/pkgs/development/tools/parsing/error-support/error-support-0.1.1.nix
deleted file mode 100644
index 13142d6ff21..00000000000
--- a/pkgs/development/tools/parsing/error-support/error-support-0.1.1.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, aterm, toolbuslib}: 
-
-stdenv.mkDerivation {
-  name = "error-support-0.1.1";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/error-support-0.1.1.tar.gz;
-    md5 = "ebd0965e29ee22508a189477b1dae12b";
-  };
-  inherit aterm toolbuslib;
-  buildInputs = [aterm toolbuslib];
-}
diff --git a/pkgs/development/tools/parsing/error-support/error-support-0.1.nix b/pkgs/development/tools/parsing/error-support/error-support-0.1.nix
deleted file mode 100644
index 53c223f3eaf..00000000000
--- a/pkgs/development/tools/parsing/error-support/error-support-0.1.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, aterm, toolbuslib}: 
-
-stdenv.mkDerivation {
-  name = "error-support-0.1";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/error-support-0.1.tar.gz;
-    md5 = "906389fd8b44bf2847d8281450d5a701";
-  };
-  inherit aterm toolbuslib;
-  buildInputs = [aterm toolbuslib];
-}
diff --git a/pkgs/development/tools/parsing/pgen/builder.sh b/pkgs/development/tools/parsing/pgen/builder.sh
deleted file mode 100644
index cdb1271466e..00000000000
--- a/pkgs/development/tools/parsing/pgen/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source $stdenv/setup
-configureFlags="--with-aterm=$aterm \
-                --with-toolbuslib=$toolbuslib \
-                --with-pt-support=$ptsupport \
-                --with-sdf-support=$sdfsupport \
-                --with-asf-support=$asfsupport \
-                --with-asc-support=$asfsupport \
-                --with-sglr=$sglr"
-genericBuild
diff --git a/pkgs/development/tools/parsing/pgen/pgen-2.0.nix b/pkgs/development/tools/parsing/pgen/pgen-2.0.nix
deleted file mode 100644
index 571efd4f2d4..00000000000
--- a/pkgs/development/tools/parsing/pgen/pgen-2.0.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, getopt, fetchurl, aterm, toolbuslib, ptsupport, sdfsupport, asfsupport, ascsupport, sglr}:
-
-stdenv.mkDerivation {
-  name = "pgen-2.0";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/pgen-2.0.tar.gz;
-    md5 = "368cd8abeed29591a35660d8cea79975";
-  };
-  inherit        aterm toolbuslib ptsupport sdfsupport asfsupport ascsupport sglr;
-  buildInputs = [aterm toolbuslib ptsupport sdfsupport asfsupport ascsupport sglr];
-  propagatedBuildInputs = [getopt];
-}
diff --git a/pkgs/development/tools/parsing/pgen/pgen-2.1.nix b/pkgs/development/tools/parsing/pgen/pgen-2.1.nix
deleted file mode 100644
index eafa402a49f..00000000000
--- a/pkgs/development/tools/parsing/pgen/pgen-2.1.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, getopt, fetchurl, aterm, toolbuslib, ptsupport, sdfsupport, asfsupport, ascsupport, errorsupport, sglr}:
-
-stdenv.mkDerivation {
-  name = "pgen-2.1";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/pgen-2.1.tar.gz;
-    md5 = "3fd46ae1ddc891a488f74350d7b477f9";
-  };
-  inherit        aterm toolbuslib ptsupport sdfsupport asfsupport ascsupport errorsupport sglr;
-  buildInputs = [aterm toolbuslib ptsupport sdfsupport asfsupport ascsupport errorsupport sglr];
-  propagatedBuildInputs = [getopt];
-}
diff --git a/pkgs/development/tools/parsing/pgen/pgen-2.2.nix b/pkgs/development/tools/parsing/pgen/pgen-2.2.nix
deleted file mode 100644
index 8f803a8072d..00000000000
--- a/pkgs/development/tools/parsing/pgen/pgen-2.2.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, getopt, fetchurl, aterm, toolbuslib, ptsupport, sdfsupport, asfsupport, ascsupport, errorsupport, sglr}:
-
-stdenv.mkDerivation {
-  name = "pgen-2.2";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/pgen-2.2.tar.gz;
-    md5 = "e23323a96d7b1f72a0e10673fa93ef7c";
-  };
-  inherit        aterm toolbuslib ptsupport sdfsupport asfsupport ascsupport errorsupport sglr;
-  buildInputs = [aterm toolbuslib ptsupport sdfsupport asfsupport ascsupport errorsupport sglr];
-  propagatedBuildInputs = [getopt];
-}
diff --git a/pkgs/development/tools/parsing/pt-support/builder.sh b/pkgs/development/tools/parsing/pt-support/builder.sh
deleted file mode 100644
index b0927b28dbf..00000000000
--- a/pkgs/development/tools/parsing/pt-support/builder.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-source $stdenv/setup
-configureFlags="--with-aterm=$aterm --with-toolbuslib=$toolbuslib"
-genericBuild
diff --git a/pkgs/development/tools/parsing/pt-support/pt-support-1.0.nix b/pkgs/development/tools/parsing/pt-support/pt-support-1.0.nix
deleted file mode 100644
index 3961db6be5a..00000000000
--- a/pkgs/development/tools/parsing/pt-support/pt-support-1.0.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, aterm, toolbuslib}: 
-
-stdenv.mkDerivation {
-  name = "pt-support-1.0";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/pt-support-1.0.tar.gz;
-    md5 = "cc96dc2bfbaf3f218dfe9a0b8bb4d801";
-  };
-  inherit aterm toolbuslib;
-  buildInputs = [aterm toolbuslib];
-}
diff --git a/pkgs/development/tools/parsing/pt-support/pt-support-1.1.nix b/pkgs/development/tools/parsing/pt-support/pt-support-1.1.nix
deleted file mode 100644
index 8c2c3037a8d..00000000000
--- a/pkgs/development/tools/parsing/pt-support/pt-support-1.1.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, aterm, toolbuslib, errorsupport}: 
-
-stdenv.mkDerivation {
-  name = "pt-support-1.1";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/pt-support-1.1.tar.gz;
-    md5 = "51bad46427c7cf95d029c33f079581ff";
-  };
-  inherit aterm toolbuslib errorsupport;
-  buildInputs = [aterm toolbuslib errorsupport];
-}
diff --git a/pkgs/development/tools/parsing/pt-support/pt-support-1.2.nix b/pkgs/development/tools/parsing/pt-support/pt-support-1.2.nix
deleted file mode 100644
index 6a605fe1d2d..00000000000
--- a/pkgs/development/tools/parsing/pt-support/pt-support-1.2.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, aterm, toolbuslib, errorsupport}: 
-
-stdenv.mkDerivation {
-  name = "pt-support-1.2";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/pt-support-1.2.tar.gz;
-    md5 = "2ba2fa388130b11b9b91970ebe20c1c7";
-  };
-  inherit aterm toolbuslib errorsupport;
-  buildInputs = [aterm toolbuslib errorsupport];
-}
diff --git a/pkgs/development/tools/parsing/sdf-support/builder.sh b/pkgs/development/tools/parsing/sdf-support/builder.sh
deleted file mode 100644
index 356a2b816b0..00000000000
--- a/pkgs/development/tools/parsing/sdf-support/builder.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-source $stdenv/setup
-configureFlags="--with-aterm=$aterm --with-toolbuslib=$toolbuslib --with-pt-support=$ptsupport"
-genericBuild
diff --git a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.0.nix b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.0.nix
deleted file mode 100644
index dfd05e79ad4..00000000000
--- a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.0.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, aterm, toolbuslib, ptsupport}:
-
-stdenv.mkDerivation {
-  name = "sdf-support-2.0";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/sdf-support-2.0.tar.gz;
-    md5 = "2987b89ed1d73e34e128b895ff44264c";
-  };
-  inherit stdenv aterm ptsupport toolbuslib;
-  buildInputs = [stdenv aterm ptsupport toolbuslib];
-}
diff --git a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.1.nix b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.1.nix
deleted file mode 100644
index 582d5806d0f..00000000000
--- a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.1.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, aterm, toolbuslib, ptsupport, errorsupport}:
-
-stdenv.mkDerivation {
-  name = "sdf-support-2.1.1";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/sdf-support-2.1.1.tar.gz;
-    md5 = "28b2c044ee711d6c5f22772b7dfafb76";
-  };
-  inherit stdenv aterm ptsupport toolbuslib errorsupport;
-  buildInputs = [stdenv aterm ptsupport toolbuslib errorsupport];
-}
diff --git a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.nix b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.nix
deleted file mode 100644
index 94588e27fe6..00000000000
--- a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, aterm, toolbuslib, ptsupport, errorsupport}:
-
-stdenv.mkDerivation {
-  name = "sdf-support-2.1";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/sdf-support-2.1.tar.gz;
-    md5 = "dbb1d3c51a82dadfaaf5319dba5cc9ef";
-  };
-  inherit stdenv aterm ptsupport toolbuslib errorsupport;
-  buildInputs = [stdenv aterm ptsupport toolbuslib errorsupport];
-}
diff --git a/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.3.1.nix b/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.3.1.nix
deleted file mode 100644
index a2120ed000d..00000000000
--- a/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.3.1.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, aterm, getopt, pkgconfig}:
-
-stdenv.mkDerivation {
-  name = "sdf2-bundle-2.3.1";
-  src = fetchurl {
-    url = ftp://ftp.stratego-language.org/pub/stratego/sdf2/sdf2-bundle-2.3.1/sdf2-bundle-2.3.1.tar.gz;
-    md5 = "4576b0b5315dccae8b038c53305c6979";
-  };
-
-  buildInputs = [aterm pkgconfig];
-  propagatedBuildInputs = [getopt];
-}
diff --git a/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.3.2.nix b/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.3.2.nix
deleted file mode 100644
index 4a1088d0a05..00000000000
--- a/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.3.2.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, aterm, getopt, pkgconfig}:
-
-stdenv.mkDerivation {
-  name = "sdf2-bundle-2.3.2";
-  src = fetchurl {
-    url = ftp://ftp.stratego-language.org/pub/stratego/sdf2/sdf2-bundle-2.3.2/sdf2-bundle-2.3.2.tar.gz;
-    md5 = "f548251570a903a7d26de50533ff0c9c";
-  };
-
-  buildInputs = [aterm pkgconfig];
-  propagatedBuildInputs = [getopt];
-}
diff --git a/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.3.nix b/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.3.nix
deleted file mode 100644
index f33c50a394a..00000000000
--- a/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.3.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, aterm, getopt}:
-
-stdenv.mkDerivation {
-  name = "sdf2-bundle-2.3";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = ftp://ftp.stratego-language.org/pub/stratego/sdf2/sdf2-bundle-2.3/sdf2-bundle-2.3.tar.gz;
-    md5 = "79e305c2bdb2a5627719c890fb050bfa";
-  };
-
-  buildInputs = [aterm];
-  propagatedBuildInputs = [getopt];
-  inherit aterm;
-}
diff --git a/pkgs/development/tools/parsing/sglr/builder.sh b/pkgs/development/tools/parsing/sglr/builder.sh
deleted file mode 100644
index 356a2b816b0..00000000000
--- a/pkgs/development/tools/parsing/sglr/builder.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-source $stdenv/setup
-configureFlags="--with-aterm=$aterm --with-toolbuslib=$toolbuslib --with-pt-support=$ptsupport"
-genericBuild
diff --git a/pkgs/development/tools/parsing/sglr/sglr-3.10.2.nix b/pkgs/development/tools/parsing/sglr/sglr-3.10.2.nix
deleted file mode 100644
index 6415ac89cf7..00000000000
--- a/pkgs/development/tools/parsing/sglr/sglr-3.10.2.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, aterm, toolbuslib, ptsupport}:
-
-stdenv.mkDerivation {
-  name = "sglr-3.10.2";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/sglr-3.10.2.tar.gz;
-    md5 = "39aa609be84115d7ddc56a6c74b792b7";
-  };
-  inherit stdenv aterm ptsupport toolbuslib;
-  buildInputs = [stdenv aterm ptsupport toolbuslib];
-}
diff --git a/pkgs/development/tools/parsing/sglr/sglr-3.11.nix b/pkgs/development/tools/parsing/sglr/sglr-3.11.nix
deleted file mode 100644
index 5ae6f946a11..00000000000
--- a/pkgs/development/tools/parsing/sglr/sglr-3.11.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, aterm, toolbuslib, ptsupport, errorsupport}:
-
-stdenv.mkDerivation {
-  name = "sglr-3.11";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/sglr-3.11.tar.gz;
-    md5 = "c60536c7e967e93d1ec2cd9c8ae0a4ae";
-  };
-  inherit stdenv aterm ptsupport toolbuslib errorsupport;
-  buildInputs = [stdenv aterm ptsupport toolbuslib errorsupport];
-}
diff --git a/pkgs/development/tools/parsing/sglr/sglr-3.12.nix b/pkgs/development/tools/parsing/sglr/sglr-3.12.nix
deleted file mode 100644
index f385a876107..00000000000
--- a/pkgs/development/tools/parsing/sglr/sglr-3.12.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, aterm, toolbuslib, ptsupport, errorsupport}:
-
-stdenv.mkDerivation {
-  name = "sglr-3.12";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/sglr-3.12.tar.gz;
-    md5 = "053753e419adfc337c4776412e3787ab";
-  };
-  inherit stdenv aterm ptsupport toolbuslib errorsupport;
-  buildInputs = [stdenv aterm ptsupport toolbuslib errorsupport];
-}
diff --git a/pkgs/development/tools/parsing/sglr/sglr-3.14.nix b/pkgs/development/tools/parsing/sglr/sglr-3.14.nix
deleted file mode 100644
index 3b92926943d..00000000000
--- a/pkgs/development/tools/parsing/sglr/sglr-3.14.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, aterm, toolbuslib, ptsupport, errorsupport}:
-
-stdenv.mkDerivation {
-  name = "sglr-3.14";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/sglr-3.14.tar.gz;
-    md5 = "c63d2ef0015f5cf2c7cf996d33700dfc";
-  };
-  inherit stdenv aterm ptsupport toolbuslib errorsupport;
-  buildInputs = [stdenv aterm ptsupport toolbuslib errorsupport];
-}
diff --git a/pkgs/tools/misc/coreutils/coreutils-6.3.nix b/pkgs/tools/misc/coreutils/coreutils-6.3.nix
deleted file mode 100644
index cfbf1afbb91..00000000000
--- a/pkgs/tools/misc/coreutils/coreutils-6.3.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "coreutils-6.3";
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/coreutils-6.3.tar.bz2;
-    md5 = "065e9662c5aa2694693910ca9e6c9ec8";
-  };
-}
diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix
index ed9de85fcbc..d8e8bb9ab62 100644
--- a/pkgs/tools/misc/getopt/default.nix
+++ b/pkgs/tools/misc/getopt/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "getopt-1.1.3";
+  name = "getopt-1.1.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/getopt-1.1.3.tar.gz;
-    md5 = "7b7637dcb0ac531f1af29f4d6b018e86";
+    url = http://nix.cs.uu.nl/dist/tarballs/getopt-1.1.4.tar.gz;
+    md5 = "02188ca68da27c4175d6e9f3da732101";
   };
 }
diff --git a/pkgs/tools/misc/getopt/getopt-1.1.4.nix b/pkgs/tools/misc/getopt/getopt-1.1.4.nix
deleted file mode 100644
index d8e8bb9ab62..00000000000
--- a/pkgs/tools/misc/getopt/getopt-1.1.4.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "getopt-1.1.4";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/getopt-1.1.4.tar.gz;
-    md5 = "02188ca68da27c4175d6e9f3da732101";
-  };
-}
diff --git a/pkgs/tools/networking/openssh/openssh-4.3p2.nix b/pkgs/tools/networking/openssh/openssh-4.3p2.nix
deleted file mode 100644
index cae587a9f67..00000000000
--- a/pkgs/tools/networking/openssh/openssh-4.3p2.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{stdenv, fetchurl, zlib, openssl, xforwarding ? false, xauth ? null}:
-
-assert xforwarding -> xauth != null;
- 
-stdenv.mkDerivation {
-  name = "openssh-4.3p2";
- 
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/openssh-4.3p2.tar.gz;
-    md5 = "7e9880ac20a9b9db0d3fea30a9ff3d46";
-  };
- 
-  buildInputs = [zlib openssl
-  (if xforwarding then xauth else null)
-  ];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7494980eba..27b4e6a90b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1502,10 +1502,6 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  sqlite3 = (import ../development/libraries/sqlite-3.3) {
-      inherit stdenv fetchurl;
-  };
-
   sysPerl = (import ../development/interpreters/sys-perl) {
     inherit stdenv;
   };
@@ -2816,10 +2812,8 @@ rec {
   };
 
   trac = (import ../misc/trac) {
-    inherit stdenv fetchurl python clearsilver makeWrapper;
+    inherit stdenv fetchurl python clearsilver makeWrapper sqlite;
 
-    sqlite = sqlite3;
-    
     subversion = (import ../applications/version-management/subversion-1.3.x) {
       inherit fetchurl stdenv openssl db4 expat jdk swig zlib;
       localServer = true;
@@ -2831,8 +2825,7 @@ rec {
     };
 
     pysqlite = (import ../development/libraries/pysqlite) {
-      inherit stdenv fetchurl python substituter;
-      sqlite = sqlite3;
+      inherit stdenv fetchurl python substituter sqlite;
     };
   };