diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-05-31 21:25:11 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-05-31 21:25:56 +0200 |
| commit | 5e898d1cb86ef524e1000de7732ecccc4a616b2d (patch) | |
| tree | 4edc3e278cd294b0e7fbdf7a626c5008ae8fc3ed /pkgs/tools/misc/diffoscope | |
| parent | f32733fc5f100be7d8960c214ff76b84dcc4f151 (diff) | |
| download | nixpkgs-5e898d1cb86ef524e1000de7732ecccc4a616b2d.tar nixpkgs-5e898d1cb86ef524e1000de7732ecccc4a616b2d.tar.gz nixpkgs-5e898d1cb86ef524e1000de7732ecccc4a616b2d.tar.bz2 nixpkgs-5e898d1cb86ef524e1000de7732ecccc4a616b2d.tar.lz nixpkgs-5e898d1cb86ef524e1000de7732ecccc4a616b2d.tar.xz nixpkgs-5e898d1cb86ef524e1000de7732ecccc4a616b2d.tar.zst nixpkgs-5e898d1cb86ef524e1000de7732ecccc4a616b2d.zip | |
diffoscope: 144 -> 146
https://diffoscope.org/news/diffoscope-146-released/ https://diffoscope.org/news/diffoscope-145-released/
Diffstat (limited to 'pkgs/tools/misc/diffoscope')
| -rw-r--r-- | pkgs/tools/misc/diffoscope/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/diffoscope/ignore_links.patch | 44 |
2 files changed, 18 insertions, 30 deletions
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index a9b014be356..4ad51e1a9f7 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -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" ]; diff --git a/pkgs/tools/misc/diffoscope/ignore_links.patch b/pkgs/tools/misc/diffoscope/ignore_links.patch index b0841ce0bb5..b88d6e0231e 100644 --- a/pkgs/tools/misc/diffoscope/ignore_links.patch +++ b/pkgs/tools/misc/diffoscope/ignore_links.patch @@ -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) |