pythonPackages: drop dbus-python workarounds
This commit is contained in:
parent
c99ff464e0
commit
35ae59f47b
|
@ -36,11 +36,6 @@ buildPythonApplication rec {
|
||||||
-e '/asyncio/d' \
|
-e '/asyncio/d' \
|
||||||
-e '/datetime/d' \
|
-e '/datetime/d' \
|
||||||
setup.cfg requirements.txt
|
setup.cfg requirements.txt
|
||||||
|
|
||||||
# Dependencies not correctly detected
|
|
||||||
sed -i \
|
|
||||||
-e '/dbus-python/d' \
|
|
||||||
setup.cfg requirements.txt
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -50,9 +50,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs tests po
|
patchShebangs tests po
|
||||||
# dbus-python is correctly passed in propagatedBuildInputs, but for some reason setup.py complains.
|
|
||||||
# The wrapped terminator has the correct path added, so ignore this.
|
|
||||||
substituteInPlace setup.py --replace "'dbus-python'," ""
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
|
@ -21,11 +21,6 @@ buildPythonPackage rec {
|
||||||
sha256 = "sha256-LV94F2f0Ir2Ayzk2YLL76TqeUuC0f7e+bH3vC/xKgfU=";
|
sha256 = "sha256-LV94F2f0Ir2Ayzk2YLL76TqeUuC0f7e+bH3vC/xKgfU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace pyproject.toml \
|
|
||||||
--replace '"dbus-python"' ""
|
|
||||||
'';
|
|
||||||
|
|
||||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -35,12 +35,6 @@ buildPythonPackage rec {
|
||||||
requests
|
requests
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
# Detection of the platform doesn't always works with 1.2.3
|
|
||||||
substituteInPlace pyproject.toml \
|
|
||||||
--replace 'dbus-python = {version = "^1.2.16", platform = "linux"}' ""
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Tests want to use Dbus
|
# Tests want to use Dbus
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue