b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

pluginupdate: don't rely on NIX_PATH

Browse source 
Nix does not respect `NIX_PATH` when the `nix-path` setting in nix.conf is set
This commit is contained in:
figsoda 2023-08-12 11:32:02 -04:00
parent aefe566f73
commit 32f6cfaae5
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
maintainers/scripts/pluginupdate.py
View file

@ -315,9 +315,10 @@ def load_plugins_from_csv(config: FetchConfig, input_file: Path,) -> List[Plugin
return plugins
def run_nix_expr(expr):
with CleanEnvironment():
with CleanEnvironment() as nix_path:
cmd = ["nix", "eval", "--extra-experimental-features",
"nix-command", "--impure", "--json", "--expr", expr]
"nix-command", "--impure", "--json", "--expr", expr,
"--nix-path", nix_path]
log.debug("Running command %s", " ".join(cmd))
out = subprocess.check_output(cmd)
data = json.loads(out)
@ -521,14 +522,14 @@ class Editor:
class CleanEnvironment(object):
def __enter__(self) -> None:
def __enter__(self) -> str:
self.old_environ = os.environ.copy()
local_pkgs = str(Path(__file__).parent.parent.parent)
os.environ["NIX_PATH"] = f"localpkgs={local_pkgs}"
self.empty_config = NamedTemporaryFile()
self.empty_config.write(b"{}")
self.empty_config.flush()
os.environ["NIXPKGS_CONFIG"] = self.empty_config.name
return f"localpkgs={local_pkgs}"
def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
os.environ.update(self.old_environ)