From 56a4caf39b614f698a07f08e6eb07a8734bb5085 Mon Sep 17 00:00:00 2001 From: samrose Date: Thu, 13 Jun 2024 12:44:48 -0400 Subject: [PATCH 1/3] fix: outside of direnv clan-li warns this is going to be deprecated --- pkgs/clan-cli/clan_cli/nix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/clan-cli/clan_cli/nix.py b/pkgs/clan-cli/clan_cli/nix.py index a3ab814c..522ad9a3 100644 --- a/pkgs/clan-cli/clan_cli/nix.py +++ b/pkgs/clan-cli/clan_cli/nix.py @@ -59,7 +59,7 @@ def nix_add_to_gcroots(nix_path: Path, dest: Path) -> None: def nix_config() -> dict[str, Any]: - cmd = nix_command(["show-config", "--json"]) + cmd = nix_command(["config show", "--json"]) proc = run(cmd) data = json.loads(proc.stdout) config = {} From 5f2249336112c61f7d29de88c0b143786a263c56 Mon Sep 17 00:00:00 2001 From: samrose Date: Thu, 13 Jun 2024 12:59:26 -0400 Subject: [PATCH 2/3] fix: formatting cli command correctly --- pkgs/clan-cli/clan_cli/nix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/clan-cli/clan_cli/nix.py b/pkgs/clan-cli/clan_cli/nix.py index 522ad9a3..94f2d929 100644 --- a/pkgs/clan-cli/clan_cli/nix.py +++ b/pkgs/clan-cli/clan_cli/nix.py @@ -59,7 +59,7 @@ def nix_add_to_gcroots(nix_path: Path, dest: Path) -> None: def nix_config() -> dict[str, Any]: - cmd = nix_command(["config show", "--json"]) + cmd = nix_command(["config", "show", "--json"]) proc = run(cmd) data = json.loads(proc.stdout) config = {} From 06bbae6d140ad1bd51fb62e23a820fd010b60417 Mon Sep 17 00:00:00 2001 From: samrose Date: Thu, 13 Jun 2024 18:44:50 -0400 Subject: [PATCH 3/3] fix: trying run_no_stdout with original show-config --- pkgs/clan-cli/clan_cli/nix.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/nix.py b/pkgs/clan-cli/clan_cli/nix.py index 94f2d929..0d191577 100644 --- a/pkgs/clan-cli/clan_cli/nix.py +++ b/pkgs/clan-cli/clan_cli/nix.py @@ -4,7 +4,7 @@ import tempfile from pathlib import Path from typing import Any -from .cmd import run +from .cmd import run, run_no_stdout from .dirs import nixpkgs_flake, nixpkgs_source @@ -59,8 +59,8 @@ def nix_add_to_gcroots(nix_path: Path, dest: Path) -> None: def nix_config() -> dict[str, Any]: - cmd = nix_command(["config", "show", "--json"]) - proc = run(cmd) + cmd = nix_command(["show-config", "--json"]) + proc = run_no_stdout(cmd) data = json.loads(proc.stdout) config = {} for key, value in data.items():