philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
nixpkgs/nixos/modules
History
Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging. 
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
2014-09-02 12:31:03 +02:00
..
config Merge branch 'origin/master' into staging. 2014-09-02 12:31:03 +02:00
hardware
installer Merge branch 'origin/master' into staging. 2014-09-02 12:31:03 +02:00
misc Add IDs for uhub service 2014-09-01 10:53:19 +04:00
profiles Merge recent master into staging 2014-08-30 10:04:02 +02:00
programs Merge pull request #2644 from lethalman/pam_tally 2014-09-02 00:58:30 +04:00
security Merge pull request #2644 from lethalman/pam_tally 2014-09-02 00:58:30 +04:00
services Merge pull request #3901 from vlstill/ssh_ip 2014-09-02 10:38:16 +02:00
system Load EHCI befor OHCI and UHCI; from patch by Mathnerd314 2014-09-02 02:12:46 +04:00
tasks Merge pull request #3911 from vlstill/nfs-port_pullreq 2014-09-02 00:53:52 +04:00
testing Fix evaluation 2014-08-06 19:44:13 +02:00
virtualisation Merge branch 'origin/master' into staging. 2014-09-02 12:31:03 +02:00
module-list.nix add openvswitch package + basic nixos module to enable it 2014-09-02 01:48:50 +04:00
rename.nix