b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

diffoscope: 144 -> 146

Browse source 
https://diffoscope.org/news/diffoscope-146-released/
https://diffoscope.org/news/diffoscope-145-released/
This commit is contained in:
Maximilian Bosch 2020-05-31 21:25:11 +02:00
parent f32733fc5f
commit 5e898d1cb8
No known key found for this signature in database
GPG key ID: 091DBF4D1FC46B8E
2 changed files with 18 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/tools/misc/diffoscope/default.nix
View file

@ -9,11 +9,11 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
version = "144";
version = "146";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "1n916k6z35c8ffksjjglkbl52jjhjv3899w230sg7k4ayzylj6zi";
sha256 = "1iy4f05ws7qsd5p7hadc1979l77543pwi2c5zx1yr5zc674kwb3y";
};
outputs = [ "out" "man" ];

44
pkgs/tools/misc/diffoscope/ignore_links.patch
View file

@ -1,32 +1,20 @@
From a33e8018092e4a91dbc45e15bbeff760b3418512 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 13 Sep 2017 16:53:38 +0300
Subject: [PATCH] Ignore hard link counts
---
diffoscope/comparators/directory.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/diffoscope/comparators/directory.py b/diffoscope/comparators/directory.py
index 3b195bc..9071bb3 100644
index 5f34d62..36999a3 100644
--- a/diffoscope/comparators/directory.py
+++ b/diffoscope/comparators/directory.py
@@ -66,6 +66,7 @@ else:
FILE_RE = re.compile(r'^\s*File:.*$')
DEVICE_RE = re.compile(r'Device: [0-9a-f]+h/[0-9]+d\s+')
INODE_RE = re.compile(r'Inode: [0-9]+\s+')
@@ -77,6 +77,7 @@ else:
FILE_RE = re.compile(r"^\s*File:.*$")
DEVICE_RE = re.compile(r"Device: [0-9a-f]+h/[0-9]+d\s+")
INODE_RE = re.compile(r"Inode: [0-9]+\s+")
+ LINKS_RE = re.compile(r'Links: [0-9]+\s+')
ACCESS_TIME_RE = re.compile(r'^Access: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$')
CHANGE_TIME_RE = re.compile(r'^Change: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$')
@@ -74,6 +75,7 @@ else:
line = Stat.FILE_RE.sub('', line)
line = Stat.DEVICE_RE.sub('', line)
line = Stat.INODE_RE.sub('', line)
+ line = Stat.LINKS_RE.sub('', line)
line = Stat.ACCESS_TIME_RE.sub('', line)
line = Stat.CHANGE_TIME_RE.sub('', line)
return line.encode('utf-8')
--
2.13.0
ACCESS_TIME_RE = re.compile(r"^Access: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$")
CHANGE_TIME_RE = re.compile(r"^Change: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$")
BIRTH_TIME_RE = re.compile(r"^\s*Birth:.*$")
@@ -86,6 +87,7 @@ else:
line = Stat.FILE_RE.sub("", line)
line = Stat.DEVICE_RE.sub("", line)
line = Stat.INODE_RE.sub("", line)
+ line = Stat.LINKS_RE.sub("", line)
line = Stat.ACCESS_TIME_RE.sub("", line)
line = Stat.CHANGE_TIME_RE.sub("", line)
line = Stat.BIRTH_TIME_RE.sub("", line)