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

Merge pull request #130639 from marsam/fix-diffoscope-darwin

Browse source 
diffoscope: fix build on darwin
This commit is contained in:
Maximilian Bosch 2021-08-19 12:40:26 +02:00 committed by GitHub
commit f5f9772904
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/tools/misc/diffoscope/default.nix
View file

@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec {
# Still missing these tools: docx2txt dumpimage dumppdf dumpxsb enjarify lipo ocamlobjinfo oggDump otool procyon
pythonPath = [
binutils-unwrapped bzip2 colordiff coreutils cpio db diffutils
dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip
e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip
libarchive libcaca lz4 openssl pgpdump sng sqlite squashfsTools unzip xxd
xz zip zstd
]
@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec {
argcomplete debian defusedxml jsondiff jsbeautifier libarchive-c
python_magic progressbar33 pypdf2 rpm tlsh
])
++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit ]
++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit dtc ]
++ lib.optionals enableBloat ([
abootimg apksigner apktool cbfstool colord ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric
hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt radare2
@ -70,6 +70,19 @@ python3Packages.buildPythonApplication rec {
# Failing because of file-v5.40 has a slightly different output.
# Upstream issue: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/271
"test_text_proper_indentation"
] ++ lib.optionals stdenv.isDarwin [
# Disable flaky tests on Darwin
"test_non_unicode_filename"
"test_listing"
];
# flaky tests on Darwin
disabledTestPaths = lib.optionals stdenv.isDarwin [
"tests/comparators/test_git.py"
"tests/comparators/test_java.py"
"tests/comparators/test_uimage.py"
"tests/comparators/test_device.py"
"tests/comparators/test_macho.py"
];
meta = with lib; {

2
pkgs/top-level/all-packages.nix
View file

@ -4252,7 +4252,7 @@ with pkgs;
};
diffoscope = diffoscopeMinimal.override {
enableBloat = true;
enableBloat = !stdenv.isDarwin;
};
diffr = callPackage ../tools/text/diffr {