3 files changed, 12 insertions, 17 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];
-}