Merge branch 'master' into staging

This commit is contained in:
Vladimír Čunát
2016-01-05 10:28:58 +01:00
161 changed files with 1976 additions and 1690 deletions
+44 -15
View File
@@ -1,33 +1,62 @@
{ stdenv, fetchFromGitHub }:
{ stdenv, fetchFromGitHub, fetchpatch }:
let version = "1.0.1"; in
stdenv.mkDerivation rec {
name = "zopfli-${version}";
version = "1.0.0";
src = fetchFromGitHub {
owner = "google";
repo = "zopfli";
rev = name;
name = "${name}-src";
sha256 = "0r2k3md24y5laslzsph7kh4synm5az4ppv64idrvjk5yh2qwwb62";
sha256 = "1dclll3b5azy79jfb8vhb21drivi7vaay5iw0lzs4lrh6dgyvg6y";
};
patches = [
(fetchpatch {
sha256 = "07z6df1ahx40hnsrcs5mx3fc58rqv8fm0pvyc7gb7kc5mwwghvvp";
name = "Fix-invalid-read-outside-allocated-memory.patch";
url = "https://github.com/google/zopfli/commit/9429e20de3885c0e0d9beac23f703fce58461021.patch";
})
(fetchpatch {
sha256 = "07m8q5kipr84cg8i1l4zd22ai9bmdrblpdrsc96llg7cm51vqdqy";
name = "zopfli-bug-and-typo-fixes.patch";
url = "https://github.com/google/zopfli/commit/7190e08ecac2446c7c9157cfbdb7157b18912a92.patch";
})
];
enableParallelBuilding = true;
buildFlags = [
"zopfli"
"libzopfli"
"zopflipng"
"libzopflipng"
];
installPhase = ''
install -D zopfli $out/bin/zopfli
mkdir -p $out/bin
install -m755 zopfli{,png} $out/bin
mkdir -p $out/lib
install -m755 libzopfli{,png}.so* $out/lib
mkdir -p $out/share/doc/zopfli
install -m644 README* $out/share/doc/zopfli
'';
meta = with stdenv.lib; {
homepage = https://github.com/google/zopfli;
description = "A compression tool to perform very good, but slow, deflate or zlib compression";
longDescription =
''Zopfli Compression Algorithm is a compression library programmed
in C to perform very good, but slow, deflate or zlib compression.
inherit version;
inherit (src.meta) homepage;
description = "Very good, but slow, deflate or zlib compression";
longDescription = ''
Zopfli Compression Algorithm is a compression library programmed
in C to perform very good, but slow, deflate or zlib compression.
This library can only compress, not decompress. Existing zlib or
deflate libraries can decompress the data.
'';
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.asl20;
maintainers = with maintainers; [ bobvanderlinden ];
This library can only compress, not decompress. Existing zlib or
deflate libraries can decompress the data.
'';
platforms = platforms.linux;
license = licenses.asl20;
maintainers = with maintainers; [ bobvanderlinden nckx ];
};
}