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

Configure Feed

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

python310Packages.k5test: fix build

figsoda 30af8270 4376e41a

+63 -71
+4 -6
pkgs/development/python-modules/k5test/default.nix
··· 1 - { stdenv 2 - , lib 1 + { lib 3 2 , buildPythonPackage 3 + , pythonOlder 4 4 , fetchPypi 5 5 , substituteAll 6 - , krb5 7 6 , findutils 8 - , which 9 - , pythonOlder 7 + , krb5 8 + , stdenv 10 9 }: 11 10 12 11 buildPythonPackage rec { ··· 25 26 inherit findutils krb5; 26 27 # krb5-config is in dev output 27 28 krb5Dev = krb5.dev; 28 - which = "${which}/bin/which"; 29 29 }) 30 30 ]; 31 31
+58 -64
pkgs/development/python-modules/k5test/fix-paths.patch
··· 1 - diff --git a/k5test/_utils.py b/k5test/_utils.py 2 - index e289fac..e2f486a 100644 3 1 --- a/k5test/_utils.py 4 2 +++ b/k5test/_utils.py 5 - @@ -65,12 +65,12 @@ def find_plugin_dir(): 3 + @@ -63,12 +63,12 @@ def find_plugin_dir(): 6 4 7 5 # if there was no LD_LIBRARY_PATH, or the above failed 8 6 if _PLUGIN_DIR is None: 9 - - lib_dir = os.path.join(get_output('krb5-config --prefix'), 'lib64') 10 - + lib_dir = os.path.join(get_output('@krb5Dev@/bin/krb5-config --prefix'), 'lib64') 7 + - lib_dir = os.path.join(get_output("krb5-config --prefix"), "lib64") 8 + + lib_dir = os.path.join(get_output("@krb5Dev@/bin/krb5-config --prefix"), "lib64") 11 9 _PLUGIN_DIR = _decide_plugin_dir(_find_plugin_dirs_installed(lib_dir)) 12 10 13 11 # /usr/lib64 seems only to be distinct on Fedora/RHEL/Centos family 14 12 if _PLUGIN_DIR is None: 15 - - lib_dir = os.path.join(get_output('krb5-config --prefix'), 'lib') 16 - + lib_dir = os.path.join(get_output('@krb5Dev@/bin/krb5-config --prefix'), 'lib') 13 + - lib_dir = os.path.join(get_output("krb5-config --prefix"), "lib") 14 + + lib_dir = os.path.join(get_output("@krb5Dev@/bin/krb5-config --prefix"), "lib") 17 15 _PLUGIN_DIR = _decide_plugin_dir(_find_plugin_dirs_installed(lib_dir)) 18 16 19 17 if _PLUGIN_DIR is not None: 20 - @@ -89,7 +89,7 @@ def _decide_plugin_dir(dirs): 18 + @@ -87,7 +87,7 @@ def _decide_plugin_dir(dirs): 21 19 22 20 for path in shortest_first: 23 21 # check to see if it actually contains .so files ··· 24 26 return path 25 27 26 28 return None 27 - @@ -97,7 +97,7 @@ def _decide_plugin_dir(dirs): 28 - 29 + @@ -96,7 +96,7 @@ def _decide_plugin_dir(dirs): 29 30 def _find_plugin_dirs_installed(search_path): 30 31 try: 31 - - options_raw = get_output('find %s/ -type d \( ! -executable -o ! -readable \) ' 32 - + options_raw = get_output('@findutils@/bin/find %s/ -type d \( ! -executable -o ! -readable \) ' 33 - '-prune -o ' 34 - '-type d -path "*/krb5/plugins" -print' % search_path, 35 - stderr=subprocess.STDOUT) 32 + options_raw = get_output( 33 + - "find %s/ -type d \( ! -executable -o ! -readable \) " 34 + + "@findutils@/bin/find %s/ -type d \( ! -executable -o ! -readable \) " 35 + "-prune -o " 36 + '-type d -path "*/krb5/plugins" -print' % search_path, 37 + stderr=subprocess.STDOUT, 36 38 @@ -111,7 +111,7 @@ def _find_plugin_dirs_installed(search_path): 37 39 38 40 39 41 def _find_plugin_dirs_src(search_path): 40 - - options_raw = get_output('find %s/../ -type d -name plugins' % search_path) 41 - + options_raw = get_output('@findutils@/bin/find %s/../ -type d -name plugins' % search_path) 42 + - options_raw = get_output("find %s/../ -type d -name plugins" % search_path) 43 + + options_raw = get_output("@findutils@/bin/find %s/../ -type d -name plugins" % search_path) 42 44 43 45 if options_raw: 44 - return options_raw.split('\n') 45 - diff --git a/k5test/realm.py b/k5test/realm.py 46 - index 161e5ad..9f50049 100644 46 + return options_raw.split("\n") 47 47 --- a/k5test/realm.py 48 48 +++ b/k5test/realm.py 49 - @@ -90,7 +90,7 @@ class K5Realm(metaclass=abc.ABCMeta): 49 + @@ -84,7 +84,7 @@ class K5Realm(metaclass=abc.ABCMeta): 50 + provider_cls = cls 50 51 51 52 if provider_cls == K5Realm: 52 - krb5_config = _discover_path('krb5-config', 53 - - '/usr/bin/krb5-config', kwargs) 54 - + '@krb5@/bin/krb5-config', kwargs) 53 + - krb5_config = _discover_path("krb5-config", "/usr/bin/krb5-config", kwargs) 54 + + krb5_config = _discover_path("krb5-config", "@krb5@/bin/krb5-config", kwargs) 55 55 56 56 try: 57 57 krb5_version = subprocess.check_output( 58 - @@ -101,7 +101,7 @@ class K5Realm(metaclass=abc.ABCMeta): 58 + @@ -96,7 +96,7 @@ class K5Realm(metaclass=abc.ABCMeta): 59 + 59 60 # macOS output doesn't contain Heimdal 60 - if 'heimdal' in krb5_version.lower() or ( 61 - sys.platform == 'darwin' and 62 - - krb5_config == '/usr/bin/krb5-config'): 63 - + krb5_config == '@krb5@/bin/krb5-config'): 61 + if "heimdal" in krb5_version.lower() or ( 62 + - sys.platform == "darwin" and krb5_config == "/usr/bin/krb5-config" 63 + + sys.platform == "darwin" and krb5_config == "@krb5@/bin/krb5-config" 64 + ): 64 65 provider_cls = HeimdalRealm 65 66 else: 66 - provider_cls = MITRealm 67 - @@ -434,14 +434,14 @@ class MITRealm(K5Realm): 67 + @@ -457,14 +457,14 @@ class MITRealm(K5Realm): 68 68 @property 69 69 def _default_paths(self): 70 70 return [ 71 - - ('kdb5_util', 'kdb5_util', '/usr/sbin/kdb5_util'), 72 - - ('krb5kdc', 'krb5kdc', '/usr/sbin/kdb5kdc'), 73 - - ('kadmin', 'kadmin', '/usr/bin/admin'), 74 - - ('kadmin_local', 'kadmin.local', '/usr/sbin/kadmin.local'), 75 - - ('kadmind', 'kadmind', '/usr/sbin/kadmind'), 76 - - ('kprop', 'kprop', '/usr/sbin/kprop'), 77 - - ('_kinit', 'kinit', '/usr/bin/kinit'), 78 - - ('_klist', 'klist', '/usr/bin/klist'), 79 - + ('kdb5_util', 'kdb5_util', '@krb5@/bin/kdb5_util'), 80 - + ('krb5kdc', 'krb5kdc', '@krb5@/bin/kdb5kdc'), 81 - + ('kadmin', 'kadmin', '@krb5@/bin/admin'), 82 - + ('kadmin_local', 'kadmin.local', '@krb5@/bin/kadmin.local'), 83 - + ('kadmind', 'kadmind', '@krb5@/bin/kadmind'), 84 - + ('kprop', 'kprop', '@krb5@/bin/kprop'), 85 - + ('_kinit', 'kinit', '@krb5@/bin/kinit'), 86 - + ('_klist', 'klist', '@krb5@/bin/klist'), 71 + - ("kdb5_util", "kdb5_util", "/usr/sbin/kdb5_util"), 72 + - ("krb5kdc", "krb5kdc", "/usr/sbin/krb5kdc"), 73 + - ("kadmin", "kadmin", "/usr/bin/kadmin"), 74 + - ("kadmin_local", "kadmin.local", "/usr/sbin/kadmin.local"), 75 + - ("kadmind", "kadmind", "/usr/sbin/kadmind"), 76 + - ("kprop", "kprop", "/usr/sbin/kprop"), 77 + - ("_kinit", "kinit", "/usr/bin/kinit"), 78 + - ("_klist", "klist", "/usr/bin/klist"), 79 + + ("kdb5_util", "kdb5_util", "@krb5@/bin/kdb5_util"), 80 + + ("krb5kdc", "krb5kdc", "@krb5@/bin/krb5kdc"), 81 + + ("kadmin", "kadmin", "@krb5@/bin/kadmin"), 82 + + ("kadmin_local", "kadmin.local", "@krb5@/bin/kadmin.local"), 83 + + ("kadmind", "kadmind", "@krb5@/bin/kadmind"), 84 + + ("kprop", "kprop", "@krb5@/bin/kprop"), 85 + + ("_kinit", "kinit", "@krb5@/bin/kinit"), 86 + + ("_klist", "klist", "@krb5@/bin/klist"), 87 87 ] 88 88 89 89 @property 90 - @@ -585,12 +585,12 @@ class HeimdalRealm(K5Realm): 90 + @@ -625,12 +625,12 @@ class HeimdalRealm(K5Realm): 91 91 92 92 return [ 93 - ('krb5kdc', 'kdc', os.path.join(base, 'kdc')), 94 - - ('kadmin', 'kadmin', '/usr/bin/kadmin'), 95 - - ('kadmin_local', 'kadmin', '/usr/bin/kadmin'), 96 - + ('kadmin', 'kadmin', '@krb5@/bin/kadmin'), 97 - + ('kadmin_local', 'kadmin', '@krb5@/bin/kadmin'), 98 - ('kadmind', 'kadmind', os.path.join(base, 'kadmind')), 99 - - ('_kinit', 'kinit', '/usr/bin/kinit'), 100 - - ('_klist', 'klist', '/usr/bin/klist'), 101 - - ('_ktutil', 'ktutil', '/usr/bin/ktutil'), 102 - + ('_kinit', 'kinit', '@krb5@/bin/kinit'), 103 - + ('_klist', 'klist', '@krb5@/bin/klist'), 104 - + ('_ktutil', 'ktutil', '@krb5@/bin/ktutil'), 93 + ("krb5kdc", "kdc", os.path.join(base, "kdc")), 94 + - ("kadmin", "kadmin", "/usr/bin/kadmin"), 95 + - ("kadmin_local", "kadmin", "/usr/bin/kadmin"), 96 + + ("kadmin", "kadmin", "@krb5@/bin/kadmin"), 97 + + ("kadmin_local", "kadmin", "@krb5@/bin/kadmin"), 98 + ("kadmind", "kadmind", os.path.join(base, "kadmind")), 99 + - ("_kinit", "kinit", "/usr/bin/kinit"), 100 + - ("_klist", "klist", "/usr/bin/klist"), 101 + - ("_ktutil", "ktutil", "/usr/bin/ktutil"), 102 + + ("_kinit", "kinit", "@krb5@/bin/kinit"), 103 + + ("_klist", "klist", "@krb5@/bin/klist"), 104 + + ("_ktutil", "ktutil", "@krb5@/bin/ktutil"), 105 105 ] 106 106 107 107 @property 108 - diff --git a/k5test/unit.py b/k5test/unit.py 109 - index 3c64b9e..59da1ab 100644 110 108 --- a/k5test/unit.py 111 109 +++ b/k5test/unit.py 112 - @@ -38,7 +38,7 @@ _KRB_VERSION = None 110 + @@ -39,7 +39,7 @@ _KRB_VERSION = None 113 111 def krb_minversion_test(target_version, problem, provider=None): 114 112 global _KRB_VERSION 115 113 if _KRB_VERSION is None: 116 114 - _KRB_VERSION = _utils.get_output("krb5-config --version") 117 115 + _KRB_VERSION = _utils.get_output("@krb5Dev@/bin/krb5-config --version") 118 - _KRB_VERSION = _KRB_VERSION.split(' ')[-1].split('.') 116 + _KRB_VERSION = _KRB_VERSION.split(" ")[-1].split(".") 119 117 120 118 def make_ext_test(func):
+1 -1
pkgs/top-level/python-packages.nix
··· 5321 5321 jxmlease = callPackage ../development/python-modules/jxmlease { }; 5322 5322 5323 5323 k5test = callPackage ../development/python-modules/k5test { 5324 - inherit (pkgs) krb5 findutils which; 5324 + inherit (pkgs) krb5 findutils; 5325 5325 }; 5326 5326 5327 5327 kaa-base = callPackage ../development/python-modules/kaa-base { };