Merge commit staging+systemd into closure-size

Many non-conflict problems weren't (fully) resolved in this commit yet.
This commit is contained in:
Vladimír Čunát
2015-10-03 13:33:37 +02:00
6304 changed files with 708451 additions and 130034 deletions
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, nasm, autoreconfHook }:
stdenv.mkDerivation rec {
name = "libjpeg-turbo-1.4.0";
name = "libjpeg-turbo-1.4.2";
src = fetchurl {
url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz";
sha256 = "1vmv5ciqq98gi2ishqbvlx9hsk7sl06lr6xkcgw480jiddadhfnr";
sha256 = "0gi349hp1x7mb98s4mf66sb2xay2kjjxj9ihrriw0yiy0k9va6sj";
};
outputs = [ "dev" "out" "doc" "bin" ];
@@ -21,8 +21,10 @@ stdenv.mkDerivation rec {
homepage = http://libjpeg-turbo.virtualgl.org/;
description = "A faster (using SIMD) libjpeg implementation";
license = licenses.ijg; # and some parts under other BSD-style licenses
platforms = platforms.all;
maintainers = [ maintainers.vcunat ];
# upstream supports darwin (and others), but it doesn't build currently
platforms = platforms.all;
hydraPlatforms = platforms.linux;
};
}