summary refs log tree commit diff
path: root/nixos/modules/module-list.nix
diff options
context:
space:
mode:
authorMarek Mahut <marek.mahut@gmail.com>2019-11-01 15:39:50 +0100
committerGitHub <noreply@github.com>2019-11-01 15:39:50 +0100
commit43a0b4b31f271855da4038f3bfa5a548c1c61018 (patch)
tree6d041cc5ac272e287412ddd80c250deba22b748a /nixos/modules/module-list.nix
parentcf2a4fff0126a72bc566c7b8f2b3f75251f655be (diff)
parent4adb3dd7decf722c69792c92a425c796328a7da0 (diff)
downloadnixpkgs-43a0b4b31f271855da4038f3bfa5a548c1c61018.tar
nixpkgs-43a0b4b31f271855da4038f3bfa5a548c1c61018.tar.gz
nixpkgs-43a0b4b31f271855da4038f3bfa5a548c1c61018.tar.bz2
nixpkgs-43a0b4b31f271855da4038f3bfa5a548c1c61018.tar.lz
nixpkgs-43a0b4b31f271855da4038f3bfa5a548c1c61018.tar.xz
nixpkgs-43a0b4b31f271855da4038f3bfa5a548c1c61018.tar.zst
nixpkgs-43a0b4b31f271855da4038f3bfa5a548c1c61018.zip
Merge pull request #72415 from 1000101/trickster
nixos/trickster: init
Diffstat (limited to 'nixos/modules/module-list.nix')
-rw-r--r--nixos/modules/module-list.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e181cecced7..df6e4dc1336 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -718,6 +718,7 @@
   ./services/networking/tinc.nix
   ./services/networking/tinydns.nix
   ./services/networking/tftpd.nix
+  ./services/networking/trickster.nix
   ./services/networking/tox-bootstrapd.nix
   ./services/networking/tox-node.nix
   ./services/networking/toxvpn.nix