movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 04:35:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:NixOS/nixos into systemd

Browse source 
Conflicts:
	modules/config/networking.nix
	modules/services/networking/ssh/sshd.nix
	modules/services/ttys/agetty.nix
	modules/system/boot/stage-2-init.sh
	modules/system/upstart-events/shutdown.nix
This commit is contained in:
Eelco Dolstra 2012-07-16 17:27:11 -04:00
commit 44d091674b
38 changed files with 544 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/module-list.nix
View file

@ -15,6 +15,7 @@
./config/unix-odbc-drivers.nix
./config/users-groups.nix
./hardware/cpu/intel-microcode.nix
./hardware/network/b43.nix
./hardware/network/intel-2100bg.nix
./hardware/network/intel-2200bg.nix
./hardware/network/intel-3945abg.nix
@ -34,6 +35,7 @@
./misc/crashdump.nix
./misc/ids.nix
./misc/locate.nix
./misc/lib.nix
./misc/nixpkgs.nix
./misc/passthru.nix
./misc/version.nix
@ -82,6 +84,7 @@
./services/hardware/upower.nix
#./services/logging/klogd.nix
./services/logging/logrotate.nix
./services/logging/logstash.nix
./services/logging/syslogd.nix
./services/mail/dovecot.nix
./services/mail/dovecot2.nix