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
Lluís Batlle i Rossell
13d40ae54d otpw: fixing the entropy source (PATH variables)
I don't know why it set some hardcoded PATH.
2013-03-30 21:06:06 +01:00
Lluís Batlle i Rossell
690d5a346d otpw: fixing typo in url 2013-03-30 21:06:05 +01:00
Lluís Batlle i Rossell
c7cf2b1690 Adding otpw (a one-time password system) 2013-03-30 21:06:05 +01:00