diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2021-06-03 20:56:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-03 20:56:27 +0200 |
| commit | 54fd06550c6e0ebe0f6252c6e86c6ef18c87ffd6 (patch) | |
| tree | 5ca18c191bf07dee50b826c3ee15b7694c1d5b7d | |
| parent | nix: 2.3.11 -> 2.3.12 (diff) | |
| parent | samba4Full: disable glusterfs support (diff) | |
| download | nixpkgs-54fd06550c6e0ebe0f6252c6e86c6ef18c87ffd6.tar.gz | |
Merge pull request #125546 from NixOS/backport-125105-to-release-21.05
| -rw-r--r-- | pkgs/servers/samba/4.x.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 7beaeb20943d..3ae30699546d 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -26,6 +26,7 @@ , tdb , cmocka , rpcsvc-proto +, python3Packages , nixosTests , enableLDAP ? false, openldap @@ -91,10 +92,10 @@ stdenv.mkDerivation rec { libtasn1 tdb ] ++ optionals stdenv.isLinux [ liburing systemd ] - ++ optional enableLDAP openldap + ++ optionals enableLDAP [ openldap.dev python3Packages.markdown ] ++ optional (enablePrinting && stdenv.isLinux) cups ++ optional enableMDNS avahi - ++ optionals enableDomainController [ gpgme lmdb ] + ++ optionals enableDomainController [ gpgme lmdb python3Packages.dnspython ] ++ optional enableRegedit ncurses ++ optional (enableCephFS && stdenv.isLinux) libceph ++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 59ccdefe7246..0fbbc9b56339 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19680,7 +19680,6 @@ in enableDomainController = true; enableRegedit = true; enableCephFS = !pkgs.stdenv.hostPlatform.isAarch64; - enableGlusterFS = true; }); sambaFull = samba4Full; |