* Fix various broken URLs / mirrors. 0.13

* Updated tcpdump, ImageMagick, lsof.

svn path=/nixpkgs/trunk/; revision=19847

4 files changed, 18 insertions, 20 deletions

diff --git a/pkgs/development/libraries/glefw/default.nix b/pkgs/development/libraries/glefw/default.nix
index e58244cf818e2..bf4d0f504de68 100644
--- a/pkgs/development/libraries/glefw/default.nix
+++ b/pkgs/development/libraries/glefw/default.nix
@@ -1,9 +1,10 @@
 args: with args;
+
 stdenv.mkDerivation {
   name = "glefw-2.6";
 
   src = fetchurl {
-    url = http://prdownloads.sourceforge.net/glfw/glfw-2.6.tar.bz2;
+    url = mirror://sourceforge/glfw/glfw-2.6.tar.bz2;
     sha256 = "1jnz7szax7410qrkiwkvq34sxy11w46ybyqbkaczdyvqas6cm1hv";
   };
 
@@ -13,6 +14,7 @@ stdenv.mkDerivation {
     ensureDir $out
     make x11-install PREFIX=$out
   '';
+  
   installPhase=":";
 
   meta = { 
diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix
index ff3baabe339a7..d53d011faba49 100644
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@@ -1,18 +1,19 @@
 args: with args;
+
 stdenv.mkDerivation {
   name = "glew-1.5.2";
 
   src = fetchurl {
-    url = http://dfn.dl.sourceforge.net/sourceforge/glew/glew-1.5.2.tgz;
+    url = mirror://sourceforge/glew/glew-1.5.2.tgz;
     sha256 = "0dh5wpfq7aaldkiwcqmm9w59c2qcglkjv8zazmnm8n5771n3caj8";
   };
 
   buildInputs = [mesa x11 libXmu libXi];
 
   meta = { 
-      description = "cross-platform open-source C/C++ extension loading library";
-      homepage = http://glew.sourceforge.net/;
-      license = ["BSD" "GLX" "SGI-B" "GPL2"]; # License description copied from gentoo-1.4.0 
+    description = "cross-platform open-source C/C++ extension loading library";
+    homepage = http://glew.sourceforge.net/;
+    license = ["BSD" "GLX" "SGI-B" "GPL2"]; # License description copied from gentoo-1.4.0 
   };
 
   installPhase="GLEW_DEST=\$out make install";
diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index 5dbbf010be84a..fbd73230d7355 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -1,23 +1,18 @@
-{stdenv, fetchurl, flex, bison}:
+{ stdenv, fetchurl, flex, bison }:
 
 stdenv.mkDerivation rec {
   name = "libpcap-1.0.0";
+  
   src = fetchurl {
-      url = [
-       "mirror://tcpdump/release/${name}.tar.gz"
-       "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz"
-      ];
-      sha256 = "1h3kmj485qz1i08xs4sc3a0bmhs1rvq0h7gycs7paap2szhw8552";
+    url = "http://www.tcpdump.org/release/${name}.tar.gz";
+    sha256 = "1h3kmj485qz1i08xs4sc3a0bmhs1rvq0h7gycs7paap2szhw8552";
   };
-  buildInputs = [flex bison];
-  configureFlags = [
-      "${if stdenv.system == "i686-linux" then "--with-pcap=linux" else ""}"
-       "--with-pcap=linux"
-  ];
+  
+  buildInputs = [ flex bison ];
+  
+  configureFlags = "--with-pcap=linux";
 
   preInstall = ''ensureDir $out/bin'';
-  patches = if stdenv.system == "i686-linux"
-      then []
-      else [ ./libpcap_amd64.patch ];
-
+  
+  patches = [ ./libpcap_amd64.patch ];
 }
diff --git a/pkgs/development/libraries/tk/8.5.7.nix b/pkgs/development/libraries/tk/default.nix
index bf6da7b65982e..bf6da7b65982e 100644
--- a/pkgs/development/libraries/tk/8.5.7.nix
+++ b/pkgs/development/libraries/tk/default.nix