about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorRyan Lahfa <masterancpp@gmail.com>2023-09-27 18:41:19 +0200
committerGitHub <noreply@github.com>2023-09-27 18:41:19 +0200
commitbfbbf80015b33600c0cf9641d280febef9f4f006 (patch)
tree4ab9ebb2cf972c53fa674c2d6f8dd473f0b67783 /pkgs/tools
parent12eb1e5d28b227fce724b235e913da75c9353d80 (diff)
parent7ef43e566c884c099482bba54a2712f47fc193a6 (diff)
downloadnixlib-bfbbf80015b33600c0cf9641d280febef9f4f006.tar
nixlib-bfbbf80015b33600c0cf9641d280febef9f4f006.tar.gz
nixlib-bfbbf80015b33600c0cf9641d280febef9f4f006.tar.bz2
nixlib-bfbbf80015b33600c0cf9641d280febef9f4f006.tar.lz
nixlib-bfbbf80015b33600c0cf9641d280febef9f4f006.tar.xz
nixlib-bfbbf80015b33600c0cf9641d280febef9f4f006.tar.zst
nixlib-bfbbf80015b33600c0cf9641d280febef9f4f006.zip
Merge pull request #257635 from mschwaig/fix-diffoscope-build
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/misc/diffoscope/default.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 7daff3641a04..2b966474346d 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -245,8 +245,13 @@ python3.pkgs.buildPythonApplication rec {
     "test_symlink_root"
   ];
 
+  disabledTestPaths = [
+    # fails due to https://github.com/NixOS/nixpkgs/issues/256896
+    # should be removed once that issue is resolved in coreboot or diffoscope
+    "tests/comparators/test_cbfs.py"
+  ]
   # Flaky tests on Darwin
-  disabledTestPaths = lib.optionals stdenv.isDarwin [
+  ++ lib.optionals stdenv.isDarwin [
     "tests/comparators/test_git.py"
     "tests/comparators/test_java.py"
     "tests/comparators/test_uimage.py"