Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
asciidoc	asciidoc: add enableExtraPlugins expression argument	2014-07-20 23:03:27 +02:00
biber	Partially revert 7a45996 some more.	2014-07-28 20:52:47 +02:00
bibtex-tools	nixos.org/tarballs -> tarballs.nixos.org	2013-06-25 14:12:16 +02:00
djvu2pdf	Don't use ensureDir	2014-07-22 11:01:32 +02:00
docbook2odf	docbook2odf: new package	2013-12-20 12:25:57 +01:00
docbook2x	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
fop	fop: Drop runtime dependency on the JDK	2014-01-06 14:36:13 +01:00
halibut	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
hevea
lhs2tex	Fix broken license references.	2014-07-28 11:43:20 +02:00
lout	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
patoline	New ocaml packages:	2013-06-07 21:40:38 +02:00
pdf2djvu	Update pdf2djvu	2013-10-14 22:07:13 +04:00
pdfjam	Adopt more packages.	2014-01-28 18:11:00 +01:00
pdftk	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
rubber	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
tex	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
xmlroff
xmlto	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00