cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

diffoscope: 229 -> 233

Browse source
This commit is contained in:
Sandro Jäckel 2023-01-22 01:35:10 +01:00
parent 43cb2bd0aa
commit a2b154b4c2
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5
1 changed files with 13 additions and 3 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, python3Packages, docutils, help2man, installShellFiles { lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles, fetchpatch
, abootimg, acl, apksigcopier, apksigner, apktool, binutils-unwrapped-all-targets, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , abootimg, acl, apksigcopier, apksigner, apktool, binutils-unwrapped-all-targets, 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 , e2fsprogs, enjarify, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar
, gzip, html2text, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, ocaml, oggvideotools, openssh, openssl, pdftk, pgpdump, poppler_utils, procyon, qemu, R , gzip, html2text, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, ocaml, oggvideotools, openssh, openssl, pdftk, pgpdump, poppler_utils, procyon, qemu, R
@ -11,17 +11,22 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below! # Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "diffoscope"; pname = "diffoscope";
version = "229"; version = "233";
src = fetchurl { src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "sha256-IyTBwlVqOIXERdjvZPTwxhIBPOn8Dt7QbvfBazj5J/A="; sha256 = "sha256-A2GYnhdjkzSFnMsy99FmckiOsbRdymAdtjp55hyFLp4=";
}; };
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
patches = [ patches = [
./ignore_links.patch ./ignore_links.patch
# test_text_proper_indentation requires file >= 5.44
(fetchpatch {
url = "https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/9fdb78ec0bbc69f1980499dfdcbf6f1dd5e55cc8.patch";
sha256 = "sha256-F0N3L9yymj2NjeIKtSnOEDsxPe+ZTb0m/M4f8LPRHg0=";
})
]; ];
postPatch = '' postPatch = ''
@ -56,6 +61,11 @@ python3Packages.buildPythonApplication rec {
checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath; checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath;
pytestFlagsArray = [
# always show more information when tests fail
"-vv"
];
postInstall = '' postInstall = ''
make -C doc make -C doc
installManPage doc/diffoscope.1 installManPage doc/diffoscope.1