public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
 pkgs/tools/networking/xh/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-22 18:19:10 -07:00
parent 563389a7fd 6543c61311
commit 11a9ac00fc
157 changed files with 1479 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/typesetting/htmldoc/default.nix
View File

@@ -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;