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

Merge pull request #48794 from markuskowa/fix-samba-ib

Browse Source 
samba: remove defunct infiniband support
This commit is contained in:
Joachim F 2018-10-23 14:38:41 +00:00 committed by GitHub
commit 48fd1fb0d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,10 +3,8 @@
, docbook_xml_dtd_42, readline, talloc , docbook_xml_dtd_42, readline, talloc
, popt, iniparser, libbsd, libarchive, libiconv, gettext , popt, iniparser, libbsd, libarchive, libiconv, gettext
, krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs , krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs
, gnutls , gnutls, ncurses, libunwind, systemd
, ncurses, libunwind, libibverbs, librdmacm, systemd
, enableInfiniband ? false
, enableLDAP ? false , enableLDAP ? false
, enablePrinting ? false , enablePrinting ? false
, enableMDNS ? false , enableMDNS ? false
@ -47,7 +45,6 @@ stdenv.mkDerivation rec {
libbsd libarchive zlib fam libiconv gettext libunwind krb5Full libbsd libarchive zlib fam libiconv gettext libunwind krb5Full
] ]
++ optionals stdenv.isLinux [ libaio systemd ] ++ optionals stdenv.isLinux [ libaio systemd ]
++ optionals (enableInfiniband && stdenv.isLinux) [ libibverbs librdmacm ]
++ optional enableLDAP openldap ++ optional enableLDAP openldap
++ optional (enablePrinting && stdenv.isLinux) cups ++ optional (enablePrinting && stdenv.isLinux) cups
++ optional enableMDNS avahi ++ optional enableMDNS avahi

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

@ -13684,7 +13684,6 @@ with pkgs;
}); });
samba4Full = lowPrio (samba4.override { samba4Full = lowPrio (samba4.override {
enableInfiniband = true;
enableLDAP = true; enableLDAP = true;
enablePrinting = true; enablePrinting = true;
enableMDNS = true; enableMDNS = true;