diff --git a/pkgs/applications/misc/htmldoc/default.nix b/pkgs/applications/misc/htmldoc/default.nix new file mode 100644 index 000000000000..befa8d252100 --- /dev/null +++ b/pkgs/applications/misc/htmldoc/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, fltk, openssl, libpng, libjpeg }: +stdenv.mkDerivation rec { + name = "htmldoc-1.8.27"; + src = fetchurl { + url = http://ftp.easysw.com/pub/htmldoc/1.8.27/htmldoc-1.8.27-source.tar.bz2; + sha256 = "04wnxgx6fxdxwiy9vbawdibngwf55mi01hjrr5fkfs22fcix5zw9"; + }; + buildInputs = [ fltk openssl libpng libjpeg ]; + meta = { + homepage = http://www.htmldoc.org/; + description = "Converts HTML files to indexed HTML, PS or PDF"; + license = "GPLv2"; + maintainers = with stdenv.lib.maintainers; [ viric ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/development/libraries/fltk/fltk11.nix b/pkgs/development/libraries/fltk/fltk11.nix index 4832410102d7..41733862c172 100644 --- a/pkgs/development/libraries/fltk/fltk11.nix +++ b/pkgs/development/libraries/fltk/fltk11.nix @@ -2,11 +2,11 @@ args: with args; let inherit (args.composableDerivation) composableDerivation edf; in composableDerivation {} { - name = "fltk-1.1.9"; + name = "fltk-1.1.10"; src = args.fetchurl { - url = http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.9/fltk-1.1.9-source.tar.bz2; - sha256 = "1ppdqc4vg3g11px4dxm6czxi4sswfxs485q44nrr5ji0galsbjzs"; + url = http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.10/fltk-1.1.10-source.tar.bz2; + sha256 = "16mic69a48y3ybijml754x38djxxb25rn8441p9qsssqy8ms5b9p"; }; propagatedBuildInputs=[x11 inputproto libXi freeglut]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0cc06f620ed..aab46464543f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7969,6 +7969,11 @@ let inherit (gtkLibs) gtk; }; + htmldoc = import ../applications/misc/htmldoc { + inherit fetchurl stdenv openssl libpng libjpeg; + fltk = fltk11; + }; + hugin = import ../applications/graphics/hugin { inherit fetchurl stdenv cmake panotools libtiff libpng boost pkgconfig exiv2 gettext ilmbase enblendenfuse autopanosiftc mesa freeglut