qtpy global hook & correct tractor pin

nix-monkeys-fix
Guillermo Rodriguez 2024-01-23 18:50:03 -03:00
parent aa6fb3162a
commit 66b8e7852e
No known key found for this signature in database
GPG Key ID: EC3AB66D5D83B392
2 changed files with 7 additions and 2 deletions

View File

@ -3,6 +3,7 @@ with python311Packages;
let let
rapidfuzzStorePath = lib.getLib rapidfuzz; rapidfuzzStorePath = lib.getLib rapidfuzz;
qdarkstyleStorePath = lib.getLib qdarkstyle; qdarkstyleStorePath = lib.getLib qdarkstyle;
qtpyStorePath = lib.getLib qtpy;
pyqt5StorePath = lib.getLib pyqt5; pyqt5StorePath = lib.getLib pyqt5;
pyqt5SipStorePath = lib.getLib pyqt5_sip; pyqt5SipStorePath = lib.getLib pyqt5_sip;
in in
@ -17,6 +18,7 @@ stdenv.mkDerivation {
poetry-core poetry-core
rapidfuzz rapidfuzz
qdarkstyle qdarkstyle
qtpy
pyqt5 pyqt5
]; ];
src = null; src = null;
@ -37,10 +39,12 @@ stdenv.mkDerivation {
ACTIVATE_SCRIPT_PATH="$(poetry env info --path)/bin/activate" ACTIVATE_SCRIPT_PATH="$(poetry env info --path)/bin/activate"
export RPDFUZZ_PATH="${rapidfuzzStorePath}/lib/python3.11/site-packages" export RPDFUZZ_PATH="${rapidfuzzStorePath}/lib/python3.11/site-packages"
export QDRKSTYLE_PATH="${qdarkstyleStorePath}/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_PATH="${pyqt5StorePath}/lib/python3.11/site-packages"
export PYQT5_SIP_PATH="${pyqt5SipStorePath}/lib/python3.11/site-packages" export PYQT5_SIP_PATH="${pyqt5SipStorePath}/lib/python3.11/site-packages"
echo "rapidfuzz at: $RPDFUZZ_PATH" echo "rapidfuzz at: $RPDFUZZ_PATH"
echo "qdarkstyle at: $QDRKSTYLE_PATH" echo "qdarkstyle at: $QDRKSTYLE_PATH"
echo "qtpy at: $QTPY_PATH"
echo "pyqt5 at: $PYQT5_PATH" echo "pyqt5 at: $PYQT5_PATH"
echo "pyqt5-sip at: $PYQT5_SIP_PATH" echo "pyqt5-sip at: $PYQT5_SIP_PATH"
echo "" echo ""
@ -49,6 +53,7 @@ stdenv.mkDerivation {
PATCH="$PATCH\$RPDFUZZ_PATH" PATCH="$PATCH\$RPDFUZZ_PATH"
PATCH="$PATCH:\$QDRKSTYLE_PATH" PATCH="$PATCH:\$QDRKSTYLE_PATH"
PATCH="$PATCH:\$QTPY_PATH"
PATCH="$PATCH:\$PYQT5_PATH" PATCH="$PATCH:\$PYQT5_PATH"
PATCH="$PATCH:\$PYQT5_SIP_PATH" PATCH="$PATCH:\$PYQT5_SIP_PATH"

View File

@ -90,8 +90,8 @@ develop = true
# path = "../tomlkit/" # path = "../tomlkit/"
[tool.poetry.dependencies.tractor] [tool.poetry.dependencies.tractor]
git = 'https://pikers.dev/goodboy/tractor.git' git = 'https://github.com/goodboy/tractor.git'
branch = 'asyncio_debugger_support' branch = 'multihomed'
# branch = 'piker_pin' # branch = 'piker_pin'
develop = true develop = true
# path = '../tractor/' # path = '../tractor/'