1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs synced 2024-10-23 16:02:20 -04:00
nixpkgs/pkgs/tools
Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
..
admin firefox: Build without xulrunner 2014-07-23 17:28:36 +02:00
archivers
audio
backup
bluetooth
cd-dvd
compression
filesystems
graphics gnuplot: add optional Qt terminal 2014-07-23 18:01:31 -05:00
inputmethods/fcitx
misc Merge remote-tracking branch 'origin/master' into staging 2014-07-28 11:30:49 +02:00
networking Merge remote-tracking branch 'origin/master' into staging 2014-07-28 11:30:49 +02:00
package-management nixUnstable: Update to 1.8pre3705_71a20d4 2014-07-25 14:51:50 +02:00
security
system Merge remote-tracking branch 'origin/master' into staging 2014-07-28 11:30:49 +02:00
text enscript: Build with the default GCC 2014-07-23 11:25:38 +02:00
typesetting Don't use ensureDir 2014-07-22 11:01:32 +02:00
video
virtualization
X11 Add missing 's' in remaining meta.maintainer(s) attrs 2014-07-22 23:49:21 +02:00