Bump `flake.lock` after dev-shell fixes

Advance `nixpkgs` to `241313f4`; the refreshed closure passes Qt, `pyqtgraph` and wksmod-path import checks. (this commit msg was generated in some part by `opencode` using `gpt-5.6-sol` (`openai`))
Rebuild stale `uv` envs after flake updates
2026-07-21 16:44:58 -04:00 · 2026-07-21 16:37:59 -04:00 · 2026-07-21 15:13:35 -04:00 · 2026-07-15 16:29:18 -04:00
2 changed files with 24 additions and 5 deletions
--- a/flake.lock
+++ b/flake.lock
@ -2,11 +2,11 @@
  "nodes": {
    "nixpkgs": {
      "locked": {
-        "lastModified": 1765779637,
-        "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
+        "lastModified": 1784497964,
+        "narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
+        "rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -22,12 +22,14 @@

          # do store-path extractions
          qt6baseStorePath = lib.getLib pkgs.qt6.qtbase;
+          zlibStorePath = lib.getLib pkgs.zlib;
          # ?TODO? can remove below since manual linking not needed?
          # qt6QtWaylandStorePath = lib.getLib pkgs.qt6.qtwayland;

          # XXX NOTE XXX, for now we overlay specific pkgs via
          # a major-version-pinned-`cpython`
          cpython = "python313";
+          python = pkgs.${cpython};
          pypkgs = pkgs."${cpython}Packages";
        in
        {
@ -46,7 +48,7 @@
              qt6.qtbase

              uv
-              python313  # ?TODO^ how to set from `cpython` above?
+              python
              pypkgs.pyqt6
              pypkgs.pyqt6-sip
              pypkgs.qtpy
@ -70,6 +72,7 @@

              # 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="${zlibStorePath}/lib:$LD_LIBRARY_PATH"

              export LD_LIBRARY_PATH

@ -86,15 +89,31 @@
              export QT_WAYLAND_SHELL_INTEGRATION="xdg-shell"

              # ------ uv ------
+              # ignore any venv inherited from an outer checkout
+              unset VIRTUAL_ENV
              # - always use the ./py313/ venv-subdir
              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
              uv sync --dev --all-extras --no-group lint
+              source "$UV_PROJECT_ENVIRONMENT/bin/activate"

              # ------ TIPS ------
              # NOTE, to launch the py-venv installed `xonsh` (like @goodboy)
              # run the `nix develop` cmd with,
-              # >> nix develop -c uv run xonsh
+              # >> nix develop -c xonsh
            '';
          };
        }
Author	SHA1	Message	Date
Gud Boi	58ffe48775	Bump `flake.lock` after dev-shell fixes Advance `nixpkgs` to `241313f4`; the refreshed closure passes Qt, `pyqtgraph` and wksmod-path import checks. (this commit msg was generated in some part by `opencode` using `gpt-5.6-sol` (`openai`))	2026-07-21 16:44:58 -04:00
Gud Boi	ceb806c136	Rebuild stale `uv` envs after flake updates `uv sync` accepts an existing same-minor Python even when its Nix store path belongs to an older closure. That can leave a glibc 2.40 interpreter loading Qt built against glibc 2.42. - derive the Python package once from `cpython` - clear `py313` when its interpreter target differs from the flake - ignore inherited `VIRTUAL_ENV` before syncing (this patch was generated in some part by `opencode` using `gpt-5.6-sol` (`openai`))	2026-07-21 16:37:59 -04:00
Gud Boi	3da8900f68	Fix `flake.nix` dev-shell install The refreshed Nix closure no longer supplies `libz.so.1` to the `uv` NumPy wheel, and leaves the synced `py313` env off `PATH`. - add Nix `zlib` to `LD_LIBRARY_PATH` for native Python deps - activate `py313` after `uv sync` so `pyqtgraph`, `piker` and `xonsh` resolve from the locked env (this patch was generated in some part by `opencode` using `gpt-5.6-sol` (`openai`))	2026-07-21 15:13:35 -04:00
Gud Boi	f6dc218a8e	Bump `flake.lock` to avoid nix warnings.. However this breaks `pyqtgraph` due to missing `PyQtX` libs??	2026-07-15 16:29:18 -04:00