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

zlib_latest == zlib, so remove zlib/latest.nix

Browse Source 
svn path=/nixpkgs/trunk/; revision=32828
This commit is contained in:
Yury G. Kudryashov 2012-03-06 14:35:37 +00:00
parent 614d81046c
commit 3fa0cbb011
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/zlib/latest.nix
View File

@ -1,11 +0,0 @@
{stdenv, fetchurl}:
# To be removed in stdenv-updates, as default.nix is already right there.
stdenv.mkDerivation rec {
name = "zlib-1.2.6";
src = fetchurl {
url = "http://www.zlib.net/${name}.tar.gz";
sha256 = "06x6m33ls1606ni7275q5z392csvh18dgs55kshfnvrfal45w8r1";
};
}

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

@ -4834,9 +4834,6 @@ let
fetchurl = fetchurlBoot; 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 { zlibStatic = lowPrio (appendToName "static" (import ../development/libraries/zlib {
inherit fetchurl stdenv; inherit fetchurl stdenv;
static = true; static = true;
@ -7479,11 +7476,7 @@ let
inherit (xlibs) libX11; inherit (xlibs) libX11;
}; };
vlc = callPackage ../applications/video/vlc { vlc = callPackage ../applications/video/vlc { };
# To be removed on stdenv-updates. It fails on i686-linux with
# the stdenv zlib.
zlib = zlib_latest;
};
vnstat = callPackage ../applications/networking/vnstat { }; vnstat = callPackage ../applications/networking/vnstat { };