Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/tools/misc/binutils/default.nix pkgs/tools/package-management/disnix/default.nix pkgs/top-level/all-packages.nix		2013-07-08 10:48:05 +02:00
..
ascii
catdoc
cheetah-template
colordiff
convertlit
dadadodo
diffstat
diffutils	diffutils: minor stable update 3.2 -> 3.3	2013-06-30 08:58:51 +02:00
dos2unix
ebook-tools
enca
enscript
gawk	gawk: update 4.0.2 -> 4.1.0	2013-06-30 09:00:11 +02:00
gnugrep
gnupatch
gnused
groff	groff: explicitly disable X11 support in configure to avoid impure builds	2013-06-11 12:14:49 +02:00
highlight
html-tidy	Change package versions to conform to nixpkgs conventions.	2013-06-09 05:41:44 +03:00
kdiff3	kdiff3: maintenance update	2013-07-05 14:45:59 +02:00
mairix
mpage
multitran
namazu
numdiff	Add numdiff-5.6.1	2013-06-01 00:59:58 +02:00
odt2txt
patchutils
podiff
qshowdiff
recode	recode: fix build after stdenv merge + #354	2013-03-09 11:32:22 +01:00
replace
sgml	Adding setup-hook for opensp, to set the sgml catalog files	2013-03-18 15:07:20 +01:00
source-highlight
uni2ascii
wdiff
wgetpaste	pwgen, wgetpaste: set platforms	2013-03-29 18:32:58 +01:00
xml	nixos.org/tarballs -> tarballs.nixos.org	2013-06-25 14:12:16 +02:00