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

Merge 'staging' into closure-size

Browse Source 
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
This commit is contained in:
Vladimír Čunát
2015-04-18 11:22:20 +02:00
parent 2990145170 9de9669496
commit bf414c9d4f
6303 changed files with 375444 additions and 91358 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libpng/12.nix
+3 -1
View File
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
meta = {
description = "The official reference implementation for the PNG file format";
homepage = http://www.libpng.org/pub/png/libpng.html;
license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
license = stdenv.lib.licenses.libpng;
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
branch = "1.2";
};
}
pkgs/development/libraries/libpng/15.nix
+5 -3
View File
@@ -3,11 +3,11 @@
assert zlib != null;
stdenv.mkDerivation rec {
name = "libpng-1.5.18";
name = "libpng-1.5.19";
src = fetchurl {
url = "mirror://sourceforge/libpng/${name}.tar.xz";
sha256 = "119m71p60iq3yn2n8ckl4j4cxvbpddj6sgdpa6g05jzyg7vw54y0";
sha256 = "1s990cdsdlbb78aq4sj2vq2849p2nbbbnbk5p8f9w45rn0v5q98y";
};
propagatedBuildInputs = [ zlib ];
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
meta = {
description = "The official reference implementation for the PNG file format";
homepage = http://www.libpng.org/pub/png/libpng.html;
license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
license = stdenv.lib.licenses.libpng;
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
branch = "1.5";
};
}
pkgs/development/libraries/libpng/default.nix
+5 -5
View File
@@ -3,11 +3,11 @@
assert zlib != null;
let
version = "1.6.13";
sha256 = "09g631h1f1xvrdiy36mh1034r9w46damp9jcg7nm507wlmacxj6r";
version = "1.6.16";
sha256 = "0q5ygy15jkpqbj5701ywrjzqp4nl5yz3r4g58h2p0kiycggm9xs2";
patch_src = fetchurl {
url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
sha256 = "017pnxp3zhhlh6mg2yqn5xrb6dcxc5p3dp1kr46p8xx052i0hzqb";
sha256 = "1sf27a5gvwvcm4wsf2pyq87d3g4l2fym8cirq9sli54bi753ikbh";
};
whenPatched = stdenv.lib.optionalString apngSupport;
@@ -35,8 +35,8 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; {
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
license = licenses.libpng;
platforms = platforms.all;
maintainers = [ maintainers.vcunat ];
maintainers = [ maintainers.vcunat maintainers.fuuzetsu ];
};
}