summary refs log tree commit diff
path: root/nixos/modules/module-list.nix
diff options
context:
space:
mode:
authorJaka Hudoklin <jakahudoklin@gmail.com>2016-10-01 17:22:34 +0200
committerGitHub <noreply@github.com>2016-10-01 17:22:34 +0200
commit98a8146428b28354182dbe1eff78e3f540f565a6 (patch)
tree016bcda175232d93c8ee4ece4aa3e2ae67a0aa40 /nixos/modules/module-list.nix
parentfcee1d0b28aa0f45f559d38659fd2a11cd34dafe (diff)
parentfeb9fc3aff07698a01163336613224b08547d65b (diff)
downloadnixlib-98a8146428b28354182dbe1eff78e3f540f565a6.tar
nixlib-98a8146428b28354182dbe1eff78e3f540f565a6.tar.gz
nixlib-98a8146428b28354182dbe1eff78e3f540f565a6.tar.bz2
nixlib-98a8146428b28354182dbe1eff78e3f540f565a6.tar.lz
nixlib-98a8146428b28354182dbe1eff78e3f540f565a6.tar.xz
nixlib-98a8146428b28354182dbe1eff78e3f540f565a6.tar.zst
nixlib-98a8146428b28354182dbe1eff78e3f540f565a6.zip
Merge pull request #19016 from offlinehacker/pkgs/flannel/update/0.6.2
flannel: update, add nixos module, add tests
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 2978eaefb46b..7ae3722bc8f5 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -346,6 +346,7 @@
   ./services/networking/ferm.nix
   ./services/networking/firefox/sync-server.nix
   ./services/networking/firewall.nix
+  ./services/networking/flannel.nix
   ./services/networking/flashpolicyd.nix
   ./services/networking/freenet.nix
   ./services/networking/gale.nix