Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/stdenv/generic/default.nix		2014-11-06 10:16:39 +01:00
..
atool
cabextract
cpio
cromfs
dar
gnutar
p7zip	Adopt a few packages	2014-11-05 11:56:19 +03:00
rpmextract
sharutils
unarj	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
unrar
unshield
unzip	Merge remote-tracking branch 'origin/master' into staging	2014-11-06 10:16:39 +01:00
xarchive	Adopt a few packages	2014-11-05 11:56:19 +03:00
xarchiver
zip
zpaq