JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Make file 5.11 the default.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=34114
This commit is contained in:
Eelco Dolstra 2012-05-15 16:34:07 +00:00
parent 0f4d6b791e
commit 76431dad65
4 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/tools/misc/file/511.nix
View File

@ -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";
};
}

14
pkgs/tools/misc/file/default.nix
View File

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

1
pkgs/top-level/all-packages.nix
View File

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

8
pkgs/top-level/python-packages.nix
View File

@ -74,7 +74,7 @@ let pythonPackages = python.modules // rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/alot \ 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 = { meta = {
@ -846,12 +846,12 @@ let pythonPackages = python.modules // rec {
magic = pkgs.stdenv.mkDerivation 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 ]; patches = [ ../tools/misc/file/python.patch ];
buildInputs = [ python pkgs.file511 ]; buildInputs = [ python pkgs.file ];
configurePhase = "cd python"; configurePhase = "cd python";