From 6a65185ee46babca0630db1d64eaa8c1447d1cd6 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 15 Dec 2019 16:13:41 +0000 Subject: gnu: diffoscope: Update to 133. * gnu/packages/diffoscope (diffoscope): Update to 133. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/diffoscope.scm') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 7fe7766a15..821dc8aff9 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -67,7 +67,7 @@ #:use-module (ice-9 match)) (define-public diffoscope - (let ((version "131")) + (let ((version "133")) (package (name "diffoscope") (version version) @@ -79,7 +79,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0jai3kycjlrc64f4vg8yklri6ds1451qy6r6sw2646bhjr0gs233")))) + "0mvg5iyd3zjxsm66vax3qb89214j3wxcklvbhfrr8jlbzaw9pznh")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From bc685e1ca3516a218c083da206d3d1c354733073 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 15 Dec 2019 20:42:15 +0000 Subject: gnu: diffoscope: Add support for zstd compression. * gnu/packages/diffoscope (diffoscope)[native-inputs]: Add zstd. [arguments]: Add add-known-tools phase with support for zstd. --- gnu/packages/diffoscope.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/diffoscope.scm') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 821dc8aff9..93630f3bb6 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -90,6 +90,12 @@ (lambda _ (substitute* "setup.py" (("'python-magic',") "")))) + ;; Patch in support for known tools + (add-after 'unpack 'add-known-tools + (lambda _ + (substitute* "diffoscope/external_tools.py" + (("'debian': 'zstd'") + "'debian': 'zstd', 'guix': 'zstd'")))) ;; This test is broken because our `file` package has a ;; bug in berkeley-db file type detection. (add-after 'unpack 'remove-berkeley-test @@ -209,7 +215,8 @@ ("wabt" ,wabt) ("xxd" ,xxd) ("xz" ,xz) - ("zip" ,zip))) + ("zip" ,zip) + ("zstd" ,zstd))) (home-page "https://diffoscope.org/") (synopsis "Compare files, archives, and directories in depth") (description -- cgit v1.2.3 From 5de06b9dfb7e8fa5e32187d6a118cfeb04eff0a3 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 29 Dec 2019 07:39:22 +0000 Subject: gnu: diffoscope: Update to 134. * gnu/packages/diffoscope (diffoscope): Update to 134. [arguments] Remove phase adding support for zstd. --- gnu/packages/diffoscope.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'gnu/packages/diffoscope.scm') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 93630f3bb6..a362285051 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -67,7 +67,7 @@ #:use-module (ice-9 match)) (define-public diffoscope - (let ((version "133")) + (let ((version "134")) (package (name "diffoscope") (version version) @@ -79,7 +79,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0mvg5iyd3zjxsm66vax3qb89214j3wxcklvbhfrr8jlbzaw9pznh")))) + "04078cn3lazcrpgzzzy1s9721hprkylrvfa58izm4dcvgd7a593z")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -90,12 +90,6 @@ (lambda _ (substitute* "setup.py" (("'python-magic',") "")))) - ;; Patch in support for known tools - (add-after 'unpack 'add-known-tools - (lambda _ - (substitute* "diffoscope/external_tools.py" - (("'debian': 'zstd'") - "'debian': 'zstd', 'guix': 'zstd'")))) ;; This test is broken because our `file` package has a ;; bug in berkeley-db file type detection. (add-after 'unpack 'remove-berkeley-test -- cgit v1.2.3