commit c7930769a7a80b9ae4cc23f6f7003384929471c1 · pyrox.dev/nixpkgs

+2 -2

nixos/modules/config/krb5/default.nix

···

       82
       82
        
       

     

       83
       83
        
             kerberos = mkOption {

     

       84
       84
        
               type = types.package;

     

       85
       85
       -
               default = pkgs.krb5Full;

     

       86
       86
       -
               defaultText = literalExpression "pkgs.krb5Full";

     

       85
       85
       +
               default = pkgs.krb5;

     

       86
       86
       +
               defaultText = literalExpression "pkgs.krb5";

     

       87
       87
        
               example = literalExpression "pkgs.heimdal";

     

       88
       88
        
               description = lib.mdDoc ''

     

       89
       89
        
                 The Kerberos implementation that will be present in

+1 -1

nixos/modules/services/system/kerberos/mit.nix

···

       33
       33
        
       in

     

       34
       34
        
       

     

       35
       35
        
       {

     

       36
       36
       -
         config = mkIf (cfg.enable && kerberos == pkgs.krb5Full) {

     

       36
       36
       +
         config = mkIf (cfg.enable && kerberos == pkgs.krb5) {

     

       37
       37
        
           systemd.services.kadmind = {

     

       38
       38
        
             description = "Kerberos Administration Daemon";

     

       39
       39
        
             wantedBy = [ "multi-user.target" ];

+1 -1

nixos/tests/kerberos/mit.nix

···

       9
       9
        
           };

     

       10
       10
        
           krb5 = {

     

       11
       11
        
             enable = true;

     

       12
       12
       -
             kerberos = pkgs.krb5Full;

     

       12
       12
       +
             kerberos = pkgs.krb5;

     

       13
       13
        
             libdefaults = {

     

       14
       14
        
               default_realm = "FOO.BAR";

     

       15
       15
        
             };

+1 -1

nixos/tests/krb5/example-config.nix

···

       11
       11
        
           { pkgs, ... }: {

     

       12
       12
        
             krb5 = {

     

       13
       13
        
               enable = true;

     

       14
       14
       -
               kerberos = pkgs.krb5Full;

     

       14
       14
       +
               kerberos = pkgs.krb5;

     

       15
       15
        
               libdefaults = {

     

       16
       16
        
                 default_realm = "ATHENA.MIT.EDU";

     

       17
       17
        
               };

+2 -2

pkgs/development/python-modules/cccolutils/default.nix

···

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , git

     

       5
       5
        
       , gitpython

     

       6
       6
       -
       , krb5Full

     

       6
       6
       +
       , krb5

     

       7
       7
        
       , mock

     

       8
       8
        
       , pytestCheckHook

     

       9
       9
        
       , pythonOlder

     
···

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         buildInputs = [

     

       26
       26
       -
           krb5Full

     

       26
       26
       +
           krb5

     

       27
       27
        
         ];

     

       28
       28
        
       

     

       29
       29
        
         propagatedBuildInputs = [

+3 -3

pkgs/development/python-modules/gssapi/default.nix

···

       6
       6
        
       , six

     

       7
       7
        
       , decorator

     

       8
       8
        
       , nose

     

       9
       9
       -
       , krb5Full

     

       9
       9
       +
       , krb5

     

       10
       10
        
       , GSS

     

       11
       11
        
       , parameterized

     

       12
       12
        
       , shouldbe

     
···

       30
       30
        
         # It's used to locate headers

     

       31
       31
        
         postPatch = ''

     

       32
       32
        
           substituteInPlace setup.py \

     

       33
       33
       -
             --replace 'get_output(f"{kc} gssapi --prefix")' '"${lib.getDev krb5Full}"'

     

       33
       33
       +
             --replace 'get_output(f"{kc} gssapi --prefix")' '"${lib.getDev krb5}"'

     

       34
       34
        
         '';

     

       35
       35
        
       

     

       36
       36
        
         nativeBuildInputs = [

     

       37
       37
        
           cython

     

       38
       38
       -
           krb5Full

     

       38
       38
       +
           krb5

     

       39
       39
        
         ];

     

       40
       40
        
       

     

       41
       41
        
         propagatedBuildInputs =  [

+3 -3

pkgs/development/python-modules/k5test/default.nix

···

       3
       3
        
       , buildPythonPackage

     

       4
       4
        
       , fetchPypi

     

       5
       5
        
       , substituteAll

     

       6
       6
       -
       , krb5Full

     

       6
       6
       +
       , krb5

     

       7
       7
        
       , findutils

     

       8
       8
        
       , which

     

       9
       9
        
       , pythonOlder

     
···

       23
       23
        
         patches = [

     

       24
       24
        
           (substituteAll {

     

       25
       25
        
             src = ./fix-paths.patch;

     

       26
       26
       -
             inherit findutils krb5Full;

     

       26
       26
       +
             inherit findutils krb5;

     

       27
       27
        
             # krb5-config is in dev output

     

       28
       28
       -
             krb5FullDev = krb5Full.dev;

     

       28
       28
       +
             krb5Dev = krb5.dev;

     

       29
       29
        
             which = "${which}/bin/which";

     

       30
       30
        
           })

     

       31
       31
        
         ];

+18 -18

pkgs/development/python-modules/k5test/fix-paths.patch

···

       7
       7
        
            # if there was no LD_LIBRARY_PATH, or the above failed

     

       8
       8
        
            if _PLUGIN_DIR is None:

     

       9
       9
        
       -        lib_dir = os.path.join(get_output('krb5-config --prefix'), 'lib64')

     

       10
       10
       -
       +        lib_dir = os.path.join(get_output('@krb5FullDev@/bin/krb5-config --prefix'), 'lib64')

     

       10
       10
       +
       +        lib_dir = os.path.join(get_output('@krb5Dev@/bin/krb5-config --prefix'), 'lib64')

     

       11
       11
        
                _PLUGIN_DIR = _decide_plugin_dir(_find_plugin_dirs_installed(lib_dir))

     

       12
       12
        
        

     

       13
       13
        
            # /usr/lib64 seems only to be distinct on Fedora/RHEL/Centos family

     

       14
       14
        
            if _PLUGIN_DIR is None:

     

       15
       15
        
       -        lib_dir = os.path.join(get_output('krb5-config --prefix'), 'lib')

     

       16
       16
       -
       +        lib_dir = os.path.join(get_output('@krb5FullDev@/bin/krb5-config --prefix'), 'lib')

     

       16
       16
       +
       +        lib_dir = os.path.join(get_output('@krb5Dev@/bin/krb5-config --prefix'), 'lib')

     

       17
       17
        
                _PLUGIN_DIR = _decide_plugin_dir(_find_plugin_dirs_installed(lib_dir))

     

       18
       18
        
        

     

       19
       19
        
            if _PLUGIN_DIR is not None:

     
···

       53
       53
        
                if provider_cls == K5Realm:

     

       54
       54
        
                    krb5_config = _discover_path('krb5-config',

     

       55
       55
        
       -                                         '/usr/bin/krb5-config', kwargs)

     

       56
       56
       -
       +                                         '@krb5Full@/bin/krb5-config', kwargs)

     

       56
       56
       +
       +                                         '@krb5@/bin/krb5-config', kwargs)

     

       57
       57
        
        

     

       58
       58
        
                    try:

     

       59
       59
        
                        krb5_version = subprocess.check_output(

     
···

       62
       62
        
                        if 'heimdal' in krb5_version.lower() or (

     

       63
       63
        
                                sys.platform == 'darwin' and

     

       64
       64
        
       -                        krb5_config == '/usr/bin/krb5-config'):

     

       65
       65
       -
       +                        krb5_config == '@krb5Full@/bin/krb5-config'):

     

       65
       65
       +
       +                        krb5_config == '@krb5@/bin/krb5-config'):

     

       66
       66
        
                            provider_cls = HeimdalRealm

     

       67
       67
        
                        else:

     

       68
       68
        
                            provider_cls = MITRealm

     
···

       78
       78
        
       -            ('kprop', 'kprop', '/usr/sbin/kprop'),

     

       79
       79
        
       -            ('_kinit', 'kinit', '/usr/bin/kinit'),

     

       80
       80
        
       -            ('_klist', 'klist', '/usr/bin/klist'),

     

       81
       81
       -
       +            ('kdb5_util', 'kdb5_util', '@krb5Full@/bin/kdb5_util'),

     

       82
       82
       -
       +            ('krb5kdc', 'krb5kdc', '@krb5Full@/bin/kdb5kdc'),

     

       83
       83
       -
       +            ('kadmin', 'kadmin', '@krb5Full@/bin/admin'),

     

       84
       84
       -
       +            ('kadmin_local', 'kadmin.local', '@krb5Full@/bin/kadmin.local'),

     

       85
       85
       -
       +            ('kadmind', 'kadmind', '@krb5Full@/bin/kadmind'),

     

       86
       86
       -
       +            ('kprop', 'kprop', '@krb5Full@/bin/kprop'),

     

       87
       87
       -
       +            ('_kinit', 'kinit', '@krb5Full@/bin/kinit'),

     

       88
       88
       -
       +            ('_klist', 'klist', '@krb5Full@/bin/klist'),

     

       81
       81
       +
       +            ('kdb5_util', 'kdb5_util', '@krb5@/bin/kdb5_util'),

     

       82
       82
       +
       +            ('krb5kdc', 'krb5kdc', '@krb5@/bin/kdb5kdc'),

     

       83
       83
       +
       +            ('kadmin', 'kadmin', '@krb5@/bin/admin'),

     

       84
       84
       +
       +            ('kadmin_local', 'kadmin.local', '@krb5@/bin/kadmin.local'),

     

       85
       85
       +
       +            ('kadmind', 'kadmind', '@krb5@/bin/kadmind'),

     

       86
       86
       +
       +            ('kprop', 'kprop', '@krb5@/bin/kprop'),

     

       87
       87
       +
       +            ('_kinit', 'kinit', '@krb5@/bin/kinit'),

     

       88
       88
       +
       +            ('_klist', 'klist', '@krb5@/bin/klist'),

     

       89
       89
        
                ]

     

       90
       90
        
        

     

       91
       91
        
            @property

     
···

       95
       95
        
                    ('krb5kdc', 'kdc', os.path.join(base, 'kdc')),

     

       96
       96
        
       -            ('kadmin', 'kadmin', '/usr/bin/kadmin'),

     

       97
       97
        
       -            ('kadmin_local', 'kadmin', '/usr/bin/kadmin'),

     

       98
       98
       -
       +            ('kadmin', 'kadmin', '@krb5Full@/bin/kadmin'),

     

       99
       99
       -
       +            ('kadmin_local', 'kadmin', '@krb5Full@/bin/kadmin'),

     

       98
       98
       +
       +            ('kadmin', 'kadmin', '@krb5@/bin/kadmin'),

     

       99
       99
       +
       +            ('kadmin_local', 'kadmin', '@krb5@/bin/kadmin'),

     

       100
       100
        
                    ('kadmind', 'kadmind', os.path.join(base, 'kadmind')),

     

       101
       101
        
       -            ('_kinit', 'kinit', '/usr/bin/kinit'),

     

       102
       102
        
       -            ('_klist', 'klist', '/usr/bin/klist'),

     

       103
       103
        
       -            ('_ktutil', 'ktutil', '/usr/bin/ktutil'),

     

       104
       104
       -
       +            ('_kinit', 'kinit', '@krb5Full@/bin/kinit'),

     

       105
       105
       -
       +            ('_klist', 'klist', '@krb5Full@/bin/klist'),

     

       106
       106
       -
       +            ('_ktutil', 'ktutil', '@krb5Full@/bin/ktutil'),

     

       104
       104
       +
       +            ('_kinit', 'kinit', '@krb5@/bin/kinit'),

     

       105
       105
       +
       +            ('_klist', 'klist', '@krb5@/bin/klist'),

     

       106
       106
       +
       +            ('_ktutil', 'ktutil', '@krb5@/bin/ktutil'),

     

       107
       107
        
                ]

     

       108
       108
        
        

     

       109
       109
        
            @property

     
···

       116
       116
        
            global _KRB_VERSION

     

       117
       117
        
            if _KRB_VERSION is None:

     

       118
       118
        
       -        _KRB_VERSION = _utils.get_output("krb5-config --version")

     

       119
       119
       -
       +        _KRB_VERSION = _utils.get_output("@krb5FullDev@/bin/krb5-config --version")

     

       119
       119
       +
       +        _KRB_VERSION = _utils.get_output("@krb5Dev@/bin/krb5-config --version")

     

       120
       120
        
                _KRB_VERSION = _KRB_VERSION.split(' ')[-1].split('.')

     

       121
       121
        
        

     

       122
       122
        
            def make_ext_test(func):

+1

pkgs/top-level/aliases.nix

···

       729
       729
        
         kodiPlainWayland = kodi-wayland;

     

       730
       730
        
         kodiPlugins = kodiPackages; # Added 2021-03-09;

     

       731
       731
        
         kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # Added 2021-03-23

     

       732
       732
       +
         krb5Full = krb5;

     

       732
       733
        
         krename-qt5 = throw "'krename-qt5' has been renamed to/replaced by 'krename'"; # Converted to throw 2022-02-22

     

       733
       734
        
         krita-beta = krita; # moved from top-level 2021-12-23

     

       734
       735
        
         kube-aws = throw "kube-aws is deprecated and archived by upstream"; # Added 2022-04-05

-1

pkgs/top-level/all-packages.nix

···

       19996
       19996
        
         krb5 = callPackage ../development/libraries/kerberos/krb5.nix {

     

       19997
       19997
        
           inherit (buildPackages.darwin) bootstrap_cmds;

     

       19998
       19998
        
         };

     

       19999
       19999
       -
         krb5Full = krb5;

     

       20000
       19999
        
         libkrb5 = krb5.override { type = "lib"; };

     

       20001
       20000
        
       

     

       20002
       20001
        
         kronosnet = callPackage ../development/libraries/kronosnet { };

+8 -8

pkgs/top-level/perl-packages.nix

···

       1207
       1207
        
             url = "mirror://cpan/authors/id/S/SJ/SJQUINNEY/Authen-Krb5-Admin-0.17.tar.gz";

     

       1208
       1208
        
             hash = "sha256-XdScrNmD79YajD8aVlcbtzeF6xVZCLXXvsl+7XjfDFQ=";

     

       1209
       1209
        
           };

     

       1210
       1210
       -
           propagatedBuildInputs = [ pkgs.krb5Full.dev AuthenKrb5 ];

     

       1210
       1210
       +
           propagatedBuildInputs = [ pkgs.krb5.dev AuthenKrb5 ];

     

       1211
       1211
        
           # The following ENV variables are required by Makefile.PL to find

     

       1212
       1212
       -
           # programs in krb5Full.dev. It is not enough to just specify the

     

       1213
       1213
       -
           # path to krb5-config as this tool returns the prefix of krb5Full,

     

       1212
       1212
       +
           # programs in krb5.dev. It is not enough to just specify the

     

       1213
       1213
       +
           # path to krb5-config as this tool returns the prefix of krb5,

     

       1214
       1214
        
           # which implies a working value for KRB5_LIBDIR, but not the others.

     

       1215
       1215
        
           perlPreHook = ''

     

       1216
       1216
       -
             export KRB5_CONFTOOL=${pkgs.krb5Full.dev}/bin/krb5-config

     

       1217
       1217
       -
             export KRB5_BINDIR=${pkgs.krb5Full.dev}/bin

     

       1218
       1218
       -
             export KRB5_INCDIR=${pkgs.krb5Full.dev}/include

     

       1216
       1216
       +
             export KRB5_CONFTOOL=${pkgs.krb5.dev}/bin/krb5-config

     

       1217
       1217
       +
             export KRB5_BINDIR=${pkgs.krb5.dev}/bin

     

       1218
       1218
       +
             export KRB5_INCDIR=${pkgs.krb5.dev}/include

     

       1219
       1219
        
           '';

     

       1220
       1220
        
           # Tests require working Kerberos infrastructure so replace with a

     

       1221
       1221
        
           # simple attempt to exercise the module.

     
···

       10529
       10529
        
             url = "mirror://cpan/authors/id/A/AG/AGROLMS/GSSAPI-0.28.tar.gz";

     

       10530
       10530
        
             hash = "sha256-fY8se2F2L7TsctLsKBKQ8vh/nH0pgnPaRSVDKmXncNY=";

     

       10531
       10531
        
           };

     

       10532
       10532
       -
           propagatedBuildInputs = [ pkgs.krb5Full.dev ];

     

       10533
       10533
       -
           makeMakerFlags = [ "--gssapiimpl" "${pkgs.krb5Full.dev}" ];

     

       10532
       10532
       +
           propagatedBuildInputs = [ pkgs.krb5.dev ];

     

       10533
       10533
       +
           makeMakerFlags = [ "--gssapiimpl" "${pkgs.krb5.dev}" ];

     

       10534
       10534
        
           meta = {

     

       10535
       10535
        
             description = "Perl extension providing access to the GSSAPIv2 library";

     

       10536
       10536
        
             license = with lib.licenses; [ artistic1 gpl1Plus ];

+2 -2

pkgs/top-level/python-packages.nix

···

       4046
       4046
        
         gspread = callPackage ../development/python-modules/gspread { };

     

       4047
       4047
        
       

     

       4048
       4048
        
         gssapi = callPackage ../development/python-modules/gssapi {

     

       4049
       4049
       -
           inherit (pkgs) krb5Full;

     

       4049
       4049
       +
           inherit (pkgs) krb5;

     

       4050
       4050
        
           inherit (pkgs.darwin.apple_sdk.frameworks) GSS;

     

       4051
       4051
        
         };

     

       4052
       4052
        
       

     
···

       4940
       4940
        
         jxmlease = callPackage ../development/python-modules/jxmlease { };

     

       4941
       4941
        
       

     

       4942
       4942
        
         k5test = callPackage ../development/python-modules/k5test {

     

       4943
       4943
       -
           inherit (pkgs) krb5Full findutils which;

     

       4943
       4943
       +
           inherit (pkgs) krb5 findutils which;

     

       4944
       4944
        
         };

     

       4945
       4945
        
       

     

       4946
       4946
        
         kaa-base = callPackage ../development/python-modules/kaa-base { };