Peter Simons
|
2d326e5032
|
Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
pkgs/desktops/e18/enlightenment.nix
|
2014-08-04 16:51:47 +02:00 |
|
Mateusz Kowalczyk
|
7a45996233
|
Turn some license strings into lib.licenses values
|
2014-07-28 11:31:14 +02: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 |
|
Lluís Batlle i Rossell
|
ec65563e2c
|
Adding meo: Multiple Eyepairs Only
I also add the pkcs11helper it needs.
|
2013-05-20 23:13:40 +02:00 |
|