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

diffoscope: switch to pytestCheckHook and use installManPage

Browse Source
This commit is contained in:
Fabian Affolter 2021-02-11 18:08:19 +01:00
parent ec34c6f7bc
commit 363b42dcc5
2 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
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
@ -27,7 +27,6 @@ python3Packages.buildPythonApplication rec {
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 = ''

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