From 72f6b368d6ef58dc332a9a73967d87989071cb9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 26 Jul 2023 08:17:37 +0200 Subject: [PATCH] cli: resolve CLAN_NIXPKGS on every invocation this makes mocking easier --- pkgs/clan-cli/clan_cli/nix.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/nix.py b/pkgs/clan-cli/clan_cli/nix.py index b5515676d..f8d3c89a4 100644 --- a/pkgs/clan-cli/clan_cli/nix.py +++ b/pkgs/clan-cli/clan_cli/nix.py @@ -1,10 +1,9 @@ import os -CLAN_NIXPKGS = os.environ.get("CLAN_NIXPKGS") - def nix_shell(packages: list[str], cmd: list[str]) -> list[str]: + nixpkgs = os.environ.get("CLAN_NIXPKGS") # in unittest we will have all binaries provided - if CLAN_NIXPKGS is None: + if nixpkgs is None: return cmd - return ["nix", "shell", "-f", CLAN_NIXPKGS] + packages + ["-c"] + cmd + return ["nix", "shell", "-f", nixpkgs] + packages + ["-c"] + cmd