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 c556a6ea46e71e1907d78b71fab36df30297b3ad.
2014-06-30 14:56:10 +02:00
Evgeny Egorochkin
a3757a2f67 i7z: update to 0.27.2, cleanup build, add git repository to metadata. 2013-10-18 23:05:22 +03:00
Peter Simons
796f0ad5bc i7z: better cpu frequency/turbo boost checker for intel core i{3,5,7}
svn path=/nixpkgs/trunk/; revision=32082
2012-02-06 19:09:04 +00:00