* Make file 5.11 the default.

svn path=/nixpkgs/branches/stdenv-updates/; revision=34114

pkgs/tools/misc/file/511.nix

@@ -1,17 +0,0 @@
-{stdenv, fetchurl, zlib}:
- 
-stdenv.mkDerivation rec {
-  name = "file-5.11";
-
-  buildInputs = [ zlib ];
-
-  src = fetchurl {
-    url = "ftp://ftp.astron.com/pub/file/${name}.tar.gz";
-    sha256 = "c70ae29a28c0585f541d5916fc3248c3e91baa481f63d7ccec53d1534cbcc9b7";
-  };
-
-  meta = {
-    description = "A program that shows the type of files";
-    homepage = "http://darwinsys.com/file";
-  };
-}

pkgs/tools/misc/file/default.nix

@@ -1,15 +1,17 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, zlib}:
  
-stdenv.mkDerivation {
-  name = "file-5.04";
+stdenv.mkDerivation rec {
+  name = "file-5.11";
+
+  buildInputs = [ zlib ];
 
   src = fetchurl {
-    url = ftp://ftp.astron.com/pub/file/file-5.04.tar.gz;
-    sha256 = "0316lj3jxmp2g8azv0iykmmwjsnjanq93bklccwb6k77jiwnx7jc";
+    url = "ftp://ftp.astron.com/pub/file/${name}.tar.gz";
+    sha256 = "c70ae29a28c0585f541d5916fc3248c3e91baa481f63d7ccec53d1534cbcc9b7";
   };
 
   meta = {
     description = "A program that shows the type of files";
-    homepage = ftp://ftp.astron.com/pub/file;
+    homepage = "http://darwinsys.com/file";
   };
 }

pkgs/top-level/all-packages.nix

@@ -674,7 +674,6 @@ let
   figlet = callPackage ../tools/misc/figlet { };
 
   file = callPackage ../tools/misc/file { };
-  file511 = callPackage ../tools/misc/file/511.nix { };
 
   fileschanged = callPackage ../tools/misc/fileschanged { };
 

pkgs/top-level/python-packages.nix

@@ -74,7 +74,7 @@ let pythonPackages = python.modules // rec {
 
     postInstall = ''
       wrapProgram $out/bin/alot \
-        --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib:${pkgs.file511}/lib
+        --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib:${pkgs.file}/lib
     '';
 
     meta = {
@@ -846,12 +846,12 @@ let pythonPackages = python.modules // rec {
 
 
   magic = pkgs.stdenv.mkDerivation rec {
-    name = "python-${pkgs.file511.name}";
+    name = "python-${pkgs.file.name}";
 
-    src = pkgs.file511.src;
+    src = pkgs.file.src;
 
     patches = [ ../tools/misc/file/python.patch ];
-    buildInputs = [ python pkgs.file511 ];
+    buildInputs = [ python pkgs.file ];
 
     configurePhase = "cd python";