Merge pull request #123002 from Ma27/bump-diffoscope

diffoscope: 172 -> 175
This commit is contained in:
Maximilian Bosch 2021-05-17 00:52:27 +02:00 committed by GitHub
commit 19fdf7cce0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,7 +2,7 @@
, abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc
, e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar
, gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R
, sng, sqlite, squashfsTools, tcpdump, odt2txt, unzip, wabt, xxd, xz, zip, zstd
, radare2, sng, sqlite, squashfsTools, tcpdump, odt2txt, unzip, wabt, xxd, xz, zip, zstd
, enableBloat ? false
}:
@ -16,11 +16,11 @@ let
in
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
version = "172";
version = "175";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "1j162jh5lkiixpb5ym3smyrkvjldm8m8vnx25cgwb7cxkk701w5x";
sha256 = "sha256-ofRu5bD+kymdXdViPxfGD/2cf7lUvnEQfYAqog5GIIk=";
};
outputs = [ "out" "man" ];
@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec {
++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit ]
++ lib.optionals enableBloat ([
abootimg apksigner apktool cbfstool colord ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric
hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt
hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt radare2
] ++ (with python3Packages; [ binwalk guestfs h5py ]));
checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath;