diff options
| author | LeSuisse <thomas@gerbet.me> | 2021-04-15 02:37:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-15 02:37:46 +0200 |
| commit | dcdf30a78a523296b5f9d44fb67afac485b64737 (patch) | |
| tree | 2de729a4ad4bede1c9f8592c9841aa99984700f6 /pkgs/tools/typesetting | |
| parent | 2f6a9bb297acfd30937178bec6f5d054c96c3a51 (diff) | |
| download | nixlib-dcdf30a78a523296b5f9d44fb67afac485b64737.tar nixlib-dcdf30a78a523296b5f9d44fb67afac485b64737.tar.gz nixlib-dcdf30a78a523296b5f9d44fb67afac485b64737.tar.bz2 nixlib-dcdf30a78a523296b5f9d44fb67afac485b64737.tar.lz nixlib-dcdf30a78a523296b5f9d44fb67afac485b64737.tar.xz nixlib-dcdf30a78a523296b5f9d44fb67afac485b64737.tar.zst nixlib-dcdf30a78a523296b5f9d44fb67afac485b64737.zip | |
htmldoc: 1.8.29 -> 1.9.11 (#119226)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Diffstat (limited to 'pkgs/tools/typesetting')
| -rw-r--r-- | pkgs/tools/typesetting/htmldoc/default.nix | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index 124839ca45d6..740d16c73df3 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -1,29 +1,23 @@ -{ lib, stdenv, fetchurl - -, SystemConfiguration ? null, Foundation ? null -}: - -assert stdenv.isDarwin -> SystemConfiguration != null - && Foundation != null; +{ lib, stdenv, fetchFromGitHub, zlib, libpng, SystemConfiguration, Foundation }: stdenv.mkDerivation rec { - version = "1.8.29"; pname = "htmldoc"; - src = fetchurl { - url = "https://github.com/michaelrsweet/htmldoc/releases/download" - + "/release-${version}/htmldoc-${version}-source.tar.gz"; - sha256 = "15x0xdf487j4i4gfap5yr83airxnbp2v4lxaz79a4s3iirrq39p0"; + version = "1.9.11"; + src = fetchFromGitHub { + owner = "michaelrsweet"; + repo = "htmldoc"; + rev = "v${version}"; + sha256 = "0660829zjfdm6vzx14z7gvsfipsb7h0z74gbkyp2ncg3g2432s4n"; }; - buildInputs = with stdenv; - lib.optional isDarwin SystemConfiguration - ++ lib.optional isDarwin Foundation; + buildInputs = [ zlib libpng ] + ++ lib.optionals stdenv.isDarwin [ Foundation SystemConfiguration ]; meta = with lib; { description = "Converts HTML files to PostScript and PDF"; homepage = "https://michaelrsweet.github.io/htmldoc"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ shanemikel ]; - platforms = with platforms; linux ++ darwin; + platforms = platforms.unix; longDescription = '' HTMLDOC is a program that reads HTML source files or web pages and |