diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
| commit | 5423cabbbf2b6dec5568f1ecabd288d5d9a642ec (patch) | |
| tree | f316a6a921bfefd3a63bd4502c2eb50ff1644f67 /nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix | |
| parent | 46a88117a05c3469af5d99433af140c3de8ca088 (diff) | |
| parent | 8aa81f34981add12aecada6c702ddbbd0375ca36 (diff) | |
| download | nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.gz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.bz2 nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.lz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.xz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.zst nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix index 2aa92cc3e21f..c7ed502e7a41 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix @@ -1,7 +1,10 @@ { lib +, stdenv , buildPythonPackage , pythonOlder +, pythonAtLeast , fetchFromGitHub +, fetchpatch2 , setuptools , setuptools-scm , wheel @@ -25,6 +28,15 @@ buildPythonPackage rec { hash = "sha256-owkGwF5WQ17/CXwTsIYJ2AgktekRB4qhtsDxR0LCI/k="; }; + patches = [ + (fetchpatch2 { + # https://github.com/pytest-dev/pytest-forked/actions + name = "pytest8-compat.patch"; + url = "https://github.com/pytest-dev/pytest-forked/commit/b2742322d39ebda97d5170922520f3bb9c73f614.patch"; + hash = "sha256-tTRW0p3tOotQMtjjJ6RUKdynsAnKRz0RAV8gAUHiNNA="; + }) + ]; + nativeBuildInputs = [ setuptools setuptools-scm @@ -44,6 +56,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = if (pythonAtLeast "3.12" && stdenv.isDarwin && stdenv.isx86_64) then [ + # non reproducible test failure on hydra, works on community builder + # https://hydra.nixos.org/build/252537267 + "test_xfail" + ] else null; + setupHook = ./setup-hook.sh; meta = { |