diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-07-13 23:20:04 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-07-13 23:21:06 +0000 |
commit | a42c1d6d62656dcf9bd85de620f2e200a5ad22d8 (patch) | |
tree | 7d481fea9872f62a034452612be17f4494159baa /nixpkgs/pkgs/tools/misc/diffoscope/skip-failing-test.patch | |
parent | 55f69a6b0e53c1c4b3e0396937c53bf5662b5519 (diff) | |
parent | 9480bae337095fd24f61380bce3174fdfe926a00 (diff) | |
download | nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.gz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.bz2 nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.lz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.xz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.zst nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.zip |
Merge commit '9480bae337095fd24f61380bce3174fdfe926a00'
This is the last nixos-unstable release before 13b2903169f, which I'm a bit nervous about. So I want the update including that one to be as small as possible, hence going to this one first.
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/diffoscope/skip-failing-test.patch')
-rw-r--r-- | nixpkgs/pkgs/tools/misc/diffoscope/skip-failing-test.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/tools/misc/diffoscope/skip-failing-test.patch b/nixpkgs/pkgs/tools/misc/diffoscope/skip-failing-test.patch new file mode 100644 index 000000000000..bf871d295bda --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/diffoscope/skip-failing-test.patch @@ -0,0 +1,12 @@ +diff --git a/tests/test_tools.py b/tests/test_tools.py +index f0010678..1c3c7ce1 100644 +--- a/tests/test_tools.py ++++ b/tests/test_tools.py +@@ -21,6 +21,7 @@ import os + import pytest + + ++@pytest.mark.skip() + def test_sbin_added_to_path(): + from diffoscope.tools import tool_required + |