diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2018-10-23 14:38:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-23 14:38:41 +0000 |
| commit | 48fd1fb0d78ad12370f89cb82ec300a1a5355852 (patch) | |
| tree | 9240ab580519000eddb2b00ac6efb79b9dba410d | |
| parent | cea4806bc5c425d2f9d9e110ae425b010e870662 (diff) | |
| parent | 8d7870d6c536ac3e5024db5749d26cb3d2890eed (diff) | |
| download | nixlib-48fd1fb0d78ad12370f89cb82ec300a1a5355852.tar nixlib-48fd1fb0d78ad12370f89cb82ec300a1a5355852.tar.gz nixlib-48fd1fb0d78ad12370f89cb82ec300a1a5355852.tar.bz2 nixlib-48fd1fb0d78ad12370f89cb82ec300a1a5355852.tar.lz nixlib-48fd1fb0d78ad12370f89cb82ec300a1a5355852.tar.xz nixlib-48fd1fb0d78ad12370f89cb82ec300a1a5355852.tar.zst nixlib-48fd1fb0d78ad12370f89cb82ec300a1a5355852.zip | |
Merge pull request #48794 from markuskowa/fix-samba-ib
samba: remove defunct infiniband support
| -rw-r--r-- | pkgs/servers/samba/4.x.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 032d2cb0855b..38f13fcd1fa1 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -3,10 +3,8 @@ , docbook_xml_dtd_42, readline, talloc , popt, iniparser, libbsd, libarchive, libiconv, gettext , krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs -, gnutls -, ncurses, libunwind, libibverbs, librdmacm, systemd +, gnutls, ncurses, libunwind, systemd -, enableInfiniband ? false , enableLDAP ? false , enablePrinting ? false , enableMDNS ? false @@ -47,7 +45,6 @@ stdenv.mkDerivation rec { libbsd libarchive zlib fam libiconv gettext libunwind krb5Full ] ++ optionals stdenv.isLinux [ libaio systemd ] - ++ optionals (enableInfiniband && stdenv.isLinux) [ libibverbs librdmacm ] ++ optional enableLDAP openldap ++ optional (enablePrinting && stdenv.isLinux) cups ++ optional enableMDNS avahi diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b44edc0a4e7d..9a43ccf0f929 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13684,7 +13684,6 @@ with pkgs; }); samba4Full = lowPrio (samba4.override { - enableInfiniband = true; enableLDAP = true; enablePrinting = true; enableMDNS = true; |