diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-01 09:34:41 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-01 09:36:23 +0100 |
commit | 2fb4606f38deefa76da5d853645739f2faa315de (patch) | |
tree | de1003a2a8487fe792903ac3e295292d15608b3e /nixos/modules/module-list.nix | |
parent | f0048025807b7f451a295e7b009c58e0c2282d70 (diff) | |
parent | be4c6311f3bc808cacff94e5e11240a7c37cbf9c (diff) | |
download | nixlib-2fb4606f38deefa76da5d853645739f2faa315de.tar nixlib-2fb4606f38deefa76da5d853645739f2faa315de.tar.gz nixlib-2fb4606f38deefa76da5d853645739f2faa315de.tar.bz2 nixlib-2fb4606f38deefa76da5d853645739f2faa315de.tar.lz nixlib-2fb4606f38deefa76da5d853645739f2faa315de.tar.xz nixlib-2fb4606f38deefa76da5d853645739f2faa315de.tar.zst nixlib-2fb4606f38deefa76da5d853645739f2faa315de.zip |
Merge branch 'master' into staging
Haskell rebuild. Hydra: ?compare=1430378
Diffstat (limited to 'nixos/modules/module-list.nix')
-rw-r--r-- | nixos/modules/module-list.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 51f9917b192c..1942cca23d6e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -425,6 +425,7 @@ ./services/network-filesystems/yandex-disk.nix ./services/network-filesystems/xtreemfs.nix ./services/networking/amuled.nix + ./services/networking/aria2.nix ./services/networking/asterisk.nix ./services/networking/atftpd.nix ./services/networking/avahi-daemon.nix |