| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge remote-tracking branch 'origin/master' into staging. | Peter Simons | 2014-08-04 |
| |\ | | | | | | | | | Conflicts: pkgs/desktops/e18/enlightenment.nix | ||
| | * | Turn some license strings into lib.licenses values | Mateusz Kowalczyk | 2014-07-28 |
| | | | |||
| * | | Merge remote-tracking branch 'origin/master' into staging | Eelco Dolstra | 2014-07-01 |
| |\| | | | | | | | | | Conflicts: pkgs/servers/serfdom/default.nix | ||
| | * | fetchbzr, fetchdarcs, fetchhg: use `rev` attr | Benno Fünfstück | 2014-06-28 |
| | | | | | | | | | | | This makes it match the behaviour of fetchgit and fetchsvn, so it's easier to write scripts that support all of them. | ||
| * | | Another attempt to eradicate ensureDir | Eelco Dolstra | 2014-06-30 |
| |/ | | | | See c556a6ea46e71e1907d78b71fab36df30297b3ad. | ||
| * | Adding meo: Multiple Eyepairs Only | Lluís Batlle i Rossell | 2013-05-20 |
| I also add the pkcs11helper it needs. | |||