Skip to content

Commit 7f0f1da

Browse files
authored
sssd and freeipa: fix mutual python version & deps (#381013)
2 parents e5cbdf6 + cd2166e commit 7f0f1da

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

pkgs/os-specific/linux/freeipa/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ let
6464
jinja2
6565
augeas
6666
samba
67+
ifaddr
6768
];
6869
in
6970
stdenv.mkDerivation rec {

pkgs/os-specific/linux/sssd/default.nix

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ stdenv.mkDerivation (finalAttrs: {
8383
preConfigure =
8484
''
8585
export SGML_CATALOG_FILES="${docbookFiles}"
86-
export PYTHONPATH=$(find ${python3.pkgs.python-ldap} -type d -name site-packages)
8786
export PATH=$PATH:${openldap}/libexec
8887
8988
configureFlagsArray=(
@@ -129,7 +128,12 @@ stdenv.mkDerivation (finalAttrs: {
129128
samba
130129
nfs-utils
131130
p11-kit
132-
python3
131+
(python3.withPackages (
132+
p: with p; [
133+
distutils
134+
python-ldap
135+
]
136+
))
133137
popt
134138
talloc
135139
tdb
@@ -147,7 +151,6 @@ stdenv.mkDerivation (finalAttrs: {
147151
libxslt
148152
libxml2
149153
libuuid
150-
python3.pkgs.python-ldap
151154
systemd
152155
nspr
153156
check

pkgs/top-level/all-packages.nix

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5321,10 +5321,8 @@ with pkgs;
53215321
globalprotect-openconnect = libsForQt5.callPackage ../tools/networking/globalprotect-openconnect { };
53225322

53235323
sssd = callPackage ../os-specific/linux/sssd {
5324+
# NOTE: freeipa and sssd need to be built with the same version of python
53245325
inherit (perlPackages) Po4a;
5325-
# python312Packages.python-ldap is broken
5326-
# https://github.com/NixOS/nixpkgs/issues/326296
5327-
python3 = python311;
53285326
};
53295327

53305328
sentry-cli = callPackage ../development/tools/sentry-cli {
@@ -8815,6 +8813,7 @@ with pkgs;
88158813
};
88168814

88178815
freeipa = callPackage ../os-specific/linux/freeipa {
8816+
# NOTE: freeipa and sssd need to be built with the same version of python
88188817
kerberos = krb5.override {
88198818
withVerto = true;
88208819
};

0 commit comments

Comments
 (0)