pyrox.dev
Merge pull request #320116 from pyrox0/sssd-2.9.5
sssd: 2.9.4 -> 2.9.5
+7
-15
pkgs/os-specific/linux/sssd/default.nix
+7
-15
pkgs/os-specific/linux/sssd/default.nix
···
3
3
python3, pam, popt, talloc, tdb, tevent, pkg-config, ldb, openldap,
4
4
pcre2, libkrb5, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2,
5
5
libuuid, systemd, nspr, check, cmocka, uid_wrapper, p11-kit,
6
-
nss_wrapper, ncurses, Po4a, http-parser, jansson, jose,
7
-
docbook_xsl, docbook_xml_dtd_44,
8
-
testers, nix-update-script, nixosTests, fetchpatch,
6
+
nss_wrapper, ncurses, Po4a, jansson, jose,
7
+
docbook_xsl, docbook_xml_dtd_45,
8
+
testers, nix-update-script, nixosTests,
9
9
withSudo ? false }:
10
10
11
11
let
12
-
docbookFiles = "${docbook_xsl}/share/xml/docbook-xsl/catalog.xml:${docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml";
12
+
docbookFiles = "${docbook_xsl}/share/xml/docbook-xsl/catalog.xml:${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
13
13
in
14
14
stdenv.mkDerivation (finalAttrs: {
15
15
pname = "sssd";
16
-
version = "2.9.4";
16
+
version = "2.9.5";
17
17
18
18
src = fetchFromGitHub {
19
19
owner = "SSSD";
20
20
repo = "sssd";
21
21
rev = "refs/tags/${finalAttrs.version}";
22
-
hash = "sha256-VJXZndbmC6mAVxzvv5Wjb4adrQkP16Rt4cgjl4qGDIc=";
22
+
hash = "sha256-wr6qFgM5XN3aizYVquj0xF+mVRgrkLWWhA3/gQOK8hQ=";
23
23
};
24
-
25
-
patches = [
26
-
# Fix the build with Samba 4.20
27
-
(fetchpatch {
28
-
url = "https://github.com/SSSD/sssd/commit/1bf51929a48b84d62ac54f2a42f17e7fbffe1612.patch";
29
-
hash = "sha256-VLx04APEipp860iOJNIwTGywxZ7rIDdyh3te6m7Ymlo=";
30
-
})
31
-
];
32
24
33
25
postPatch = ''
34
26
patchShebangs ./sbus_generate.sh.in
···
74
66
talloc tdb tevent ldb pam openldap pcre2 libkrb5
75
67
cifs-utils glib keyutils dbus fakeroot libxslt libxml2
76
68
libuuid python3.pkgs.python-ldap systemd nspr check cmocka uid_wrapper
77
-
nss_wrapper ncurses Po4a http-parser jansson jose ];
69
+
nss_wrapper ncurses Po4a jansson jose ];
78
70
79
71
makeFlags = [
80
72
"SGML_CATALOG_FILES=${docbookFiles}"