Vladimír Čunát 842420c3e1 Merge branch 'master' into stdenv-updates ... Conflicts (relatively simple): pkgs/development/interpreters/python/2.7/default.nix pkgs/development/libraries/dbus/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/glibc/2.17/common.nix		2013-06-20 19:21:25 +02:00
..
cabal-install	Add myself as a maintainer to all Haskell packages (re-)generated by hackage4nix.	2013-03-23 15:58:14 +01:00
checkinstall	typos	2013-06-03 00:31:43 +02:00
disnix	Update disnix.	2013-02-28 20:04:03 +01:00
dpkg	dpkg: Fix caching of architecture name	2012-12-04 19:54:44 +01:00
nix	nix: Update to 1.5.3	2013-06-18 00:56:00 +02:00
opkg	Added opkg package	2011-06-28 09:45:51 +00:00
rpm	Revert "Update RPM to 4.10.0."	2012-07-24 21:57:18 +02:00