From a41d96f45f3b847598dcbce503ce645f68f5b806 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 24 Mar 2020 09:59:16 +0300 Subject: [PATCH 1/7] samba: cleanup build configuration --- pkgs/servers/samba/4.x.nix | 80 +++++++++++++++++++++++++++++++------- 1 file changed, 67 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index d24a9b9748a..fedc2327af6 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,9 +1,40 @@ -{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen +{ stdenv +, fetchurl +, python +, pkgconfig +, perl +, libxslt +, docbook_xsl +, rpcgen , fixDarwinDylibNames -, docbook_xml_dtd_42, readline -, popt, iniparser, libbsd, libarchive, libiconv, gettext -, krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, liburing, fam, libceph, glusterfs -, gnutls, ncurses, libunwind, systemd, jansson, lmdb, gpgme, libuuid +, docbook_xml_dtd_42 +, readline +, popt +, iniparser +, libbsd +, libarchive +, libiconv +, gettext +, krb5Full +, zlib +, openldap +, cups +, pam +, avahi +, acl +, libaio +, liburing +, fam +, libceph +, glusterfs +, gnutls +, ncurses +, libunwind +, systemd +, jansson +, lmdb +, gpgme +, libuuid , enableLDAP ? false , enablePrinting ? false @@ -16,7 +47,7 @@ , enablePam ? (!stdenv.isDarwin) }: -with lib; +with stdenv.lib; stdenv.mkDerivation rec { pname = "samba"; @@ -36,12 +67,33 @@ stdenv.mkDerivation rec { ./4.x-fix-makeflags-parsing.patch ]; - nativeBuildInputs = [ pkgconfig perl perl.pkgs.ParseYapp libxslt docbook_xsl docbook_xml_dtd_42 ] - ++ optionals stdenv.isDarwin [ rpcgen fixDarwinDylibNames ]; + nativeBuildInputs = [ + pkgconfig + perl + perl.pkgs.ParseYapp + libxslt + docbook_xsl + docbook_xml_dtd_42 + ] ++ optionals stdenv.isDarwin [ + rpcgen + fixDarwinDylibNames + ]; buildInputs = [ - python readline popt iniparser jansson - libbsd libarchive zlib fam libiconv gettext libunwind krb5Full gnutls + python + readline + popt + iniparser + jansson + libbsd + libarchive + zlib + fam + libiconv + gettext + libunwind + krb5Full + gnutls ] ++ optionals stdenv.isLinux [ libaio liburing systemd ] ++ optional enableLDAP openldap ++ optional (enablePrinting && stdenv.isLinux) cups @@ -67,7 +119,7 @@ stdenv.mkDerivation rec { "--with-static-modules=NONE" "--with-shared-modules=ALL" "--with-system-mitkrb5" - "--with-system-mitkdc" krb5Full + "--with-system-mitkdc=${krb5Full}" "--enable-fhs" "--sysconfdir=/etc" "--localstatedir=/var" @@ -75,8 +127,10 @@ stdenv.mkDerivation rec { ] ++ singleton (if enableDomainController then "--with-experimental-mit-ad-dc" else "--without-ad-dc") - ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ] - ++ optional (!enableAcl) "--without-acl-support" + ++ optionals (!enableLDAP) [ + "--without-ldap" + "--without-ads" + ] ++ optional (!enableAcl) "--without-acl-support" ++ optional (!enablePam) "--without-pam"; preBuild = '' From e1b3a529e1d8321a41a6c5d44d263a8c35b9f0a7 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 25 Mar 2020 11:28:36 +0300 Subject: [PATCH 2/7] samba: fix deps --- pkgs/servers/samba/4.x.nix | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index fedc2327af6..e8c42b77619 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -17,34 +17,23 @@ , gettext , krb5Full , zlib -, openldap -, cups -, pam -, avahi -, acl , libaio , liburing , fam -, libceph -, glusterfs , gnutls -, ncurses , libunwind , systemd , jansson -, lmdb -, gpgme -, libuuid -, enableLDAP ? false -, enablePrinting ? false -, enableMDNS ? false -, enableDomainController ? false -, enableRegedit ? true -, enableCephFS ? false -, enableGlusterFS ? false -, enableAcl ? (!stdenv.isDarwin) -, enablePam ? (!stdenv.isDarwin) +, enableLDAP ? false, openldap +, enablePrinting ? false, cups +, enableMDNS ? false, avahi +, enableDomainController ? false, gpgme, lmdb +, enableRegedit ? true, ncurses +, enableCephFS ? false, libceph +, enableGlusterFS ? false, glusterfs, libuuid +, enableAcl ? (!stdenv.isDarwin), acl +, enablePam ? (!stdenv.isDarwin), pam }: with stdenv.lib; From 0c43bd4ef832d57a7f07ec329c14cdb535c1f559 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 25 Mar 2020 11:53:04 +0300 Subject: [PATCH 3/7] samba: remove unused packages --- pkgs/servers/samba/4.x.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index e8c42b77619..f0902a235e6 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -10,14 +10,10 @@ , docbook_xml_dtd_42 , readline , popt -, iniparser , libbsd , libarchive -, libiconv -, gettext , krb5Full , zlib -, libaio , liburing , fam , gnutls @@ -72,18 +68,15 @@ stdenv.mkDerivation rec { python readline popt - iniparser jansson libbsd libarchive zlib fam - libiconv - gettext libunwind krb5Full gnutls - ] ++ optionals stdenv.isLinux [ libaio liburing systemd ] + ] ++ optionals stdenv.isLinux [ liburing systemd ] ++ optional enableLDAP openldap ++ optional (enablePrinting && stdenv.isLinux) cups ++ optional enableMDNS avahi From 4a01c9433b1490cf7804ad1837f91e555953f6d1 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 25 Mar 2020 12:53:38 +0300 Subject: [PATCH 4/7] samba: add needed packages --- pkgs/servers/samba/4.x.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index f0902a235e6..2bb614e652d 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -2,12 +2,14 @@ , fetchurl , python , pkgconfig +, bison +, flex , perl , libxslt , docbook_xsl , rpcgen , fixDarwinDylibNames -, docbook_xml_dtd_42 +, docbook_xml_dtd_45 , readline , popt , libbsd @@ -20,6 +22,9 @@ , libunwind , systemd , jansson +, libtasn1 +, tdb +, cmocka , enableLDAP ? false, openldap , enablePrinting ? false, cups @@ -54,11 +59,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig + bison + flex perl perl.pkgs.ParseYapp libxslt docbook_xsl - docbook_xml_dtd_42 + docbook_xml_dtd_45 + cmocka ] ++ optionals stdenv.isDarwin [ rpcgen fixDarwinDylibNames @@ -76,6 +84,8 @@ stdenv.mkDerivation rec { libunwind krb5Full gnutls + libtasn1 + tdb ] ++ optionals stdenv.isLinux [ liburing systemd ] ++ optional enableLDAP openldap ++ optional (enablePrinting && stdenv.isLinux) cups From 911179ef656d6f2a71ffaf38dbed8998153e2afb Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 25 Mar 2020 13:22:24 +0300 Subject: [PATCH 5/7] samba: add option enableKerberos --- pkgs/servers/samba/4.x.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 2bb614e652d..e9f505d7057 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -14,7 +14,6 @@ , popt , libbsd , libarchive -, krb5Full , zlib , liburing , fam @@ -30,6 +29,7 @@ , enablePrinting ? false, cups , enableMDNS ? false, avahi , enableDomainController ? false, gpgme, lmdb +, enableKerberos ? true, krb5Full , enableRegedit ? true, ncurses , enableCephFS ? false, libceph , enableGlusterFS ? false, glusterfs, libuuid @@ -82,7 +82,6 @@ stdenv.mkDerivation rec { zlib fam libunwind - krb5Full gnutls libtasn1 tdb @@ -91,6 +90,7 @@ stdenv.mkDerivation rec { ++ optional (enablePrinting && stdenv.isLinux) cups ++ optional enableMDNS avahi ++ optionals enableDomainController [ gpgme lmdb ] + ++ optional enableKerberos krb5Full ++ optional enableRegedit ncurses ++ optional (enableCephFS && stdenv.isLinux) libceph ++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ] @@ -110,8 +110,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-static-modules=NONE" "--with-shared-modules=ALL" - "--with-system-mitkrb5" - "--with-system-mitkdc=${krb5Full}" "--enable-fhs" "--sysconfdir=/etc" "--localstatedir=/var" @@ -119,7 +117,10 @@ stdenv.mkDerivation rec { ] ++ singleton (if enableDomainController then "--with-experimental-mit-ad-dc" else "--without-ad-dc") - ++ optionals (!enableLDAP) [ + ++ optionals enableKerberos [ + "--with-system-mitkrb5" + "--with-system-mitkdc=${krb5Full}" + ] ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ] ++ optional (!enableAcl) "--without-acl-support" From 4b2da39fffe5585c749f8fdbb524a4f171e8a1ee Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 25 Mar 2020 13:23:36 +0300 Subject: [PATCH 6/7] samba: add option enableProfiling --- pkgs/servers/samba/4.x.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index e9f505d7057..1d6951bb8c1 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -27,6 +27,7 @@ , enableLDAP ? false, openldap , enablePrinting ? false, cups +, enableProfiling ? true , enableMDNS ? false, avahi , enableDomainController ? false, gpgme, lmdb , enableKerberos ? true, krb5Full @@ -123,7 +124,8 @@ stdenv.mkDerivation rec { ] ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" - ] ++ optional (!enableAcl) "--without-acl-support" + ] ++ optional enableProfiling "--with-profiling-data" + ++ optional (!enableAcl) "--without-acl-support" ++ optional (!enablePam) "--without-pam"; preBuild = '' From d66bab32f83757c92537f94510afc6cddd4633aa Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 25 Mar 2020 13:27:41 +0300 Subject: [PATCH 7/7] tdb: 1.3.18 -> 1.4.3 --- pkgs/development/libraries/tdb/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 9e90e3d3be4..2764e887887 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -1,18 +1,23 @@ -{ stdenv, fetchurl, wafHook, pkgconfig, readline, libxslt -, docbook_xsl, docbook_xml_dtd_42 +{ stdenv, fetchurl, pkgconfig +, wafHook, python3, readline +, libxslt, docbook_xsl, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { - name = "tdb-1.3.18"; + name = "tdb-1.4.3"; src = fetchurl { url = "mirror://samba/tdb/${name}.tar.gz"; - sha256 = "1drnsdh1w0px35r0y7l7g59yvyr67mvcsdrli4wab0mwi07b8mn1"; + sha256 = "06waz0k50c7v3chd08mzp2rv7w4k4q9isbxx3vhlfpx1vy9q61f8"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ + pkgconfig wafHook + libxslt docbook_xsl docbook_xml_dtd_45 + ]; + buildInputs = [ - readline libxslt docbook_xsl docbook_xml_dtd_42 + python3 readline ]; wafPath = "buildtools/bin/waf";