10 files changed, 32 insertions, 51 deletions
diff --git a/pkgs/development/libraries/aterm/2.4.2-fixes.nix b/pkgs/development/libraries/aterm/2.4.2-fixes.nix
index 7c70afc621b7..de1ea95a247f 100644
--- a/pkgs/development/libraries/aterm/2.4.2-fixes.nix
+++ b/pkgs/development/libraries/aterm/2.4.2-fixes.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "aterm-2.4.2-fixes-r2";
   src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/aterm-2.4.2-fixes-r2.tar.bz2;
+    url = http://nixos.org/tarballs/aterm-2.4.2-fixes-r2.tar.bz2;
     sha256 = "1w3bxdpc2hz29li5ssmdcz3x0fn47r7g62ns0v8nazxwf40vff4j";
   };
   doCheck = true;
diff --git a/pkgs/development/libraries/haskell/wxHaskell/default.nix b/pkgs/development/libraries/haskell/wxHaskell/default.nix
index b482d00fd469..3a2099f54ce4 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/default.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/default.nix
@@ -2,13 +2,21 @@
 
 stdenv.mkDerivation {
   name = "wxHaskell-0.10.1-pre20070124";
+  
   src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/wxhaskell-src-0.10.1-pre20070124.tar.bz2;
+    url = http://nixos.org/tarballs/wxhaskell-src-0.10.1-pre20070124.tar.bz2;
     sha256 = "1cl0yd3blynjslzz05312bzg1dbymmj8pg88bhnr4p3rqxrlmhx9";
   };
+  
   buildInputs = [unzip ghc wxGTK];
-  postInstall = "
+  
+  postInstall = ''
     make wx
     make wx-install
-  ";
+  '';
+
+  meta = {
+    homepage = http://haskell.org/haskellwiki/WxHaskell;
+    description = "A portable and native GUI library for Haskell";
+  };
 }
diff --git a/pkgs/development/libraries/popt/popt-1.10.6.nix b/pkgs/development/libraries/popt/popt-1.10.6.nix
deleted file mode 100644
index f86a7824868a..000000000000
--- a/pkgs/development/libraries/popt/popt-1.10.6.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, gettext, libtool, autoconf, automake}:
-
-assert gettext != null;
-
-stdenv.mkDerivation {
-  builder = ./builder-1.10.6.sh;
-  name = "popt-1.10.6";
-  src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~armijn/.nix/popt-1.10.6.tar.gz;
-    md5 = "130ee632bd4c677d898b0ef5efa67666";
-  };
-  buildInputs = [gettext libtool automake autoconf];
-}
diff --git a/pkgs/games/keen4/default.nix b/pkgs/games/keen4/default.nix
index 603714be3d1c..745d9f6b38ca 100644
--- a/pkgs/games/keen4/default.nix
+++ b/pkgs/games/keen4/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   dist = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/keen4.zip;
+    url = http://nixos.org/tarballs/keen4.zip;
     md5 = "ffcdd9e3bce224d92797166bc3f56f1c";
   };
 
diff --git a/pkgs/games/quake3/demo/default.nix b/pkgs/games/quake3/demo/default.nix
index f3c417aed296..c61ebeba38d0 100644
--- a/pkgs/games/quake3/demo/default.nix
+++ b/pkgs/games/quake3/demo/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+l{stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "quake3demo-1.11-6";
@@ -6,13 +6,13 @@ stdenv.mkDerivation {
 
   # This is needed for pak0.pk3.
   demo = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/linuxq3ademo-1.11-6.x86.gz.sh;
+    url = http://nixos.org/tarballs/linuxq3ademo-1.11-6.x86.gz.sh;
     md5 = "484610c1ce34272223a52ec331c99d5d";
   };
 
   # This is needed for the additional pak?.pk3 files.
   update = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/linuxq3apoint-1.31.x86.run;
+    url = http://nixos.org/tarballs/linuxq3apoint-1.31.x86.run;
     md5 = "2620b9eefb6d0775f766b6570870157a";
   };
 
diff --git a/pkgs/os-specific/linux/mkinitrd/builder.sh b/pkgs/os-specific/linux/mkinitrd/builder.sh
deleted file mode 100644
index 951c0cdc478e..000000000000
--- a/pkgs/os-specific/linux/mkinitrd/builder.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-source $stdenv/setup
-
-export BUILDROOT=$out
-
-genericBuild
diff --git a/pkgs/os-specific/linux/mkinitrd/default.nix b/pkgs/os-specific/linux/mkinitrd/default.nix
deleted file mode 100644
index 2849155af4df..000000000000
--- a/pkgs/os-specific/linux/mkinitrd/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, popt}:
-
-# Red Hat mkinitrd
-
-stdenv.mkDerivation {
-  builder = ./builder.sh;
-  name = "mkinitrd-4.2.15";
-  src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~armijn/.nix/mkinitrd-4.2.15.tar.bz2;
-    md5 = "2f707784c460613357343ab5ce8b3aad";
-  };
-
-  buildInputs = [popt];
-}
diff --git a/pkgs/os-specific/linux/upstart/default.nix b/pkgs/os-specific/linux/upstart/default.nix
index 03a18f9c9610..b35f9c036421 100644
--- a/pkgs/os-specific/linux/upstart/default.nix
+++ b/pkgs/os-specific/linux/upstart/default.nix
@@ -2,11 +2,20 @@
 
 stdenv.mkDerivation {
   name = "upstart-0.3.0";
+  
   src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/upstart-0.3.0.tar.bz2;
+    url = http://nixos.org/tarballs/upstart-0.3.0.tar.bz2;
     md5 = "269046f41c6418225306280044a799eb";
   };
+  
   configureFlags = "--enable-compat";
+  
   patches = [./cfgdir.patch];
+  
   preBuild = "export NIX_CFLAGS_COMPILE=\"$NIX_CFLAGS_COMPILE -DSHELL=\\\"$SHELL\\\"\"";
+
+  meta = {
+    homepage = "http://upstart.ubuntu.com/";
+    description = "An event-based replacement for the /sbin/init daemon";
+  };
 }
diff --git a/pkgs/tools/security/aefs/default.nix b/pkgs/tools/security/aefs/default.nix
index 972d997e2429..8bf52795be2d 100644
--- a/pkgs/tools/security/aefs/default.nix
+++ b/pkgs/tools/security/aefs/default.nix
@@ -4,9 +4,14 @@ stdenv.mkDerivation {
   name = "aefs-0.3pre285";
   
   src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/aefs-0.3pre285.tar.bz2;
+    url = http://nixos.org/tarballs/aefs-0.3pre285.tar.bz2;
     sha256 = "1psciqllzm08c21h6k2zxmvmi0grkvaiq177giv1avzzzfhq0z3c";
   };
 
   buildInputs = [fuse];
+
+  meta = {
+    homepage = http://www.st.ewi.tudelft.nl/~dolstra/aefs/;
+    description = "A cryptographic filesystem implemented in userspace using FUSE";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cb9ab6bd84f6..bae6d97a5489 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3651,10 +3651,6 @@ let
     inherit fetchurl stdenv gettext;
   };
 
-  popt110 = import ../development/libraries/popt/popt-1.10.6.nix {
-    inherit fetchurl stdenv gettext libtool autoconf automake;
-  };
-
   proj = import ../development/libraries/proj.4 {
     inherit fetchurl stdenv;
   };
@@ -6523,11 +6519,6 @@ let
     inherit fetchurl stdenv;
   };
 
-  mkinitrd = import ../os-specific/linux/mkinitrd {
-    inherit fetchurl stdenv;
-    popt = popt110;
-  };
-
   module_init_tools = import ../os-specific/linux/module-init-tools {
     inherit fetchurl stdenv;
   };