commit 9586def07ee15c4ea48a64d932882e6a679c3e64 · pyrox.dev/nixpkgs

+4 -7

pkgs/tools/misc/diffoscope/default.nix

···

       6
       6
        
       

     

       7
       7
        
       pythonPackages.buildPythonApplication rec {

     

       8
       8
        
         name = "diffoscope-${version}";

     

       9
       9
       -
         version = "49";

     

       9
       9
       +
         version = "52";

     

       10
       10
        
       

     

       11
       11
        
         namePrefix = "";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchgit {

     

       14
       14
        
           url = "git://anonscm.debian.org/reproducible/diffoscope.git";

     

       15
       15
        
           rev = "refs/tags/${version}";

     

       16
       16
       -
           sha256 = "0kh96h95rp7bk8rgc1z18jwv89dyp1n36bawqyqxhwwklmrgxr66";

     

       16
       16
       +
           sha256 = "1a22abvjs8f8c4anrcfhn02xw7m2gl701b9csxy06c5ymib0npxd";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         patches =

     

       20
       20
       -
           [ # Ignore different link counts and inode change times.

     

       21
       21
       -
             (fetchpatch {

     

       22
       22
       -
               url = https://github.com/edolstra/diffoscope/commit/367f77bba8df0dbc89e63c9f66f05736adf5ec59.patch;

     

       23
       23
       -
               sha256 = "0mnp7icdrjn02dr6f5dwqvvr848jzgkv3cg69a24234y9gxd30ww";

     

       24
       24
       -
             })

     

       20
       20
       +
           [ # Ignore different link counts.

     

       21
       21
       +
             ./ignore_links.patch

     

       25
       22
        
           ];

     

       26
       23
        
       

     

       27
       24
        
         postPatch = ''

+25

pkgs/tools/misc/diffoscope/ignore_links.patch

···

       1
       1
       +
       From: Eelco Dolstra <eelco.dolstra@logicblox.com>

     

       2
       2
       +
       

     

       3
       3
       +
       Nix deduplicates by hard-linking identical files, so it's normal for

     

       4
       4
       +
       the the number of links to a file to differ.

     

       5
       5
       +
       ---

     

       6
       6
       +
       diff --git a/diffoscope/comparators/directory.py b/diffoscope/comparators/directory.py

     

       7
       7
       +
       index 7d1cd75..bd91eb0 100644

     

       8
       8
       +
       --- a/diffoscope/comparators/directory.py

     

       9
       9
       +
       +++ b/diffoscope/comparators/directory.py

     

       10
       10
       +
       @@ -47,6 +47,7 @@ class Stat(Command):

     

       11
       11
       +
            FILE_RE = re.compile(r'^\s*File:.*$')

     

       12
       12
       +
            DEVICE_RE = re.compile(r'Device: [0-9a-f]+h/[0-9]+d')

     

       13
       13
       +
            INODE_RE = re.compile(r'Inode: [0-9]+')

     

       14
       14
       +
       +    LINKS_RE = re.compile(r'Links: [0-9]+')

     

       15
       15
       +
            ACCESS_TIME_RE = re.compile(r'^Access: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$')

     

       16
       16
       +
            CHANGE_TIME_RE = re.compile(r'^Change: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$')

     

       17
       17
       +
       

     

       18
       18
       +
       @@ -55,6 +56,7 @@ class Stat(Command):

     

       19
       19
       +
                line = Stat.FILE_RE.sub('', line)

     

       20
       20
       +
                line = Stat.DEVICE_RE.sub('', line)

     

       21
       21
       +
                line = Stat.INODE_RE.sub('', line)

     

       22
       22
       +
       +        line = Stat.LINKS_RE.sub('', line)

     

       23
       23
       +
                line = Stat.ACCESS_TIME_RE.sub('', line)

     

       24
       24
       +
                line = Stat.CHANGE_TIME_RE.sub('', line)

     

       25
       25
       +
                return line.encode('utf-8')