Commit Graph

5 Commits

Author SHA1 Message Date
Vladimír Čunát
ae7153b9b0 sl: fix license (close #3072)
From https://github.com/fistonbettens/nixpkgs/commit/7b6591b551afc6a17b
but it failed to apply for me, so I hand-added and corrected the change.
2014-08-14 21:28:33 +02:00
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
Lluís Batlle i Rossell
26ec1abf41 Adding Steam Locomotive, for the fun 2013-03-25 14:57:45 +01:00