diff options
| author | Vagrant Cascadian <vagrant@reproducible-builds.org> | 2026-02-09 11:12:11 -0800 |
|---|---|---|
| committer | Vagrant Cascadian <vagrant@debian.org> | 2026-02-09 11:58:30 -0800 |
| commit | 27255149743362496eebdccca94d5df680ef7fdd (patch) | |
| tree | 958609d657fdc0bda6b53a4035c9c3a1eab57ccf /gnu/packages/diffoscope.scm | |
| parent | 379f8aa245888ef973636b474102b447d6cb6dd2 (diff) | |
gnu: diffoscope: Update to 312.
* gnu/packages/diffoscope.scm (diffoscope): Update to 312.
[phases]: Add 'update-to-7zip. [native-inputs]: update to 7zip.
Diffstat (limited to 'gnu/packages/diffoscope.scm')
| -rw-r--r-- | gnu/packages/diffoscope.scm | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 8d3256a640c..ddebd79a4b4 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -79,8 +79,7 @@ (define-public diffoscope (package (name "diffoscope") - ;; Use git snapshot to fix tests using u-boot-tools 2026.01 - (version "311-2-ge4ec97f7") + (version "312") (source (origin (method git-fetch) @@ -89,12 +88,20 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1nk8di19r5x5jwb2jh1m7mzj109z2a2axikysijz2hm7m30wjkq7")))) + (base32 "0955dgphw0ajssy1x33vlw090b37wcan0zvzqyvpnjfmzdbnwz92")))) (build-system pyproject-build-system) (arguments (list #:phases #~(modify-phases %standard-phases + ;; Switch to use 7zip, as p7zip is now a deprecated package. + ;; Can be dropped when updating to 313: + ;; https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/a826a00830420b5d76cb451d0d308f35a9b3251e + (add-after 'unpack 'update-to-7zip + (lambda _ + (substitute* "diffoscope/external_tools.py" + (("p7zip") + "7zip")))) ;; These tests are broken because our `file` package has a ;; bug in berkeley-db and wasm file type detection. (add-after 'unpack 'remove-broken-file-type-detection-test @@ -220,7 +227,7 @@ odt2txt openssh openssl - p7zip + 7zip perl pgpdump poppler |