mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 03:23:29 +03:00
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:
parent
2fa1303aa6
commit
e1a78cc16e
2 changed files with 1 additions and 20 deletions
|
@ -39,8 +39,6 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
pathsPy = ./paths.py;
|
|
||||||
|
|
||||||
pythonInputs = with python3.pkgs; [
|
pythonInputs = with python3.pkgs; [
|
||||||
distutils
|
distutils
|
||||||
six
|
six
|
||||||
|
@ -129,17 +127,13 @@ stdenv.mkDerivation rec {
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs makeapi makeaci install/ui/util
|
patchShebangs makeapi makeaci install/ui/util
|
||||||
|
|
||||||
substituteInPlace ipaplatform/setup.py \
|
|
||||||
--replace 'ipaplatform.debian' 'ipaplatform.nixos'
|
|
||||||
|
|
||||||
substituteInPlace ipasetup.py.in \
|
substituteInPlace ipasetup.py.in \
|
||||||
--replace 'int(v)' 'int(v.replace("post", ""))'
|
--replace 'int(v)' 'int(v.replace("post", ""))'
|
||||||
|
|
||||||
substituteInPlace client/ipa-join.c \
|
substituteInPlace client/ipa-join.c \
|
||||||
--replace /usr/sbin/ipa-getkeytab $out/bin/ipa-getkeytab
|
--replace /usr/sbin/ipa-getkeytab $out/bin/ipa-getkeytab
|
||||||
|
|
||||||
cp -r ipaplatform/{fedora,nixos}
|
substituteInPlace ipaplatform/nixos/paths.py \
|
||||||
substitute ${pathsPy} ipaplatform/nixos/paths.py \
|
|
||||||
--subst-var out \
|
--subst-var out \
|
||||||
--subst-var-by bind ${bind.dnsutils} \
|
--subst-var-by bind ${bind.dnsutils} \
|
||||||
--subst-var-by curl ${curl} \
|
--subst-var-by curl ${curl} \
|
||||||
|
|
|
@ -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()
|
|
Loading…
Add table
Add a link
Reference in a new issue