diff options
| author | Thomas Gerbet <thomas@gerbet.me> | 2021-05-22 09:54:39 +0200 |
|---|---|---|
| committer | Thomas Gerbet <thomas@gerbet.me> | 2021-05-22 09:56:56 +0200 |
| commit | 4c960a02843f6e6515d7d9c6dca75b53b3b189f0 (patch) | |
| tree | d4b614517cac0ac8c8171fd9db32b29f57b72722 /pkgs/tools/typesetting | |
| parent | efee454783c5c14ae78687439077c1d3f0544d97 (diff) | |
| download | nixlib-4c960a02843f6e6515d7d9c6dca75b53b3b189f0.tar nixlib-4c960a02843f6e6515d7d9c6dca75b53b3b189f0.tar.gz nixlib-4c960a02843f6e6515d7d9c6dca75b53b3b189f0.tar.bz2 nixlib-4c960a02843f6e6515d7d9c6dca75b53b3b189f0.tar.lz nixlib-4c960a02843f6e6515d7d9c6dca75b53b3b189f0.tar.xz nixlib-4c960a02843f6e6515d7d9c6dca75b53b3b189f0.tar.zst nixlib-4c960a02843f6e6515d7d9c6dca75b53b3b189f0.zip | |
htmldoc: 1.9.11 -> 1.9.12
Fixes CVE-2021-20308. https://github.com/michaelrsweet/htmldoc/releases/tag/v1.9.12
Diffstat (limited to 'pkgs/tools/typesetting')
| -rw-r--r-- | pkgs/tools/typesetting/htmldoc/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index 740d16c73df3..aaea9090b72e 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -1,20 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, zlib, libpng, SystemConfiguration, Foundation }: +{ lib, stdenv, fetchFromGitHub, zlib, libpng, libjpeg, SystemConfiguration, Foundation, pkg-config }: stdenv.mkDerivation rec { pname = "htmldoc"; - version = "1.9.11"; + version = "1.9.12"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = "htmldoc"; rev = "v${version}"; - sha256 = "0660829zjfdm6vzx14z7gvsfipsb7h0z74gbkyp2ncg3g2432s4n"; + sha256 = "1dqima0g3j301wwzjxdhzk5pvfj724rl615gf8ssxxajfnid1gl0"; }; - buildInputs = [ zlib libpng ] + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ zlib libpng libjpeg ] ++ lib.optionals stdenv.isDarwin [ Foundation SystemConfiguration ]; meta = with lib; { description = "Converts HTML files to PostScript and PDF"; homepage = "https://michaelrsweet.github.io/htmldoc"; + changelog = "https://github.com/michaelrsweet/htmldoc/releases/tag/v${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ shanemikel ]; platforms = platforms.unix; |