cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

samba: 4.10.11 -> 4.11.3

Browse source
This commit is contained in:
Robert Scott 2019-11-13 00:25:13 +00:00 committed by Niklas Hambüchen
parent 34c71aa7ba
commit 5e7dc6248f
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/servers/samba/4.x.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen
{ lib, stdenv, fetchurl, fetchpatch, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen
, fixDarwinDylibNames
, docbook_xml_dtd_42, readline
, popt, iniparser, libbsd, libarchive, libiconv, gettext
@ -20,11 +20,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "samba";
version = "4.10.11";
version = "4.11.3";
src = fetchurl {
url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
sha256 = "157qvz8x2s7994rzxhcmpc79cfk86zc0rq5qwg8alvjcw0r457v0";
sha256 = "0id1n7774cchbiql2d6jjdi38aq582nlg1b3xm2hnvjl9nhy9jqs";
};
outputs = [ "out" "dev" "man" ];
@ -34,6 +34,11 @@ stdenv.mkDerivation rec {
./patch-source3__libads__kerberos_keytab.c.patch
./4.x-no-persistent-install-dynconfig.patch
./4.x-fix-makeflags-parsing.patch
(fetchpatch {
name = "test-oLschema2ldif-fmemopen.patch";
url = "https://gitlab.com/samba-team/samba/commit/5e517e57c9d4d35e1042a49d3592652b05f0c45b.patch";
sha256 = "1bbldf794svsdvcbp649imghmj0jck7545d3k9xs953qkkgwkbxi";
})
];
nativeBuildInputs = optionals stdenv.isDarwin [ rpcgen fixDarwinDylibNames ];
@ -41,12 +46,12 @@ stdenv.mkDerivation rec {
buildInputs = [
python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /*
docbook_xml_dtd_45 */ readline popt iniparser jansson
libbsd libarchive zlib fam libiconv gettext libunwind krb5Full
libbsd libarchive zlib fam libiconv gettext libunwind krb5Full gnutls
] ++ optionals stdenv.isLinux [ libaio systemd ]
++ optional enableLDAP openldap
++ optional (enablePrinting && stdenv.isLinux) cups
++ optional enableMDNS avahi
++ optionals enableDomainController [ gnutls gpgme lmdb ]
++ optionals enableDomainController [ gpgme lmdb ]
++ optional enableRegedit ncurses
++ optional (enableCephFS && stdenv.isLinux) libceph
++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ]