diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-11 12:04:41 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-11 12:04:41 +0000 |
commit | 8e50248719f5051caa7326aea5bfb18f07fadf92 (patch) | |
tree | 3f2dd7e5d3862e23be99988b8b70e8b24ded1051 /nixos/modules/module-list.nix | |
parent | 4f3594e9d387669c58b26d5a1e5e3e898b94af5f (diff) | |
parent | 212846c302a1e805d325b256111e6833f2ae30ba (diff) | |
download | nixpkgs-8e50248719f5051caa7326aea5bfb18f07fadf92.tar nixpkgs-8e50248719f5051caa7326aea5bfb18f07fadf92.tar.gz nixpkgs-8e50248719f5051caa7326aea5bfb18f07fadf92.tar.bz2 nixpkgs-8e50248719f5051caa7326aea5bfb18f07fadf92.tar.lz nixpkgs-8e50248719f5051caa7326aea5bfb18f07fadf92.tar.xz nixpkgs-8e50248719f5051caa7326aea5bfb18f07fadf92.tar.zst nixpkgs-8e50248719f5051caa7326aea5bfb18f07fadf92.zip |
Merge staging-next into staging
Diffstat (limited to 'nixos/modules/module-list.nix')
-rw-r--r-- | nixos/modules/module-list.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bc35f7c4794..778ae249162 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -198,7 +198,6 @@ ./programs/waybar.nix ./programs/wireshark.nix ./programs/wshowkeys.nix - ./programs/x2goserver.nix ./programs/xfs_quota.nix ./programs/xonsh.nix ./programs/xss-lock.nix @@ -855,6 +854,7 @@ ./services/networking/xandikos.nix ./services/networking/xinetd.nix ./services/networking/xl2tpd.nix + ./services/networking/x2goserver.nix ./services/networking/xrdp.nix ./services/networking/yggdrasil.nix ./services/networking/zerobin.nix |