Commit graph

5 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 c556a6ea46.
2014-06-30 14:56:10 +02:00
Florian Friesdorf f3b60febd3 calfw-1.3-5-ga9b6615 for fix in combination with org-mode
svn path=/nixpkgs/trunk/; revision=32119
2012-02-07 17:39:54 +00:00
Florian Friesdorf 4e3afe1b8d emacs mode calfw-1.3
svn path=/nixpkgs/trunk/; revision=32118
2012-02-07 17:39:51 +00:00