nixpkgs/pkgs/tools
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
..
admin Turn more licenses into lib.licenses style 2014-11-06 00:48:16 +00:00
archivers Merge remote-tracking branch 'origin/master' into staging 2014-11-06 10:16:39 +01:00
audio
backup bareos: Add derivation 2014-11-04 11:11:14 -08:00
bluetooth
cd-dvd
compression Merge remote-tracking branch 'origin/master' into staging 2014-11-06 10:16:39 +01:00
filesystems Merge remote-tracking branch 'origin/master' into staging 2014-11-06 10:16:39 +01:00
graphics Turn more licenses into lib.licenses style 2014-11-06 00:48:16 +00:00
inputmethods Create wrapper package for fcitx with plugins. 2014-11-05 10:37:10 +09:00
misc Merge remote-tracking branch 'origin/master' into staging 2014-11-06 10:16:39 +01:00
networking Merge remote-tracking branch 'origin/master' into staging 2014-11-06 10:16:39 +01:00
package-management Merge remote-tracking branch 'origin/master' into staging 2014-11-06 10:16:39 +01:00
security Merge remote-tracking branch 'origin/master' into staging 2014-11-06 10:16:39 +01:00
system Merge remote-tracking branch 'origin/master' into staging 2014-11-06 10:16:39 +01:00
text Merge remote-tracking branch 'origin/master' into staging 2014-11-06 10:16:39 +01:00
typesetting Merge remote-tracking branch 'origin/master' into staging 2014-11-06 10:16:39 +01:00
video
virtualization Turn more licenses into lib.licenses style 2014-11-06 00:48:16 +00:00
X11 Turn more licenses into lib.licenses style 2014-11-06 00:48:16 +00:00