From e0178f45aa49cb71b81e48da0ee0bdfb106d7438 Mon Sep 17 00:00:00 2001 From: Tyler Goodlet Date: Tue, 16 Dec 2025 16:14:59 -0500 Subject: [PATCH] Update `default.nix` (from @nt) for py313 --- default.nix | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/default.nix b/default.nix index 56579aad..6e06adf0 100644 --- a/default.nix +++ b/default.nix @@ -11,11 +11,12 @@ let libxkbcommonStorePath = lib.getLib libxkbcommon; xcbutilcursorStorePath = lib.getLib xcb-util-cursor; - qtpyStorePath = lib.getLib python312Packages.qtpy; - pyqt6StorePath = lib.getLib python312Packages.pyqt6; - pyqt6SipStorePath = lib.getLib python312Packages.pyqt6-sip; - rapidfuzzStorePath = lib.getLib python312Packages.rapidfuzz; - qdarkstyleStorePath = lib.getLib python312Packages.qdarkstyle; + pypkgs = python313Packages; + qtpyStorePath = lib.getLib pypkgs.qtpy; + pyqt6StorePath = lib.getLib pypkgs.pyqt6; + pyqt6SipStorePath = lib.getLib pypkgs.pyqt6-sip; + rapidfuzzStorePath = lib.getLib pypkgs.rapidfuzz; + qdarkstyleStorePath = lib.getLib pypkgs.qdarkstyle; xorgLibX11StorePath = lib.getLib xorg.libX11; xorgLibxcbStorePath = lib.getLib xorg.libxcb; @@ -51,12 +52,12 @@ stdenv.mkDerivation { xorg.xcbutilrenderutil # Python requirements. - python312Full - python312Packages.uv - python312Packages.qdarkstyle - python312Packages.rapidfuzz - python312Packages.pyqt6 - python312Packages.qtpy + python313 + uv + pypkgs.qdarkstyle + pypkgs.rapidfuzz + pypkgs.pyqt6 + pypkgs.qtpy ]; src = null; shellHook = '' @@ -113,11 +114,11 @@ stdenv.mkDerivation { export LD_LIBRARY_PATH - RPDFUZZ_PATH="${rapidfuzzStorePath}/lib/python3.12/site-packages" - QDRKSTYLE_PATH="${qdarkstyleStorePath}/lib/python3.12/site-packages" - QTPY_PATH="${qtpyStorePath}/lib/python3.12/site-packages" - PYQT6_PATH="${pyqt6StorePath}/lib/python3.12/site-packages" - PYQT6_SIP_PATH="${pyqt6SipStorePath}/lib/python3.12/site-packages" + RPDFUZZ_PATH="${rapidfuzzStorePath}/lib/python3.13/site-packages" + QDRKSTYLE_PATH="${qdarkstyleStorePath}/lib/python3.13/site-packages" + QTPY_PATH="${qtpyStorePath}/lib/python3.13/site-packages" + PYQT6_PATH="${pyqt6StorePath}/lib/python3.13/site-packages" + PYQT6_SIP_PATH="${pyqt6SipStorePath}/lib/python3.13/site-packages" PATCH="$PATCH:$RPDFUZZ_PATH" PATCH="$PATCH:$QDRKSTYLE_PATH" @@ -127,8 +128,8 @@ stdenv.mkDerivation { export PATCH - # Install deps - uv lock + # install all dev and extras + uv sync --dev --all-extras ''; }