From 401979b20a8aff44e68a3969d805f1613f8c3ddf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 7 Oct 2024 14:06:41 +0100 Subject: [PATCH] uv: fix test and don't override VIRTUAL_ENV --- src/modules/languages/python.nix | 4 ++-- tests/python-uv-sync/devenv.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/modules/languages/python.nix b/src/modules/languages/python.nix index 9cfb18551..dc30577d4 100644 --- a/src/modules/languages/python.nix +++ b/src/modules/languages/python.nix @@ -464,13 +464,13 @@ 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"; }; "devenv:python:uv" = lib.mkIf cfg.uv.sync.enable { description = "Initialize uv sync"; exec = initUvScript; - exports = [ "PATH" "VIRTUAL_ENV" ]; + exports = [ "PATH" ]; }; "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 index 29e924051..fc657a1ee 100644 --- 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;