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
|
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 A. Kennington III
|
0031a036ca
|
picocom: Add dependency on lrzsz so that we can transfer files
|
2014-07-23 20:28:18 +02:00 |
|
Eelco Dolstra
|
40f7b0f9df
|
Another attempt to eradicate ensureDir
See c556a6ea46e71e1907d78b71fab36df30297b3ad.
|
2014-06-30 14:56:10 +02:00 |
|
Lluís Batlle i Rossell
|
ad0b63265c
|
picocom: adding picocom, 1.7
|
2012-09-25 19:23:34 +02:00 |
|