diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-05-18 14:34:25 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-05-18 16:21:12 +0000 |
commit | 93e90ca356baed5941e1cccf8c0d8e3e2c460e29 (patch) | |
tree | f6c26f06a2f830a3f1bab00fdc029b76be8805c6 /nixpkgs/nixos/modules/module-list.nix | |
parent | d2753504ef2bd591ade35851dad31d3aac117e19 (diff) | |
parent | b47873026c7e356a340d0e1de7789d4e8428ac66 (diff) | |
download | nixlib-93e90ca356baed5941e1cccf8c0d8e3e2c460e29.tar nixlib-93e90ca356baed5941e1cccf8c0d8e3e2c460e29.tar.gz nixlib-93e90ca356baed5941e1cccf8c0d8e3e2c460e29.tar.bz2 nixlib-93e90ca356baed5941e1cccf8c0d8e3e2c460e29.tar.lz nixlib-93e90ca356baed5941e1cccf8c0d8e3e2c460e29.tar.xz nixlib-93e90ca356baed5941e1cccf8c0d8e3e2c460e29.tar.zst nixlib-93e90ca356baed5941e1cccf8c0d8e3e2c460e29.zip |
Merge commit 'b47873026c7e356a340d0e1de7789d4e8428ac66'
Diffstat (limited to 'nixpkgs/nixos/modules/module-list.nix')
-rw-r--r-- | nixpkgs/nixos/modules/module-list.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixpkgs/nixos/modules/module-list.nix b/nixpkgs/nixos/modules/module-list.nix index a266554f7bec..39c7e575bcb0 100644 --- a/nixpkgs/nixos/modules/module-list.nix +++ b/nixpkgs/nixos/modules/module-list.nix @@ -794,6 +794,7 @@ ./services/security/nginx-sso.nix ./services/security/oauth2_proxy.nix ./services/security/oauth2_proxy_nginx.nix + ./services/security/privacyidea.nix ./services/security/physlock.nix ./services/security/shibboleth-sp.nix ./services/security/sks.nix @@ -1003,7 +1004,6 @@ ./virtualisation/podman.nix ./virtualisation/qemu-guest-agent.nix ./virtualisation/railcar.nix - ./virtualisation/rkt.nix ./virtualisation/virtualbox-guest.nix ./virtualisation/virtualbox-host.nix ./virtualisation/vmware-guest.nix |