diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index d3786baebb13..1beb867fe91d 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -29,6 +29,7 @@ openldap, pcre2, libkrb5, + libcap, cifs-utils, glib, keyutils, @@ -51,6 +52,7 @@ docbook_xsl, docbook_xml_dtd_45, testers, + versionCheckHook, nix-update-script, nixosTests, withSudo ? false, @@ -61,13 +63,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sssd"; - version = "2.9.7"; + version = "2.11.1"; src = fetchFromGitHub { owner = "SSSD"; repo = "sssd"; tag = finalAttrs.version; - hash = "sha256-29KTvwm9ei1Z7yTSYmzcZtZMVvZpFWIlcLMlvRyWp/w="; + hash = "sha256-JN4GVx5rBfNBLaMpLcKgyd+CyNDafz85BXUcfg5kDXQ="; }; postPatch = '' @@ -93,6 +95,7 @@ stdenv.mkDerivation (finalAttrs: { --with-pid-path=/run --with-python3-bindings --with-syslog=journald + --with-initscript=systemd --without-selinux --without-semanage --with-xml-catalog-path=''${SGML_CATALOG_FILES%%:*} @@ -108,12 +111,14 @@ stdenv.mkDerivation (finalAttrs: { # Disable parallel install due to missing depends: # libtool: error: error: relink '_py3sss.la' with the above command before installing i enableParallelInstalling = false; + nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config doxygen ]; + buildInputs = [ augeas dnsutils @@ -121,6 +126,7 @@ stdenv.mkDerivation (finalAttrs: { curl cyrus_sasl ding-libs + libcap libnl libunistring nss @@ -129,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: { p11-kit (python3.withPackages ( p: with p; [ + setuptools distutils python-ldap ] @@ -187,31 +194,34 @@ stdenv.mkDerivation (finalAttrs: { rm -f "$out"/modules/ldb/memberof.la find "$out" -depth -type d -exec rmdir --ignore-fail-on-non-empty {} \; ''; + postFixup = '' for f in $out/bin/sss{ctl,_cache,_debuglevel,_override,_seed}; do wrapProgram $f --prefix LDB_MODULES_PATH : $out/modules/ldb done ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + passthru = { tests = { inherit (nixosTests) sssd sssd-ldap; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "sssd --version"; - }; }; updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "System Security Services Daemon"; homepage = "https://sssd.io/"; changelog = "https://sssd.io/release-notes/sssd-${finalAttrs.version}.html"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ illustris ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ illustris ]; pkgConfigModules = [ "ipa_hbac" "sss_certmap"