nixpkgs

Author	SHA1	Message	Date
Eelco Dolstra	06fc1ec34d	Merge remote-tracking branch 'origin/master' into staging Conflicts: pkgs/servers/serfdom/default.nix	2014-07-01 11:25:41 +02:00
Eelco Dolstra	40f7b0f9df	Another attempt to eradicate ensureDir See `c556a6ea46`.	2014-06-30 14:56:10 +02:00
Benno Fünfstück	e10001042d	fetchbzr, fetchdarcs, fetchhg: use `rev` attr This makes it match the behaviour of fetchgit and fetchsvn, so it's easier to write scripts that support all of them.	2014-06-28 21:06:10 +02:00
Nicolas Pierron	6a9ac1f016	Add opentyrian game. svn path=/nixpkgs/trunk/; revision=33797	2012-04-15 23:38:38 +00:00