@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, runCommand, makeWrapper, python3Packages, docutils, help2man
1+{ lib, stdenv, fetchurl, runCommand, makeWrapper, python3Packages, docutils, help2man, installShellFiles
22, abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc
33, e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar
44, gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R
@@ -16,18 +16,17 @@ let
1616in
1717python3Packages.buildPythonApplication rec {
1818 pname = "diffoscope";
19− version = "163";
19+ version = "166";
2020
2121 src = fetchurl {
22− url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
23− sha256 = "sha256-pCAOMRZ3sn1jhdT5RuIZoMR1e6GEYJYyd4mZt7+0lWE=";
22+ url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
23+ sha256 = "sha256-6VhHG3MxmIczolOYqU4D1m00h8w2n0ku4dy/dFEYqk0=";
2424 };
2525
2626 outputs = [ "out" "man" ];
2727
2828 patches = [
2929 ./ignore_links.patch
30− ./skip-failing-test.patch
3130 ];
3231
3332 postPatch = ''
@@ -38,7 +37,7 @@ python3Packages.buildPythonApplication rec {
3837 substituteInPlace doc/Makefile --replace "../bin" "$out/bin"
3938 '';
4039
41− nativeBuildInputs = [ docutils help2man ];
40+ nativeBuildInputs = [ docutils help2man installShellFiles ];
4241
4342 # Most of the non-Python dependencies here are optional command-line tools for various file-format parsers.
4443 # To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh
@@ -60,14 +59,19 @@ python3Packages.buildPythonApplication rec {
6059 hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt
6160 ] ++ (with python3Packages; [ binwalk guestfs h5py ]));
6261
63− checkInputs = with python3Packages; [ pytest ] ++ pythonPath;
62+ checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath;
6463
6564 postInstall = ''
6665 make -C doc
67− mkdir -p $out/share/man/man1
68− cp doc/diffoscope.1 $out/share/man/man1/diffoscope.1
66+ installManPage doc/diffoscope.1
6967 '';
7068
69+ # Disable flaky test and a failing one
70+ disabledTests = [
71+ "test_android_manifest"
72+ "test_sbin_added_to_path"
73+ ];
74+
7175 meta = with lib; {
7276 description = "Perform in-depth comparison of files, archives, and directories";
7377 longDescription = ''
@@ -80,9 +84,9 @@ python3Packages.buildPythonApplication rec {
8084 diffoscope is developed as part of the "reproducible builds" Debian
8185 project and was formerly known as "debbindiff".
8286 '';
83− homepage = "https://diffoscope.org/";
84− license = licenses.gpl3Plus;
87+ homepage = "https://diffoscope.org/";
88+ license = licenses.gpl3Plus;
8589 maintainers = with maintainers; [ dezgeg ma27 danielfullmer ];
86− platforms = platforms.unix;
90+ platforms = platforms.unix;
8791 };
8892}