nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

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.

authored by

Benjamin Staffin and committed by
GitHub
e1a78cc1 2fa1303a

+1 -20
+1 -7
pkgs/os-specific/linux/freeipa/default.nix
··· 39 39 }: 40 40 41 41 let 42 - pathsPy = ./paths.py; 43 - 44 42 pythonInputs = with python3.pkgs; [ 45 43 distutils 46 44 six ··· 127 129 postPatch = '' 128 130 patchShebangs makeapi makeaci install/ui/util 129 131 130 - substituteInPlace ipaplatform/setup.py \ 131 - --replace 'ipaplatform.debian' 'ipaplatform.nixos' 132 - 133 132 substituteInPlace ipasetup.py.in \ 134 133 --replace 'int(v)' 'int(v.replace("post", ""))' 135 134 136 135 substituteInPlace client/ipa-join.c \ 137 136 --replace /usr/sbin/ipa-getkeytab $out/bin/ipa-getkeytab 138 137 139 - cp -r ipaplatform/{fedora,nixos} 140 - substitute ${pathsPy} ipaplatform/nixos/paths.py \ 138 + substituteInPlace ipaplatform/nixos/paths.py \ 141 139 --subst-var out \ 142 140 --subst-var-by bind ${bind.dnsutils} \ 143 141 --subst-var-by curl ${curl} \
-13
pkgs/os-specific/linux/freeipa/paths.py
··· 1 - from ipaplatform.fedora.paths import FedoraPathNamespace 2 - 3 - class NixOSPathNamespace(FedoraPathNamespace): 4 - SBIN_IPA_JOIN = "@out@/bin/ipa-join" 5 - IPA_GETCERT = "@out@/bin/ipa-getcert" 6 - IPA_RMKEYTAB = "@out@/bin/ipa-rmkeytab" 7 - IPA_GETKEYTAB = "@out@/bin/ipa-getkeytab" 8 - NSUPDATE = "@bind@/bin/nsupdate" 9 - BIN_CURL = "@curl@/bin/curl" 10 - KINIT = "@kerberos@/bin/kinit" 11 - KDESTROY = "@kerberos@/bin/kdestroy" 12 - 13 - paths = NixOSPathNamespace()