nixpkgs/pkgs
Vladimír Čunát d4e9fd2a90 Merge recent master into staging
Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
2014-08-21 15:09:31 +02:00
..
applications Merge recent master into staging 2014-08-21 15:09:31 +02:00
build-support Merge recent master into staging 2014-08-21 15:09:31 +02:00
data
desktops Merge recent master into staging 2014-08-21 15:09:31 +02:00
development Merge recent master into staging 2014-08-21 15:09:31 +02:00
games
misc
os-specific Merge recent master into staging 2014-08-21 15:09:31 +02:00
servers diod: Update from 1.0.21 to 1.0.22 2014-08-20 16:10:20 +02:00
shells
stdenv
test
tools Merge recent master into staging 2014-08-21 15:09:31 +02:00
top-level rhash: new package 2014-08-21 00:46:35 +02:00