freeipa: Cleanup obsolete patches (#381250)

paths.py is included in freeipa since 4.11.0, along with the rest of
ipaplatform/nixos (f66160fdc9),
so our `cp -r` command has been adding a nested
`ipaplatform/nixos/fedora` directory that isn't used.

ipaplatform.nixos is also present upstream in ipaplatform/setup.py now.
This commit is contained in:
Benjamin Staffin 2025-03-10 13:11:12 -04:00 committed by GitHub
parent 2fa1303aa6
commit e1a78cc16e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 20 deletions

View file

@ -39,8 +39,6 @@
}:
let
pathsPy = ./paths.py;
pythonInputs = with python3.pkgs; [
distutils
six
@ -129,17 +127,13 @@ stdenv.mkDerivation rec {
postPatch = ''
patchShebangs makeapi makeaci install/ui/util
substituteInPlace ipaplatform/setup.py \
--replace 'ipaplatform.debian' 'ipaplatform.nixos'
substituteInPlace ipasetup.py.in \
--replace 'int(v)' 'int(v.replace("post", ""))'
substituteInPlace client/ipa-join.c \
--replace /usr/sbin/ipa-getkeytab $out/bin/ipa-getkeytab
cp -r ipaplatform/{fedora,nixos}
substitute ${pathsPy} ipaplatform/nixos/paths.py \
substituteInPlace ipaplatform/nixos/paths.py \
--subst-var out \
--subst-var-by bind ${bind.dnsutils} \
--subst-var-by curl ${curl} \

View file

@ -1,13 +0,0 @@
from ipaplatform.fedora.paths import FedoraPathNamespace
class NixOSPathNamespace(FedoraPathNamespace):
SBIN_IPA_JOIN = "@out@/bin/ipa-join"
IPA_GETCERT = "@out@/bin/ipa-getcert"
IPA_RMKEYTAB = "@out@/bin/ipa-rmkeytab"
IPA_GETKEYTAB = "@out@/bin/ipa-getkeytab"
NSUPDATE = "@bind@/bin/nsupdate"
BIN_CURL = "@curl@/bin/curl"
KINIT = "@kerberos@/bin/kinit"
KDESTROY = "@kerberos@/bin/kdestroy"
paths = NixOSPathNamespace()