commit b2534aa0cb31978b41c3dbb0fe11ffec02e91d9f · pyrox.dev/nixpkgs

+40

pkgs/development/python-modules/tern/0001-Replace-debut-with-debian-inspector.patch

···

       1
       1
       +
       From d944d8fa6cb6d1667f3e4c4e0cff4c4b2a7c0a30 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Cole Helbling <cole.e.helbling@outlook.com>

     

       3
       3
       +
       Date: Fri, 7 May 2021 11:00:46 -0700

     

       4
       4
       +
       Subject: [PATCH] Replace `debut` with `debian-inspector`

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        requirements.in        | 2 +-

     

       8
       8
       +
        tern/analyze/common.py | 4 ++--

     

       9
       9
       +
        2 files changed, 3 insertions(+), 3 deletions(-)

     

       10
       10
       +
       

     

       11
       11
       +
       diff --git a/requirements.in b/requirements.in

     

       12
       12
       +
       index edd90ab..5135841 100644

     

       13
       13
       +
       --- a/requirements.in

     

       14
       14
       +
       +++ b/requirements.in

     

       15
       15
       +
       @@ -12,6 +12,6 @@ requests

     

       16
       16
       +
        stevedore

     

       17
       17
       +
        pbr

     

       18
       18
       +
        dockerfile-parse

     

       19
       19
       +
       -debut

     

       20
       20
       +
       +debian-inspector

     

       21
       21
       +
        regex

     

       22
       22
       +
        GitPython

     

       23
       23
       +
       diff --git a/tern/analyze/common.py b/tern/analyze/common.py

     

       24
       24
       +
       index 6962404..0f5e77d 100644

     

       25
       25
       +
       --- a/tern/analyze/common.py

     

       26
       26
       +
       +++ b/tern/analyze/common.py

     

       27
       27
       +
       @@ -19,8 +19,8 @@ from tern.utils import cache

     

       28
       28
       +
        from tern.utils import constants

     

       29
       29
       +
        from tern.utils import general

     

       30
       30
       +
        from tern.utils import rootfs

     

       31
       31
       +
       -from debut import debcon

     

       32
       32
       +
       -from debut import copyright as debut_copyright

     

       33
       33
       +
       +from debian_inspector import debcon

     

       34
       34
       +
       +from debian_inspector import copyright as debut_copyright

     

       35
       35
       +
        

     

       36
       36
       +
        # global logger

     

       37
       37
       +
        logger = logging.getLogger(constants.logger_name)

     

       38
       38
       +
       -- 

     

       39
       39
       +
       2.31.1

     

       40
       40
       +

+10 -2

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

···

       7
       7
        
       , requests

     

       8
       8
        
       , stevedore

     

       9
       9
        
       , pbr

     

       10
       10
       -
       , debut

     

       10
       10
       +
       , debian-inspector

     

       11
       11
        
       , regex

     

       12
       12
        
       , GitPython

     

       13
       13
        
       , prettytable

     
···

       22
       22
        
           sha256 = "606c62944991b2cbcccf3f5353be693305d6d7d318c3865b9ecca49dbeab2727";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
       +
         patches = [

     

       26
       26
       +
           # debut was renamed to debian-inspector

     

       27
       27
       +
           # https://github.com/tern-tools/tern/pull/962

     

       28
       28
       +
           # NOTE: Has to be in-tree because the upstream patch doesn't apply cleanly

     

       29
       29
       +
           # to the PyPi source.

     

       30
       30
       +
           ./0001-Replace-debut-with-debian-inspector.patch

     

       31
       31
       +
         ];

     

       32
       32
       +
       

     

       25
       33
        
         preBuild = ''

     

       26
       34
        
           cp requirements.{in,txt}

     

       27
       35
        
         '';

     
···

       36
       44
        
           dockerfile-parse

     

       37
       45
        
           requests

     

       38
       46
        
           stevedore

     

       39
       39
       -
           debut

     

       47
       47
       +
           debian-inspector

     

       40
       48
        
           regex

     

       41
       49
        
           GitPython

     

       42
       50
        
           prettytable