diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-04-04 12:33:20 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-04-04 12:42:31 +0200 |
| commit | 16faa2ca67db71617f808d9d0bbad8a0a04bfd41 (patch) | |
| tree | 28f790a47e76b0305999ff78bf3474d4cf0ad044 /tests | |
| parent | e549839f61eeee87a575ccc132eff8099e333c32 (diff) | |
modules: Rename gpg-agent to gnupg
We do things such as placing gnupg into environment.systemPackages, so calling this just "programs.gpg-agent" doesn't fit that. Especially if we really want to have a way to specify configuration values in case I'm getting masochistic someday ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/default.nix | 2 | ||||
| -rw-r--r-- | tests/programs/gnupg/default.nix (renamed from tests/programs/gpg-agent/default.nix) | 8 | ||||
| -rw-r--r-- | tests/programs/gnupg/snakeoil.asc (renamed from tests/programs/gpg-agent/snakeoil.asc) | 0 |
3 files changed, 6 insertions, 4 deletions
diff --git a/tests/default.nix b/tests/default.nix index 29fdb973..88c854a5 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -13,7 +13,7 @@ in { starbound = callTest ./games/starbound.nix; }; programs = { - gpg-agent = callTest ./programs/gpg-agent; + gnupg = callTest ./programs/gnupg; }; richi235 = { # Currently broken diff --git a/tests/programs/gpg-agent/default.nix b/tests/programs/gnupg/default.nix index d10fdbfe..db77b92f 100644 --- a/tests/programs/gpg-agent/default.nix +++ b/tests/programs/gnupg/default.nix @@ -21,7 +21,7 @@ let cliTest = mkExpect ""; in { - name = "gpg-agent"; + name = "gnupg"; enableOCR = true; @@ -33,8 +33,10 @@ in { services.openssh.enable = true; services.xserver.displayManager.auto.user = "alice"; - vuizvui.programs.gpg-agent.enable = true; - vuizvui.programs.gpg-agent.sshSupport = true; + vuizvui.programs.gnupg.enable = true; + vuizvui.programs.gnupg.agent.enable = true; + vuizvui.programs.gnupg.agent.sshSupport = true; + programs.ssh.startAgent = false; }; diff --git a/tests/programs/gpg-agent/snakeoil.asc b/tests/programs/gnupg/snakeoil.asc index 59c07011..59c07011 100644 --- a/tests/programs/gpg-agent/snakeoil.asc +++ b/tests/programs/gnupg/snakeoil.asc |