diff options
author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2015-04-03 23:12:12 +0200 |
---|---|---|
committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2015-04-03 23:12:12 +0200 |
commit | 6de931a0f898bc132d73a67059326b6886cc84b1 (patch) | |
tree | a494d3f90da826fa983bfbd93e0ee2cff5f22ce8 /nixos/modules/module-list.nix | |
parent | 7f1a782d91c537eb6972b8acd83e1957a65a93e4 (diff) | |
parent | a8d0614a602fd00d2e23e0e86fc748cc51c6f696 (diff) | |
download | nixlib-6de931a0f898bc132d73a67059326b6886cc84b1.tar nixlib-6de931a0f898bc132d73a67059326b6886cc84b1.tar.gz nixlib-6de931a0f898bc132d73a67059326b6886cc84b1.tar.bz2 nixlib-6de931a0f898bc132d73a67059326b6886cc84b1.tar.lz nixlib-6de931a0f898bc132d73a67059326b6886cc84b1.tar.xz nixlib-6de931a0f898bc132d73a67059326b6886cc84b1.tar.zst nixlib-6de931a0f898bc132d73a67059326b6886cc84b1.zip |
Merge rename.nix changes.
Diffstat (limited to 'nixos/modules/module-list.nix')
-rw-r--r-- | nixos/modules/module-list.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7a324a2bb306..640c23762d6d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -29,6 +29,7 @@ ./hardware/all-firmware.nix ./hardware/cpu/amd-microcode.nix ./hardware/cpu/intel-microcode.nix + ./hardware/ksm.nix ./hardware/network/b43.nix ./hardware/network/intel-2100bg.nix ./hardware/network/intel-2200bg.nix @@ -91,8 +92,9 @@ ./services/amqp/activemq/default.nix ./services/amqp/rabbitmq.nix ./services/audio/alsa.nix - # Disabled as fuppes it does no longer builds. + # Disabled as fuppes no longer builds. # ./services/audio/fuppes.nix + ./services/audio/icecast.nix ./services/audio/liquidsoap.nix ./services/audio/mpd.nix ./services/audio/mopidy.nix @@ -109,6 +111,7 @@ ./services/cluster/panamax.nix ./services/computing/torque/server.nix ./services/computing/torque/mom.nix + ./services/computing/slurm/slurm.nix ./services/continuous-integration/jenkins/default.nix ./services/continuous-integration/jenkins/slave.nix ./services/databases/4store-endpoint.nix @@ -159,6 +162,7 @@ ./services/hardware/udisks2.nix ./services/hardware/upower.nix ./services/hardware/thermald.nix + ./services/logging/fluentd.nix ./services/logging/klogd.nix ./services/logging/logcheck.nix ./services/logging/logrotate.nix @@ -188,6 +192,7 @@ ./services/misc/gitlab.nix ./services/misc/gitolite.nix ./services/misc/gpsd.nix + ./services/misc/mediatomb.nix ./services/misc/mesos-master.nix ./services/misc/mesos-slave.nix ./services/misc/nix-daemon.nix @@ -198,6 +203,7 @@ ./services/misc/phd.nix ./services/misc/redmine.nix ./services/misc/rippled.nix + ./services/misc/ripple-data-api.nix ./services/misc/rogue.nix ./services/misc/siproxd.nix ./services/misc/svnserve.nix @@ -231,6 +237,7 @@ ./services/network-filesystems/diod.nix ./services/network-filesystems/u9fs.nix ./services/network-filesystems/yandex-disk.nix + ./services/networking/aiccu.nix ./services/networking/amuled.nix ./services/networking/atftpd.nix ./services/networking/avahi-daemon.nix @@ -327,6 +334,7 @@ ./services/security/fprot.nix ./services/security/frandom.nix ./services/security/haveged.nix + ./services/security/munge.nix ./services/security/torify.nix ./services/security/tor.nix ./services/security/torsocks.nix |