dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #144976 from trofi/fix-diffoscope-patch

Browse Source 
diffoscope: drop upstreamed fix-uimage-on-file-5.41.patch patch
This commit is contained in:
Janne Heß 2021-11-07 15:22:13 +01:00 committed by GitHub
commit cd9de952da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/misc/diffoscope/default.nix
View File

@ -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 = ''