Peter Simons 6b1ebeccf2 Merge branch 'master' into stdenv-updates. ... There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix, which I resolved to the best of my knowledge. I'd appreciate if some of the ruby gurus could have a look at the outcome of my merge, though.		2013-06-11 12:11: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.2	2013-05-14 00:01:38 +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