From 5e2b2752dad4b893d05fdf8e1b9fe836c2ca486e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 7 Nov 2021 10:38:39 +0000 Subject: [PATCH] diffoscope: drop upstreamed fix-uimage-on-file-5.41.patch patch diffoscope-190 already contains the fix: applying patch /nix/store/icfygfs9d249x7if0w7004vimzkj4082-fix-uimage-on-file-5.41.patch patching file tests/comparators/test_uimage.py Hunk #1 FAILED at 98. 1 out of 1 hunk FAILED -- saving rejects to file tests/comparators/test_uimage.py.re --- pkgs/tools/misc/diffoscope/default.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 9f2ebe4245c8..b1390fefb33c 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, python3Packages, docutils, help2man, installShellFiles +{ lib, stdenv, fetchurl, 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,13 +25,6 @@ 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 = ''