From 66b8e7852eefce7c196c5a53d7b5f94eed1eda1a Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Date: Tue, 23 Jan 2024 18:50:03 -0300 Subject: [PATCH] qtpy global hook & correct tractor pin --- default.nix | 5 +++++ pyproject.toml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index 329afd34..1d2a5226 100644 --- a/default.nix +++ b/default.nix @@ -3,6 +3,7 @@ with python311Packages; let rapidfuzzStorePath = lib.getLib rapidfuzz; qdarkstyleStorePath = lib.getLib qdarkstyle; + qtpyStorePath = lib.getLib qtpy; pyqt5StorePath = lib.getLib pyqt5; pyqt5SipStorePath = lib.getLib pyqt5_sip; in @@ -17,6 +18,7 @@ stdenv.mkDerivation { poetry-core rapidfuzz qdarkstyle + qtpy pyqt5 ]; src = null; @@ -37,10 +39,12 @@ stdenv.mkDerivation { ACTIVATE_SCRIPT_PATH="$(poetry env info --path)/bin/activate" export RPDFUZZ_PATH="${rapidfuzzStorePath}/lib/python3.11/site-packages" export QDRKSTYLE_PATH="${qdarkstyleStorePath}/lib/python3.11/site-packages" + export QTPY_PATH="${qtpyStorePath}/lib/python3.11/site-packages" export PYQT5_PATH="${pyqt5StorePath}/lib/python3.11/site-packages" export PYQT5_SIP_PATH="${pyqt5SipStorePath}/lib/python3.11/site-packages" echo "rapidfuzz at: $RPDFUZZ_PATH" echo "qdarkstyle at: $QDRKSTYLE_PATH" + echo "qtpy at: $QTPY_PATH" echo "pyqt5 at: $PYQT5_PATH" echo "pyqt5-sip at: $PYQT5_SIP_PATH" echo "" @@ -49,6 +53,7 @@ stdenv.mkDerivation { PATCH="$PATCH\$RPDFUZZ_PATH" PATCH="$PATCH:\$QDRKSTYLE_PATH" + PATCH="$PATCH:\$QTPY_PATH" PATCH="$PATCH:\$PYQT5_PATH" PATCH="$PATCH:\$PYQT5_SIP_PATH" diff --git a/pyproject.toml b/pyproject.toml index bbbdb251..143c9e80 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -90,8 +90,8 @@ develop = true # path = "../tomlkit/" [tool.poetry.dependencies.tractor] -git = 'https://pikers.dev/goodboy/tractor.git' -branch = 'asyncio_debugger_support' +git = 'https://github.com/goodboy/tractor.git' +branch = 'multihomed' # branch = 'piker_pin' develop = true # path = '../tractor/'