From e1a78cc16e4e3c558e15d58c0ecaabd352bebb70 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Mon, 10 Mar 2025 13:11:12 -0400 Subject: [PATCH] freeipa: Cleanup obsolete patches (#381250) paths.py is included in freeipa since 4.11.0, along with the rest of ipaplatform/nixos (https://github.com/freeipa/freeipa/commit/f66160fdc9e000db0191c21c51401256e2805cf4), 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. --- pkgs/os-specific/linux/freeipa/default.nix | 8 +------- pkgs/os-specific/linux/freeipa/paths.py | 13 ------------- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 pkgs/os-specific/linux/freeipa/paths.py diff --git a/pkgs/os-specific/linux/freeipa/default.nix b/pkgs/os-specific/linux/freeipa/default.nix index 3a7edb9abbb9..e967f01fd6be 100644 --- a/pkgs/os-specific/linux/freeipa/default.nix +++ b/pkgs/os-specific/linux/freeipa/default.nix @@ -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} \ diff --git a/pkgs/os-specific/linux/freeipa/paths.py b/pkgs/os-specific/linux/freeipa/paths.py deleted file mode 100644 index 36c0cc0c7403..000000000000 --- a/pkgs/os-specific/linux/freeipa/paths.py +++ /dev/null @@ -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()