philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
nixpkgs/nixos/modules
History
Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
..
config Merge recent master into staging 2014-11-05 15:00:44 +01:00
hardware
installer Merge pull request #4238 from wkennington/master.boost 2014-11-03 23:03:01 +01:00
misc nixos: prosody was clashing with seeks unix ids 2014-10-20 17:22:01 +02:00
profiles jfsrec: Remove derivation 2014-11-02 17:22:27 -08:00
programs ssmtp: add 'root' option 2014-11-05 02:47:59 +03:00
security sudo: allow adding extra configuration options to the bottom of sudoers 2014-11-02 13:27:05 +01:00
services Merge recent master into staging 2014-11-05 15:00:44 +01:00
system Merge recent master into staging 2014-11-05 15:00:44 +01:00
tasks nixos: Add a filesystem module for JFS. 2014-10-22 08:22:57 +02:00
testing nixos: Fix priorities of initialHashedPassword. 2014-11-04 05:19:07 +01:00
virtualisation Merge recent master into staging 2014-11-05 15:00:44 +01:00
module-list.nix nixos: Add a filesystem module for JFS. 2014-10-22 08:22:57 +02:00
rename.nix Revert "syslog-ng: Update from 3.5.6 to 3.6.1" 2014-11-02 17:22:28 -08:00