diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-07 03:41:24 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-07 03:41:24 +0200 |
| commit | 4c6c919a3141b14c3e90607f171e534a82eceeb0 (patch) | |
| tree | 9ea646e0f14fa84fa38a545a4edc33926208db96 /nixos/modules/module-list.nix | |
| parent | 335ae386741f74c63cf3bf4b7022a1e5e5f26066 (diff) | |
| parent | fc1224d55dfdde0a3e43635fc9465cdff0bb80a3 (diff) | |
| download | nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.gz nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.bz2 nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.lz nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.xz nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.zst nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts: pkgs/os-specific/linux/kernel/generic.nix
Diffstat (limited to 'nixos/modules/module-list.nix')
| -rw-r--r-- | nixos/modules/module-list.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2ec8b28c3fc4..d9d80bcff818 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -417,7 +417,8 @@ ./services/network-filesystems/ipfs.nix ./services/network-filesystems/netatalk.nix ./services/network-filesystems/nfsd.nix - ./services/network-filesystems/openafs-client/default.nix + ./services/network-filesystems/openafs/client.nix + ./services/network-filesystems/openafs/server.nix ./services/network-filesystems/rsyncd.nix ./services/network-filesystems/samba.nix ./services/network-filesystems/tahoe.nix |