git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #130639 from marsam/fix-diffoscope-darwin

diffoscope: fix build on darwin

commitf5f977290484d2e94b3566c0d476d1dd10defea8 authorMaximilian Bosch <maximilian@mbosch.me> dateThu 19 Aug 2021, 12:40 (5 years ago) parentd5c8e7bf7020df
2 files changed+16−3
pkgs/tools/misc/diffoscope/default.nix+15−2 pkgs/top-level/all-packages.nix+1−1
pkgs/tools/misc/diffoscope/default.nix+15−2
@@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec {
3838 # Still missing these tools: docx2txt dumpimage dumppdf dumpxsb enjarify lipo ocamlobjinfo oggDump otool procyon
3939 pythonPath = [
4040 binutils-unwrapped bzip2 colordiff coreutils cpio db diffutils
41− dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip
41+ e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip
4242 libarchive libcaca lz4 openssl pgpdump sng sqlite squashfsTools unzip xxd
4343 xz zip zstd
4444 ]
@@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec {
4646 argcomplete debian defusedxml jsondiff jsbeautifier libarchive-c
4747 python_magic progressbar33 pypdf2 rpm tlsh
4848 ])
49− ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit ]
49+ ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit dtc ]
5050 ++ lib.optionals enableBloat ([
5151 abootimg apksigner apktool cbfstool colord ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric
5252 hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt radare2
@@ -70,6 +70,19 @@ python3Packages.buildPythonApplication rec {
7070 # Failing because of file-v5.40 has a slightly different output.
7171 # Upstream issue: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/271
7272 "test_text_proper_indentation"
73+ ] ++ lib.optionals stdenv.isDarwin [
74+ # Disable flaky tests on Darwin
75+ "test_non_unicode_filename"
76+ "test_listing"
77+ ];
78+
79+ # flaky tests on Darwin
80+ disabledTestPaths = lib.optionals stdenv.isDarwin [
81+ "tests/comparators/test_git.py"
82+ "tests/comparators/test_java.py"
83+ "tests/comparators/test_uimage.py"
84+ "tests/comparators/test_device.py"
85+ "tests/comparators/test_macho.py"
7386 ];
7487
7588 meta = with lib; {
pkgs/top-level/all-packages.nix+1−1
@@ -4252,7 +4252,7 @@ with pkgs;
42524252 };
42534253
42544254 diffoscope = diffoscopeMinimal.override {
4255− enableBloat = true;
4255+ enableBloat = !stdenv.isDarwin;
42564256 };
42574257
42584258 diffr = callPackage ../tools/text/diffr {