From d3a1b29c6b5a7cce66488e42c8e855478f2caddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 25 Mar 2025 18:09:56 +0100 Subject: [PATCH] make gnupg a dependency of sops if anything uses a gnupg key, we need the gnupg binary. Sucks a bit, but at least it makes it work everywhere. --- pkgs/clan-cli/clan_cli/secrets/import_sops.py | 2 +- pkgs/clan-cli/clan_cli/secrets/sops.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/secrets/import_sops.py b/pkgs/clan-cli/clan_cli/secrets/import_sops.py index ccf3b90eb..de07fd07e 100644 --- a/pkgs/clan-cli/clan_cli/secrets/import_sops.py +++ b/pkgs/clan-cli/clan_cli/secrets/import_sops.py @@ -30,7 +30,7 @@ def import_sops(args: argparse.Namespace) -> None: if args.input_type: cmd += ["--input-type", args.input_type] cmd += ["--output-type", "json", "--decrypt", args.sops_file] - cmd = nix_shell(["nixpkgs#sops"], cmd) + cmd = nix_shell(["nixpkgs#sops", "nixpkgs#gnupg"], cmd) res = run(cmd, RunOpts(error_msg=f"Could not import sops file {file}")) secrets = json.loads(res.stdout) diff --git a/pkgs/clan-cli/clan_cli/secrets/sops.py b/pkgs/clan-cli/clan_cli/secrets/sops.py index b678c2d19..3f533962c 100644 --- a/pkgs/clan-cli/clan_cli/secrets/sops.py +++ b/pkgs/clan-cli/clan_cli/secrets/sops.py @@ -233,7 +233,7 @@ def sops_run( raise ClanError(msg) sops_cmd.append(str(secret_path)) - cmd = nix_shell(["nixpkgs#sops"], sops_cmd) + cmd = nix_shell(["nixpkgs#sops", "nixpkgs#gnupg"], sops_cmd) opts = ( dataclasses.replace(run_opts, env=environ) if run_opts