public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #125546 from NixOS/backport-125105-to-release-21.05

Browse Source
This commit is contained in:
Martin Weinelt 2021-06-03 20:56:27 +02:00 committed by GitHub
commit 54fd06550c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/servers/samba/4.x.nix
View File

@ -26,6 +26,7 @@
, tdb , tdb
, cmocka , cmocka
, rpcsvc-proto , rpcsvc-proto
, python3Packages
, nixosTests , nixosTests
, enableLDAP ? false, openldap , enableLDAP ? false, openldap
@ -91,10 +92,10 @@ stdenv.mkDerivation rec {
libtasn1 libtasn1
tdb tdb
] ++ optionals stdenv.isLinux [ liburing systemd ] ] ++ optionals stdenv.isLinux [ liburing systemd ]
++ optional enableLDAP openldap ++ optionals enableLDAP [ openldap.dev python3Packages.markdown ]
++ optional (enablePrinting && stdenv.isLinux) cups ++ optional (enablePrinting && stdenv.isLinux) cups
++ optional enableMDNS avahi ++ optional enableMDNS avahi
++ optionals enableDomainController [ gpgme lmdb ] ++ optionals enableDomainController [ gpgme lmdb python3Packages.dnspython ]
++ optional enableRegedit ncurses ++ optional enableRegedit ncurses
++ optional (enableCephFS && stdenv.isLinux) libceph ++ optional (enableCephFS && stdenv.isLinux) libceph
++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ] ++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ]

1
pkgs/top-level/all-packages.nix
View File

@ -19680,7 +19680,6 @@ in
enableDomainController = true; enableDomainController = true;
enableRegedit = true; enableRegedit = true;
enableCephFS = !pkgs.stdenv.hostPlatform.isAarch64; enableCephFS = !pkgs.stdenv.hostPlatform.isAarch64;
enableGlusterFS = true;
}); });
sambaFull = samba4Full; sambaFull = samba4Full;