From 034fe8ef3ac5666516c2bacaaba38e14fa5e16a2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 27 Oct 2021 00:11:27 +0100 Subject: [PATCH] diffoscope: adapt to file-5.41 failures Pull in pustream fix for uImage diff test failure. --- pkgs/tools/misc/diffoscope/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index e07d03cddba2..43ff6ffaafce 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles +{ lib, stdenv, fetchurl, fetchpatch, python3Packages, docutils, help2man, installShellFiles , abootimg, acl, apksigner, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , e2fsprogs, enjarify, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, ocaml, oggvideotools, openssh, openssl, pdftk, pgpdump, poppler_utils, procyon, qemu, R @@ -25,6 +25,13 @@ python3Packages.buildPythonApplication rec { # the version detection of LLVM is broken and the comparison result is compared against # the expected result from LLVM 10 (rather than 7 which is our default). ./fix-tests.patch + + # Upstream uimage test fix for file-5.41 update. + (fetchpatch { + name = "fix-uimage-on-file-5.41.patch"; + url = "https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/74a59a8fb3327a320f45a7626e8e0d59b01896a2.patch"; + sha256 = "sha256-7hmxSKmgaqJg4/gpaZYcNVo4dEMO658VSkSbxPq7WWo="; + }) ]; postPatch = ''