commit e3a51fafb1fac339317a49e442c318cc6c8cc3fa · pyrox.dev/nixpkgs

+41

pkgs/development/python-modules/kconfiglib/0001-Add-rudimentary-support-for-modules-property.patch

···

       1
       1
       +
       From 3161fec0b9ff9154dbd952c3481400118fabb744 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Helmut Grohne <helmut.grohne@intenta.de>

     

       3
       3
       +
       Date: Thu, 21 Apr 2022 10:07:53 +0200

     

       4
       4
       +
       Subject: [PATCH] Add rudimentary support for modules property

     

       5
       5
       +
       

     

       6
       6
       +
       In linux commit 6dd85ff178cd76851e2184b13e545f5a88d1be30, Linux Torvalds

     

       7
       7
       +
       changed "option modules" to plain "modules" since it was the only option

     

       8
       8
       +
       left. kconfiglib does not have much support for either besides parsing

     

       9
       9
       +
       it and suppressing warnings when it is applied to the 'MODULES' symbol.

     

       10
       10
       +
       Mirror this behaviour for the newer "modules" property.

     

       11
       11
       +
       

     

       12
       12
       +
       Fixes: #106

     

       13
       13
       +
       ---

     

       14
       14
       +
        kconfiglib.py | 14 ++++++++++++++

     

       15
       15
       +
        1 file changed, 14 insertions(+)

     

       16
       16
       +
       

     

       17
       17
       +
       diff --git a/kconfiglib.py b/kconfiglib.py

     

       18
       18
       +
       index c67895c..ccef123 100644

     

       19
       19
       +
       --- a/kconfiglib.py

     

       20
       20
       +
       +++ b/kconfiglib.py

     

       21
       21
       +
       @@ -3263,6 +3263,20 @@ def _parse_props(self, node):

     

       22
       22
       +
                        else:

     

       23
       23
       +
                            self._parse_error("unrecognized option")

     

       24
       24
       +
        

     

       25
       25
       +
       +            elif t0 is _T_MODULES:

     

       26
       26
       +
       +                # 'modules' formerly was 'option modules'. See above for why

     

       27
       27
       +
       +                # and when it is ignored. It was changed in

     

       28
       28
       +
       +                # linux commit 6dd85ff178cd76851e2184b13e545f5a88d1be30.

     

       29
       29
       +
       +                if node.item is not self.modules:

     

       30
       30
       +
       +                    self._warn("the 'modules' property is not supported. Let "

     

       31
       31
       +
       +                               "me know if this is a problem for you, as it "

     

       32
       32
       +
       +                               "wouldn't be that hard to implement. Note that "

     

       33
       33
       +
       +                               "modules are supported -- Kconfiglib just "

     

       34
       34
       +
       +                               "assumes the symbol name MODULES, like older "

     

       35
       35
       +
       +                               "versions of the C implementation did when "

     

       36
       36
       +
       +                               "'modules' wasn't used.",

     

       37
       37
       +
       +                               self.filename, self.linenr)

     

       38
       38
       +
       +

     

       39
       39
       +
                    elif t0 is _T_OPTIONAL:

     

       40
       40
       +
                        if node.item.__class__ is not Choice:

     

       41
       41
       +
                            self._parse_error('"optional" is only valid for choices')

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

···

       14
       14
        
           sha256 = "0g690bk789hsry34y4ahvly5c8w8imca90ss4njfqf7m2qicrlmy";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       +
         patches = [

     

       18
       18
       +
           # see https://github.com/ulfalizer/Kconfiglib/pull/119

     

       19
       19
       +
           ./0001-Add-rudimentary-support-for-modules-property.patch

     

       20
       20
       +
         ];

     

       21
       21
       +
       

     

       17
       22
        
         # doesnt work out of the box but might be possible

     

       18
       23
        
         doCheck = false;

     

       19
       24