63 lines
1.8 KiB
Diff
63 lines
1.8 KiB
Diff
From b053f97b3d6284b0a945c09c9e45d1852c01fb85 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
|
|
Date: Wed, 11 May 2022 22:52:27 +0000
|
|
Subject: [PATCH] python3Packages.notify-py: fix tests
|
|
|
|
Previously tests failed on Linux with
|
|
|
|
Cannot spawn a message bus without a machine-id
|
|
---
|
|
.../python-modules/notify-py/default.nix | 28 ++++++++++++++-----
|
|
1 file changed, 21 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix
|
|
index 497b20d3df8ff..6d255424812e5 100644
|
|
--- a/pkgs/development/python-modules/notify-py/default.nix
|
|
+++ b/pkgs/development/python-modules/notify-py/default.nix
|
|
@@ -9,7 +9,8 @@
|
|
, which
|
|
, jeepney
|
|
, loguru
|
|
-, pytestCheckHook
|
|
+, pytest
|
|
+, dbus
|
|
, coreutils
|
|
}:
|
|
|
|
@@ -41,16 +42,29 @@ buildPythonPackage rec {
|
|
})
|
|
];
|
|
|
|
- propagatedBuildInputs = [ loguru ]
|
|
- ++ lib.optionals stdenv.isLinux [ jeepney ];
|
|
+ propagatedBuildInputs = [
|
|
+ loguru
|
|
+ ] ++ lib.optionals stdenv.isLinux [
|
|
+ jeepney
|
|
+ ];
|
|
|
|
- checkInputs = [ pytestCheckHook ];
|
|
+ checkInputs = [
|
|
+ pytest
|
|
+ ] ++ lib.optionals stdenv.isLinux [
|
|
+ dbus
|
|
+ ];
|
|
|
|
- # Tests search for "afplay" binary which is built in to MacOS and not available in nixpkgs
|
|
- preCheck = lib.optionalString stdenv.isDarwin ''
|
|
+ checkPhase = if stdenv.isDarwin then ''
|
|
+ # Tests search for "afplay" binary which is built in to macOS and not available in nixpkgs
|
|
mkdir $TMP/bin
|
|
ln -s ${coreutils}/bin/true $TMP/bin/afplay
|
|
- export PATH="$TMP/bin:$PATH"
|
|
+ PATH="$TMP/bin:$PATH" pytest
|
|
+ '' else if stdenv.isLinux then ''
|
|
+ dbus-run-session \
|
|
+ --config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
|
+ pytest
|
|
+ '' else ''
|
|
+ pytest
|
|
'';
|
|
|
|
pythonImportsCheck = [ "notifypy" ];
|