Vladimír Čunát 1e389c976c merge 'staging' into modular-stdenv ...

In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix

2014-09-08 18:16:54 +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

Remove support for the obsolete powerpc-darwin and i686-darwin platforms

2012-11-29 14:10:49 +01:00

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

pdfgrep

pdfgrep: added a nice util to search in pdf files

2014-08-13 20:03:04 +02: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

Cleanup: Use += to append to envHooks

2014-08-09 12:47:05 +02:00

xmlroff

* Rewrite all the SourceForge URLs to mirror://sourceforge/.

2007-08-27 13:01:33 +00:00

xmlto

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00