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
..
cabal-install	cabal-install: update to version 1.16.0.2	2012-11-09 11:34:11 +01:00
checkinstall	* Fix the checkinstall build on Glibc 2.13.	2012-03-06 19:06:33 +00:00
disnix	disnix-activation-scripts: updating the hash	2012-07-12 10:44:54 +02:00
dpkg	dpkg: Fix caching of architecture name	2012-12-04 19:54:44 +01:00
nix	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
opkg
rpm	Revert "Update RPM to 4.10.0."	2012-07-24 21:57:18 +02:00