diff options
author | Graham Christensen <graham@grahamc.com> | 2018-03-09 17:29:17 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-09 17:29:17 -0500 |
commit | 601857b41828570ca2b084a28d3bef1e4e825fd1 (patch) | |
tree | a01841f824e980e7765b94f4b8ff21e237e691e8 /pkgs/servers | |
parent | 21d85a5d0f31126b347c4ac7312f440d0da7c81d (diff) | |
parent | a14df21aae6cfc3d56ebe73cfd61d9caa03b35d1 (diff) | |
download | nixlib-601857b41828570ca2b084a28d3bef1e4e825fd1.tar nixlib-601857b41828570ca2b084a28d3bef1e4e825fd1.tar.gz nixlib-601857b41828570ca2b084a28d3bef1e4e825fd1.tar.bz2 nixlib-601857b41828570ca2b084a28d3bef1e4e825fd1.tar.lz nixlib-601857b41828570ca2b084a28d3bef1e4e825fd1.tar.xz nixlib-601857b41828570ca2b084a28d3bef1e4e825fd1.tar.zst nixlib-601857b41828570ca2b084a28d3bef1e4e825fd1.zip |
Merge pull request #36479 from NeQuissimus/zfh_samba
samba: 4.7.4 -> 4.7.5
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/samba/4.x.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 90b00169a513..187e79da43c0 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl , docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc , popt, iniparser, libbsd, libarchive, libiconv, gettext -, kerberos, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs +, krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs , gnutls, libgcrypt, libgpgerror , ncurses, libunwind, libibverbs, librdmacm, systemd @@ -19,11 +19,11 @@ with lib; stdenv.mkDerivation rec { name = "samba-${version}"; - version = "4.7.4"; + version = "4.7.5"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "0iw290n0q4l5s92d0f9yz27yp3rdfr6bvsmvg1xvd19g8p2d04pv"; + sha256 = "13gyr0sk9vx6mccr2h35ca3g92kp50cqxrlzfgrddfmskzx08v9i"; }; outputs = [ "out" "dev" "man" ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /* docbook_xml_dtd_45 */ readline talloc popt iniparser - libbsd libarchive zlib acl fam libiconv gettext libunwind kerberos + libbsd libarchive zlib acl fam libiconv gettext libunwind krb5Full ] ++ optionals stdenv.isLinux [ libaio pam systemd ] ++ optionals (enableInfiniband && stdenv.isLinux) [ libibverbs librdmacm ] @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { [ "--with-static-modules=NONE" "--with-shared-modules=ALL" "--with-system-mitkrb5" + "--with-system-mitkdc" "${krb5Full}" "--enable-fhs" "--sysconfdir=/etc" "--localstatedir=/var" |