public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #112794 from fabaff/bump-diffoscope

Browse Source 
diffoscope: 163 -> 166
This commit is contained in:
Maximilian Bosch 2021-02-11 19:39:27 +01:00 committed by GitHub
commit 2f48b74bf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, runCommand, makeWrapper, python3Packages, docutils, help2man { lib, stdenv, fetchurl, runCommand, makeWrapper, python3Packages, docutils, help2man, installShellFiles
, abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , 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 , 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 , gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R
@ -16,18 +16,17 @@ let
in in
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "diffoscope"; pname = "diffoscope";
version = "163"; version = "166";
src = fetchurl { src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "sha256-pCAOMRZ3sn1jhdT5RuIZoMR1e6GEYJYyd4mZt7+0lWE="; sha256 = "sha256-6VhHG3MxmIczolOYqU4D1m00h8w2n0ku4dy/dFEYqk0=";
}; };
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
patches = [ patches = [
./ignore_links.patch ./ignore_links.patch
./skip-failing-test.patch
]; ];
postPatch = '' postPatch = ''
@ -38,7 +37,7 @@ python3Packages.buildPythonApplication rec {
substituteInPlace doc/Makefile --replace "../bin" "$out/bin" substituteInPlace doc/Makefile --replace "../bin" "$out/bin"
''; '';
nativeBuildInputs = [ docutils help2man ]; nativeBuildInputs = [ docutils help2man installShellFiles ];
# Most of the non-Python dependencies here are optional command-line tools for various file-format parsers. # Most of the non-Python dependencies here are optional command-line tools for various file-format parsers.
# To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh # 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 {
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
] ++ (with python3Packages; [ binwalk guestfs h5py ])); ] ++ (with python3Packages; [ binwalk guestfs h5py ]));
checkInputs = with python3Packages; [ pytest ] ++ pythonPath; checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath;
postInstall = '' postInstall = ''
make -C doc make -C doc
mkdir -p $out/share/man/man1 installManPage doc/diffoscope.1
cp doc/diffoscope.1 $out/share/man/man1/diffoscope.1
''; '';
# Disable flaky test and a failing one
disabledTests = [
"test_android_manifest"
"test_sbin_added_to_path"
];
meta = with lib; { meta = with lib; {
description = "Perform in-depth comparison of files, archives, and directories"; description = "Perform in-depth comparison of files, archives, and directories";
longDescription = '' longDescription = ''
@ -80,9 +84,9 @@ python3Packages.buildPythonApplication rec {
diffoscope is developed as part of the "reproducible builds" Debian diffoscope is developed as part of the "reproducible builds" Debian
project and was formerly known as "debbindiff". project and was formerly known as "debbindiff".
''; '';
homepage = "https://diffoscope.org/"; homepage = "https://diffoscope.org/";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ dezgeg ma27 danielfullmer ]; maintainers = with maintainers; [ dezgeg ma27 danielfullmer ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

12
pkgs/tools/misc/diffoscope/skip-failing-test.patch
View File

@ -1,12 +0,0 @@
diff --git a/tests/test_tools.py b/tests/test_tools.py
index f0010678..1c3c7ce1 100644
--- a/tests/test_tools.py
+++ b/tests/test_tools.py
@@ -21,6 +21,7 @@ import os
import pytest
+@pytest.mark.skip()
def test_sbin_added_to_path():
from diffoscope.tools import tool_required