Shea Levy fde3526e7d Merge branch 'master' into stdenv-updates ... Conflict in kerberos, which was updated both in master and in stdenv-updates. Kept the stdenv-updates version, except pulled in the enableParallelBuilding change from master. Signed-off-by: Shea Levy <shea@shealevy.com> Conflicts: pkgs/development/libraries/kerberos/krb5.nix		2013-05-04 18:28:48 -04:00
..
autojump
aws-mturk-clt
bc
bfr
bogofilter
cloc	Add cloc-1.58	2013-03-16 15:06:23 +01:00
convmv
coreutils	Merge changes from branch 'master' into stdenv-updates.	2013-04-19 11:48:11 +02:00
cowsay
cunit
dbacl
debian-devscripts
debootstrap
desktop-file-utils
detox
disper
dmg2img
dtach
ethtool
expect
fdupes
figlet
file	file: bump from 5.11 to 5.12	2013-02-18 11:46:47 +01:00
fileschanged
findutils
fontforge
fortune
g500-control	g500-control: Add meta.platforms.	2013-03-27 20:59:57 +01:00
getopt
gnokii
gnuvd
gparted	gparted: update	2013-03-23 20:25:35 +01:00
grub	grub: fix download URL for grub-0.97-once.patch	2013-04-07 23:33:20 +02:00
gsmartcontrol
gummiboot	Gummiboot: Update to 23.	2013-02-21 12:39:25 -05:00
hddtemp	hddtemp: try to fix by Gentoo patches	2013-02-28 16:00:49 +01:00
hdf5	hdf5: download URL no longer available for 1.8.5, upgrade to 1.8.10	2013-04-11 10:54:31 +02:00
heimdall
idutils
ised
jdiskreport
kermit
keychain
less	Update less to version 451	2013-02-28 20:33:37 +01:00
lockfile-progs
logstash
man
man-db
mc
mcrl
mcrl2
mdbtools
memtest86
minicom
mktorrent	mktorrent: fixing the usual pthread_cancel problem	2013-03-12 20:01:07 +01:00
mmv
most
mssys
multitail	Add multitail	2013-03-31 19:40:11 +02:00
myhasktags
mysql2pgsql
ncdu	ncdu: set platforms	2013-05-04 20:34:15 +02:00
pal
parallel
parted	parted: remove 2.3.*, no longer used	2013-02-14 13:13:51 +01:00
partition-manager	kdePackages.partitionManager: fix via update to Gentoo version	2013-02-23 20:32:54 +01:00
pg_top
picocom
pk2cmd
plowshare
proxytunnel
pv
qjoypad
recutils	recutils: supply the forgotten patch	2013-03-09 13:54:55 +01:00
refind
remind
renameutils	Add renameutils package.	2013-03-25 13:45:01 +00:00
rlwrap
rockbox-utility
rrdtool
screen	screen: fix some annoying bugs by importing patches from ArchLinux	2013-03-17 12:24:49 +00:00
shebangfix
sl	Adding Steam Locomotive, for the fun	2013-03-25 14:57:45 +01:00
slsnif
system-config-printer
testdisk
time
timidity
tmux	tmux: update to version 1.8	2013-04-01 16:24:08 -06:00
ttf2pt1
ttmkfdir
unclutter
units
usbmuxd
uucp
vfdecrypt
vorbisgain
w3c-css-validator
wv
wv2	wv2: update and fix	2013-02-23 19:29:02 +01:00
xburst-tools
xclip
xdaliclock
xmltv
xsel
xvfb-run
youtube-dl