8 commits

Author	SHA1	Message	Date
Eelco Dolstra	f64d84698e	Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/applications/audio/espeak/edit.nix pkgs/applications/audio/lmms/default.nix pkgs/desktops/e18/enlightenment.nix pkgs/games/exult/default.nix pkgs/os-specific/linux/alsa-plugins/default.nix	2014-07-28 11:30:49 +02:00
William Roe	845d24d86c	Update Serf to 0.6.3	2014-07-25 16:51:54 +01:00
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
Charles Strahan	8ad3254ac5	update serfdom to v0.6.2	2014-06-23 04:45:24 -04:00
Matthew Sackman	89f0c9a8b6	Update serfdom to 0.5.0.	2014-03-15 10:57:27 +00:00
Matthew Sackman	5e09175765	add serfdom (close #1672)	2014-02-27 19:18:28 +01:00