From e3466f56e1fe5121c8fb5cc1c6207f4a6b26c7a7 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 6 Apr 2024 13:15:55 +0200 Subject: [PATCH] samba: add meta.pkgConfigModules, passthru.tests.{pkg-config,version} --- pkgs/servers/samba/4.x.nix | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 66a9bcc5c684..ad87ffaf536f 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -34,6 +34,7 @@ , python3Packages , nixosTests , libiconv +, testers , enableLDAP ? false, openldap , enablePrinting ? false, cups @@ -59,12 +60,12 @@ let inherit python; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "samba"; version = "4.20.0"; src = fetchurl { - url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; + url = "mirror://samba/pub/samba/stable/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; hash = "sha256-AmclQlEKxuXQyRwMFNkKtObsOXxwnpUsbaOm4LTVpC8="; }; @@ -232,8 +233,15 @@ stdenv.mkDerivation rec { lib.optionals (buildPackages.python3Packages.python != python3Packages.python) [ buildPackages.python3Packages.python ]; - passthru = { - tests.samba = nixosTests.samba; + passthru.tests = { + samba = nixosTests.samba; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + version = testers.testVersion { + command = "${finalAttrs.finalPackage}/bin/smbd -V"; + package = finalAttrs.finalPackage; + }; }; meta = with lib; { @@ -243,5 +251,20 @@ stdenv.mkDerivation rec { platforms = platforms.unix; broken = enableGlusterFS; maintainers = with maintainers; [ aneeshusa ]; + pkgConfigModules = [ + "dcerpc_samr" + "dcerpc" + "ndr_krb5pac" + "ndr_nbt" + "ndr_standard" + "ndr" + "netapi" + "samba-credentials" + "samba-hostconfig" + "samba-util" + "samdb" + "smbclient" + "wbclient" + ]; }; -} +})