nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 15:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #212017 from SuperSandro2000/diffoscope

Browse Source
This commit is contained in:
Sandro 2023-01-22 21:03:56 +01:00 committed by GitHub
commit 15b85dedcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
, 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
@ -11,17 +11,22 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
version = "229";
version = "233";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "sha256-IyTBwlVqOIXERdjvZPTwxhIBPOn8Dt7QbvfBazj5J/A=";
sha256 = "sha256-A2GYnhdjkzSFnMsy99FmckiOsbRdymAdtjp55hyFLp4=";
};
outputs = [ "out" "man" ];
patches = [
./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 = ''
@ -56,6 +61,11 @@ python3Packages.buildPythonApplication rec {
nativeCheckInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath;
pytestFlagsArray = [
# always show more information when tests fail
"-vv"
];
postInstall = ''
make -C doc
installManPage doc/diffoscope.1