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

Merge branch 'master' into x-updates

Browse Source 
Conflicts (a little tricky, I did some cleanup of interacting changes):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/tools/package-management/nixops/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Vladimír Čunát
2013-08-02 18:30:53 +02:00
parent d239d24a89 4fb87e91ff
commit 625f40151b
829 changed files with 16817 additions and 13395 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libpng/default.nix
+17 -6
View File
@@ -1,15 +1,26 @@
{ stdenv, fetchurl, zlib }:
{ stdenv, fetchurl, zlib, apngSupport ? false }:
assert zlib != null;
stdenv.mkDerivation rec {
name = "libpng-1.6.3";
let
version = "1.6.3";
sha256 = "0i8gz8mbkygc0ny7aa2i2wiavysxy6fdaphl52l49fb3hv9w1v65";
patch_src = fetchurl {
url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
sha256 = "0fjnb6cgbj2c7ggl0qzcnliml2ylrjxzigp89vw0hxq221k5mlsx";
};
whenPatched = stdenv.lib.optionalString apngSupport;
in stdenv.mkDerivation rec {
name = "libpng" + whenPatched "-apng" + "-${version}";
src = fetchurl {
url = "mirror://sourceforge/libpng/${name}.tar.xz";
sha256 = "0i8gz8mbkygc0ny7aa2i2wiavysxy6fdaphl52l49fb3hv9w1v65";
url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
inherit sha256;
};
postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1";
propagatedBuildInputs = [ zlib ];
doCheck = true;
@@ -17,7 +28,7 @@ stdenv.mkDerivation rec {
passthru = { inherit zlib; };
meta = {
description = "The official reference implementation for the PNG file format";
description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch";
homepage = http://www.libpng.org/pub/png/libpng.html;
license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
platforms = stdenv.lib.platforms.all;
pkgs/development/libraries/libpng/libpng-apng.nix
-30
View File
@@ -1,30 +0,0 @@
{ stdenv, fetchurl, zlib }:
stdenv.mkDerivation rec {
version = "1.5.14";
name = "libpng-apng-${version}";
patch_src = fetchurl {
url = "mirror://sourceforge/libpng-apng/libpng15/${version}/libpng-${version}-apng.patch.gz";
sha256 = "1vcqbkdssy4srm8jqyzaipdc70xzanilqssypmwqyngp8ph0m45p";
};
src = fetchurl {
url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
sha256 = "0m3vz3gig7s63zanq5b1dgb5ph12qm0cylw4g4fbxlsq3f74hn8l";
};
preConfigure = ''
gunzip < ${patch_src} | patch -Np1
'';
propagatedBuildInputs = [ zlib ];
passthru = { inherit zlib; };
meta = {
description = "The official reference implementation for the PNG file format with animation patch";
homepage = http://www.libpng.org/pub/png/libpng.html;
license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
};
}