Compare commits

..

No commits in common. "58ffe487759ca6816f7224488b99966f4acaf6a5" and "b73300c820a4232e67f70e477f4c6aec615f9def" have entirely different histories.

2 changed files with 5 additions and 24 deletions

View File

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1784497964, "lastModified": 1765779637,
"narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=", "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163", "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -22,14 +22,12 @@
# do store-path extractions # do store-path extractions
qt6baseStorePath = lib.getLib pkgs.qt6.qtbase; qt6baseStorePath = lib.getLib pkgs.qt6.qtbase;
zlibStorePath = lib.getLib pkgs.zlib;
# ?TODO? can remove below since manual linking not needed? # ?TODO? can remove below since manual linking not needed?
# qt6QtWaylandStorePath = lib.getLib pkgs.qt6.qtwayland; # qt6QtWaylandStorePath = lib.getLib pkgs.qt6.qtwayland;
# XXX NOTE XXX, for now we overlay specific pkgs via # XXX NOTE XXX, for now we overlay specific pkgs via
# a major-version-pinned-`cpython` # a major-version-pinned-`cpython`
cpython = "python313"; cpython = "python313";
python = pkgs.${cpython};
pypkgs = pkgs."${cpython}Packages"; pypkgs = pkgs."${cpython}Packages";
in in
{ {
@ -48,7 +46,7 @@
qt6.qtbase qt6.qtbase
uv uv
python python313 # ?TODO^ how to set from `cpython` above?
pypkgs.pyqt6 pypkgs.pyqt6
pypkgs.pyqt6-sip pypkgs.pyqt6-sip
pypkgs.qtpy pypkgs.qtpy
@ -72,7 +70,6 @@
# link-in c++ stdlib for various AOT-ext-pkgs (numpy, etc.) # link-in c++ stdlib for various AOT-ext-pkgs (numpy, etc.)
LD_LIBRARY_PATH="${pkgs.stdenv.cc.cc.lib}/lib:$LD_LIBRARY_PATH" LD_LIBRARY_PATH="${pkgs.stdenv.cc.cc.lib}/lib:$LD_LIBRARY_PATH"
LD_LIBRARY_PATH="${zlibStorePath}/lib:$LD_LIBRARY_PATH"
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
@ -89,31 +86,15 @@
export QT_WAYLAND_SHELL_INTEGRATION="xdg-shell" export QT_WAYLAND_SHELL_INTEGRATION="xdg-shell"
# ------ uv ------ # ------ uv ------
# ignore any venv inherited from an outer checkout
unset VIRTUAL_ENV
# - always use the ./py313/ venv-subdir # - always use the ./py313/ venv-subdir
export UV_PROJECT_ENVIRONMENT="py313" export UV_PROJECT_ENVIRONMENT="py313"
# Rebuild after a flake update changes the Nix Python closure.
venv_python="$UV_PROJECT_ENVIRONMENT/bin/python"
nix_python="$(readlink -f "${python}/bin/python3")"
if test -e "$venv_python" \
&& test "$(readlink -f "$venv_python")" != "$nix_python"
then
uv venv \
--clear \
--python "$nix_python" \
"$UV_PROJECT_ENVIRONMENT"
fi
# sync project-env with all extras # sync project-env with all extras
uv sync --dev --all-extras --no-group lint uv sync --dev --all-extras --no-group lint
source "$UV_PROJECT_ENVIRONMENT/bin/activate"
# ------ TIPS ------ # ------ TIPS ------
# NOTE, to launch the py-venv installed `xonsh` (like @goodboy) # NOTE, to launch the py-venv installed `xonsh` (like @goodboy)
# run the `nix develop` cmd with, # run the `nix develop` cmd with,
# >> nix develop -c xonsh # >> nix develop -c uv run xonsh
''; '';
}; };
} }