Jonathan Ringer 39669ea2b6 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/top-level/aliases.nix		2022-02-09 19:58:40 -08:00
..
litestream
openafs	openafsServer: remove dependency on syslog.target (#150294)	2021-12-11 14:46:23 -05:00
orangefs
cachefilesd.nix
ceph.nix	nixos/ceph: mime-types -> mailcap	2022-01-26 14:30:10 -08:00
davfs2.nix
diod.nix
drbd.nix	nixos/drbd: fix	2021-11-30 21:43:51 +01:00
glusterfs.nix	nixos/glusterfs: remove syslog.target from services	2021-12-11 22:43:02 +01:00
ipfs.nix	nixos/ipfs: use ipfs config replace	2022-02-06 21:42:56 +01:00
kbfs.nix
moosefs.nix	nixos/doc: add moosefs module to release notes	2022-02-03 12:33:44 +01:00
netatalk.nix
nfsd.nix
rsyncd.nix	nixos/rsyncd: fix module eval	2022-02-09 08:21:00 +01:00
samba-wsdd.nix
samba.nix
tahoe.nix
u9fs.nix
webdav-server-rs.nix
webdav.nix	nixos/webdav: set uid and gid	2021-11-30 10:19:14 +08:00
xtreemfs.nix
yandex-disk.nix