uv: fix test and don't override VIRTUAL_ENV

cachix · Oct 7, 2024 · d51860c · d51860c
1 parent 30b43aa
commit d51860c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/modules/languages/python.nix b/src/modules/languages/python.nix
@@ -464,13 +464,15 @@ in
       "devenv:python:poetry" = lib.mkIf cfg.poetry.install.enable {
         description = "Initialize Poetry";
         exec = initPoetryScript;
-        exports = [ "PATH" "VIRTUAL_ENV" ];
+        exports = [ "PATH" ] ++ lib.optional cfg.poetry.activate.enable "VIRTUAL_ENV";
+        after = lib.optional cfg.venv.enable "devenv:python:virtualenv";
       };
 
       "devenv:python:uv" = lib.mkIf cfg.uv.sync.enable {
         description = "Initialize uv sync";
         exec = initUvScript;
-        exports = [ "PATH" "VIRTUAL_ENV" ];
+        exports = [ "PATH" ];
+        after = lib.optional cfg.venv.enable "devenv:python:virtualenv";
       };
 
       "devenv:enterShell".after = lib.optional cfg.venv.enable "devenv:python:virtualenv"

diff --git a/tests/python-uv-sync/devenv.nix b/tests/python-uv-sync/devenv.nix
@@ -6,6 +6,7 @@ in
   languages.python = {
     enable = true;
     directory = "./directory";
+    venv.enable = true;
     uv = {
       enable = true;
       package = pkgs-unstable.uv;