Merge remote-tracking branch 'upstream/master' into hardened-stdenv

This commit is contained in:
Robin Gloster
2016-08-12 09:46:53 +00:00
372 changed files with 7520 additions and 3777 deletions

View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ocaml }:
stdenv.mkDerivation rec {
name = "hevea-2.28";
name = "hevea-2.29";
src = fetchurl {
url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz";
sha256 = "14fns13wlnpiv9i05841kvi3cq4b9v2sw5x3ff6ziws28q701qnd";
sha256 = "1i7qkar6gjpsxqgdm90xxgp15z7gfyja0rn62n23a9aahc0hpgq6";
};
buildInputs = [ ocaml ];

View File

@@ -3,7 +3,7 @@
, zlib, bzip2, ncurses, libpng, flex, bison, libX11, libICE, xproto
, freetype, t1lib, gd, libXaw, icu, ghostscript, ed, libXt, libXpm, libXmu, libXext
, xextproto, perl, libSM, ruby, expat, curl, libjpeg, python, fontconfig, pkgconfig
, poppler, libpaper, graphite2, lesstif, zziplib, harfbuzz, texinfo, potrace, gmp, mpfr
, poppler, libpaper, graphite2, zziplib, harfbuzz, texinfo, potrace, gmp, mpfr
, xpdf, cairo, pixman, xorg, clisp
, makeWrapper
}: