Author: urkud
Date: Tue Mar 6 14:35:37 2012
New Revision: 32828
URL: https://nixos.org/websvn/nix/?rev=32828&sc=1
Log:
zlib_latest == zlib, so remove zlib/latest.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/zlib/latest.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Mar 6 14:35:30
2012 (r32827)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Mar 6 14:35:37
2012 (r32828)
@@ -4834,9 +4834,6 @@
fetchurl = fetchurlBoot;
};
- # To be removed in stdenv-updates; zlib is already fixed and the latest there
- zlib_latest = callPackage ../development/libraries/zlib/latest.nix { };
-
zlibStatic = lowPrio (appendToName "static" (import
../development/libraries/zlib {
inherit fetchurl stdenv;
static = true;
@@ -7479,11 +7476,7 @@
inherit (xlibs) libX11;
};
- vlc = callPackage ../applications/video/vlc {
- # To be removed on stdenv-updates. It fails on i686-linux with
- # the stdenv zlib.
- zlib = zlib_latest;
- };
+ vlc = callPackage ../applications/video/vlc { };
vnstat = callPackage ../applications/networking/vnstat { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
