From 3fa0cbb01140dd95e1266e283ba695faaa4bbcea Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" <urkud.urkud@gmail.com> Date: Tue, 6 Mar 2012 14:35:37 +0000 Subject: [PATCH] zlib_latest == zlib, so remove zlib/latest.nix svn path=/nixpkgs/trunk/; revision=32828 --- pkgs/development/libraries/zlib/latest.nix | 11 ----------- pkgs/top-level/all-packages.nix | 9 +-------- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 pkgs/development/libraries/zlib/latest.nix diff --git a/pkgs/development/libraries/zlib/latest.nix b/pkgs/development/libraries/zlib/latest.nix deleted file mode 100644 index 1333c9fdfdf3..000000000000 --- a/pkgs/development/libraries/zlib/latest.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 968733e8257d..ec6ac27abf6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4834,9 +4834,6 @@ let 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 @@ let 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 { };