nixpkgs/pkgs/tools
Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
..
admin tigervnc: Drop dependency on libxcrypt 2013-01-28 17:19:03 +01:00
archivers Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-04 17:12:35 +01:00
backup Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
bluetooth koffice, kbluetooth: remove from hydra 2013-03-02 09:21:11 +01:00
cd-dvd * Add bchunk. 2012-06-17 03:36:22 +00:00
compression Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
filesystems fuse_zip: fix with new libzip 2013-02-28 15:43:06 +01:00
graphics Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-18 11:54:56 +01:00
inputmethods/fcitx add fcitx-4.2.7 2013-01-28 11:35:03 +08:00
misc hddtemp: try to fix by Gentoo patches 2013-02-28 16:00:49 +01:00
networking Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
package-management Merge branch 'master' into stdenv-updates 2013-03-02 10:41:53 +01:00
security Merge branch 'master' into stdenv-updates 2013-03-02 10:41:53 +01:00
system Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
text recode: fix with new automake 2013-02-24 16:40:36 +01:00
typesetting texlive-moderncv: update to version 1.3.0 2013-02-11 21:15:17 +01:00
video add swfmill-0.3.2 2013-02-05 11:36:18 +08:00
virtualization ec2-ami-tools: Update to 1.4.0.9 2013-01-24 18:23:04 +01:00
X11 Merge branch 'master' into stdenv-updates 2013-03-02 10:41:53 +01:00