From 2dfd9b51ae5643c71304bff3c3475a91107d58fa Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 19 May 2010 21:11:46 +0000 Subject: [PATCH] gnupg2 is now called gnupg svn path=/nixos/trunk/; revision=21889 --- modules/installer/cd-dvd/installation-cd-rescue.nix | 2 +- modules/services/x11/display-managers/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/installer/cd-dvd/installation-cd-rescue.nix b/modules/installer/cd-dvd/installation-cd-rescue.nix index 7b220680b6c..fe067df03fb 100644 --- a/modules/installer/cd-dvd/installation-cd-rescue.nix +++ b/modules/installer/cd-dvd/installation-cd-rescue.nix @@ -24,7 +24,7 @@ fuse ntfs3g smbfsFuse sshfsFuse manpages irssi elinks mcabber mutt openssh lftp openssl ncat socat - gnupg gnupg2 + gnupg1 gnupg patch which diffutils gcc binutils bc file screen bvi joe nvi diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix index 0cebbbf6be1..197ba7631e9 100644 --- a/modules/services/x11/display-managers/default.nix +++ b/modules/services/x11/display-managers/default.nix @@ -43,7 +43,7 @@ let ${optionalString cfg.startGnuPGAgent '' if test -z "$SSH_AUTH_SOCK"; then # Restart this script as a child of the GnuPG agent. - exec "${if pkgs ? gnupg2 then pkgs.gnupg2 else pkgs.gnupg}/bin/gpg-agent" \ + exec "${pkgs.gnupg}/bin/gpg-agent" \ --enable-ssh-support --daemon \ --pinentry-program "${pkgs.pinentry}/bin/pinentry-gtk-2" \ --write-env-file "$HOME/.gpg-agent-info" \