Shea Levy acd4299e75 Merge branch 'master' into stdenv-updates ... Conflicts: pkgs/applications/networking/browsers/chromium/default.nix pkgs/top-level/all-packages.nix Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.		2013-02-21 11:13:30 -05:00
..
aefs
archivemount
btrfsprogs	btrfs-progs: add small tool to set the received-uuid of exisiting subvolumes	2013-01-01 13:50:15 +01:00
ciopfs
curlftpfs
davfs2	davfs2: read config files from /etc/davfs2 instead of ${out}/etc/davfs2	2013-02-21 12:03:52 +01:00
dosfstools	dosfstools: Add alternative URL, since main site seems to be down.	2012-10-02 08:51:51 +02:00
e2fsprogs
encfs
fsfs
fuse-zip
fusesmb
genext2fs
glusterfs	Update GlusterFS	2012-12-04 21:54:20 +04:00
grive
httpfs
jfsrec
jfsutils	types.h -> types.patch	2013-01-28 17:27:14 +01:00
mtdutils	mtdutils: updating, and making them build	2012-09-16 22:41:32 +02:00
mtools
nilfs-utils
ntfs-3g	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
reiser4progs
reiserfsprogs	reiserfsprogs: Fix URL	2013-01-15 18:53:12 +01:00
relfs
s3backer
smbnetfs
squashfs
sshfs-fuse
svnfs
udftools
unionfs-fuse	Add unionfs-fuse meta	2012-12-16 16:42:45 -05:00
wdfs
xfsprogs
xtreemfs	xtreemfs-1.4	2012-11-26 14:42:09 +01:00