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
Eelco Dolstra f2254354f9 Fix Nixpkgs evaluation
https://hydra.nixos.org/build/6169018
2013-09-17 11:04:10 +02:00
Rob Vermaas 8041a33726 Add MegaCli, a command line tool to manage certain RAID cards. 2013-09-16 15:56:55 +02:00