From 8d7870d6c536ac3e5024db5749d26cb3d2890eed Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 21 Oct 2018 21:55:26 +0200 Subject: [PATCH] samba: remove defunct infiniband support Even if infiniband support is enabled the option is ignored by the configure script and no depencies to libibverbs.so or librdmacm.so is contained in the output. --- pkgs/servers/samba/4.x.nix | 5 +---- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 385674c12a86..9b4c320ceb2c 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 acf4c885fee9..91da508966d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13648,7 +13648,6 @@ with pkgs; }); samba4Full = lowPrio (samba4.override { - enableInfiniband = true; enableLDAP = true; enablePrinting = true; enableMDNS = true; @@ -18595,7 +18594,7 @@ with pkgs; rclone = callPackage ../applications/networking/sync/rclone { }; rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { }; - + rcs = callPackage ../applications/version-management/rcs { }; rdesktop = callPackage ../applications/networking/remote/rdesktop { };