diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-03-20 04:55:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-20 04:55:37 +0100 |
| commit | b14d9ee1f98564b97f4617af9929704bb15327a1 (patch) | |
| tree | e28cb27438cd198929e7461c127cf66b2bb3969e /pkgs/tools | |
| parent | 64fe9150cf7690872e1753b44f83ea6d0b551168 (diff) | |
| parent | c3aa9107d4255fe5fe1ab34a9f723a9c65cc08f6 (diff) | |
| download | nixpkgs-b14d9ee1f98564b97f4617af9929704bb15327a1.tar nixpkgs-b14d9ee1f98564b97f4617af9929704bb15327a1.tar.gz nixpkgs-b14d9ee1f98564b97f4617af9929704bb15327a1.tar.bz2 nixpkgs-b14d9ee1f98564b97f4617af9929704bb15327a1.tar.lz nixpkgs-b14d9ee1f98564b97f4617af9929704bb15327a1.tar.xz nixpkgs-b14d9ee1f98564b97f4617af9929704bb15327a1.tar.zst nixpkgs-b14d9ee1f98564b97f4617af9929704bb15327a1.zip | |
Merge pull request #164926 from SuperSandro2000/diffoscope
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/diffoscope/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 7f1655b9843..17f57d31ab8 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec { xz zip zstd ] ++ (with python3Packages; [ - argcomplete black debian defusedxml jsondiff jsbeautifier libarchive-c + argcomplete debian defusedxml jsondiff jsbeautifier libarchive-c python_magic progressbar33 pypdf2 rpm tlsh ]) ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit dtc ] @@ -66,20 +66,19 @@ python3Packages.buildPythonApplication rec { installManPage doc/diffoscope.1 ''; - # Disable flaky test and a failing one disabledTests = [ + # Disable flaky test and a failing one "test_android_manifest" "test_sbin_added_to_path" "test_diff_meta" "test_diff_meta2" "test_obj_no_differences" - # 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" - # fails because it fails to determine llvm version "test_item3_deflate_llvm_bitcode" + + # disable formatting tests because they can break on black updates + "test_code_is_black_clean" ] ++ lib.optionals stdenv.isDarwin [ # Disable flaky tests on Darwin "test_non_unicode_filename" |