Author: eelco
Date: Tue May 15 16:34:07 2012
New Revision: 34114
URL: https://nixos.org/websvn/nix/?rev=34114&sc=1
Log:
* Make file 5.11 the default.
Replaced:
nixpkgs/branches/stdenv-updates/pkgs/tools/misc/file/default.nix
- copied unchanged from r34113,
nixpkgs/branches/stdenv-updates/pkgs/tools/misc/file/511.nix
Deleted:
nixpkgs/branches/stdenv-updates/pkgs/tools/misc/file/511.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix
Copied: nixpkgs/branches/stdenv-updates/pkgs/tools/misc/file/default.nix (from
r34113, nixpkgs/branches/stdenv-updates/pkgs/tools/misc/file/511.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/stdenv-updates/pkgs/tools/misc/file/default.nix Tue May
15 16:34:07 2012 (r34114, copy of r34113,
nixpkgs/branches/stdenv-updates/pkgs/tools/misc/file/511.nix)
@@ -0,0 +1,17 @@
+{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";;
+ };
+}
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Tue May
15 16:12:22 2012 (r34113)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Tue May
15 16:34:07 2012 (r34114)
@@ -674,7 +674,6 @@
figlet = callPackage ../tools/misc/figlet { };
file = callPackage ../tools/misc/file { };
- file511 = callPackage ../tools/misc/file/511.nix { };
fileschanged = callPackage ../tools/misc/fileschanged { };
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix Tue May
15 16:12:22 2012 (r34113)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix Tue May
15 16:34:07 2012 (r34114)
@@ -74,7 +74,7 @@
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 @@
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";
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
