Commit Graph

6 Commits

Author SHA1 Message Date
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
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46e71e1907d78b71fab36df30297b3ad.
2014-06-30 14:56:10 +02:00
Song Wenwu
08fb4d6bc4 praat: set meta.platforms to linux 2014-03-07 15:06:44 +01:00
Song Wenwu
1d52f7bd68 praat: update from 5323 to 5365 2014-03-07 15:06:44 +01:00
Lluís Batlle i Rossell
0f1326cde9 Adding praat. 2012-08-27 20:26:32 +02:00