Luca Bruno 83221f3886 Merge branch 'master' into staging ... Makes the build more useful: - Disabled hybrid iso, makes installer tests pass again - Imagemagick fixes to the "Illegal instruction" thing		2014-11-08 15:56:40 +01:00
..
ascii	ascii: update 3.12 -> 3.14	2013-11-30 23:51:39 +01:00
catdoc	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
cheetah-template	Change more packages from direct downloads to mirror://sourceforge	2013-07-14 02:48:32 +03:00
colordiff	colordiff: update 1.0.9 -> 1.0.13	2014-06-22 23:00:14 +02:00
convertlit	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
dadadodo	dadadodo: adopt and cleanup expression	2014-10-06 11:36:58 +02:00
diffstat	diffstat: update from 1.58 to 1.59	2014-09-04 19:31:32 +02:00
diffutils	diffutils: minor stable update 3.2 -> 3.3	2013-06-30 08:58:51 +02:00
discount	discount: Added shell as maintainer	2014-10-12 12:09:07 +01:00
dos2unix	dos2unix: update from 6.0.6 to 7.0	2014-10-06 21:57:59 +02:00
ebook-tools	ebook_tools: update from 0.2.1 to 0.2.2	2013-12-04 06:30:16 +02:00
enca	enca: update from 1.15 to 1.16	2014-10-27 07:28:23 +02:00
enscript	Fix many package descriptions	2014-08-24 22:31:37 +02:00
gawk	Revert "Upgraded gawk to v4.1.1"	2014-10-03 16:12:09 +02:00
gist	new: gist – cli for gist.github.com	2014-10-08 07:31:36 -05:00
gnugrep	gnugrep: Fix bootstrap-tools reference	2014-10-06 22:05:55 +02:00
gnupatch	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
gnused	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
groff	groff, opensp: make deterministic	2014-09-13 15:06:59 +02:00
highlight	highlight: update to version 3.18 to fix build errors with Lua 5.2	2014-09-08 10:22:50 +02:00
html2text	html2text: new package	2014-11-07 23:19:49 +00:00
html-tidy	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
kakasi	add kakasi, a Kanji to Hiragana, Katakana or Romaji converter	2014-04-18 22:07:17 +08:00
kdiff3	kdiff3: minor update	2014-08-14 19:43:27 +02:00
mairix	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
mpage	Fix many package descriptions	2014-08-24 22:31:37 +02:00
multitran	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
namazu	Fix many package descriptions	2014-08-24 22:31:37 +02:00
numdiff	transformed meta.maintainers of some packages into lists	2014-09-13 13:52:02 +02:00
odt2txt	pkgs/tools/text/odt2txt: fixed evaluation error	2011-10-10 08:56:08 +00:00
patchutils	Merge #2630: add and use fetchpatch	2014-05-17 07:31:03 +02:00
peco	peco: update to version 0.2.10	2014-10-12 12:33:16 +01:00
podiff	nixpkgs-lint: add the platforms meta attr for most of my packages	2014-03-16 12:08:26 +01:00
poedit	add poedit	2013-09-13 20:42:49 +02:00
qshowdiff	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
recode	Recode: Build on OS X	2014-05-16 23:28:19 +02:00
replace	Fix /bin/mv reference in replace-literal	2014-09-20 11:53:21 +04:00
sgml	Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging	2014-11-04 14:30:43 +01:00
silver-searcher	silver-searcher: update from 0.21.0 to 0.24.1	2014-08-19 19:27:16 +02:00
source-highlight	boost: Fix incompatible applications	2014-11-02 17:22:28 -08:00
uni2ascii	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
unoconv	unoconv: new package	2013-09-02 07:11:58 +02:00
wdiff	wdiff: Update to 1.2.2	2014-09-23 11:51:46 +02:00
wgetpaste	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
xml	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00