public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnupg2 is now called gnupg

Browse Source 
svn path=/nixos/trunk/; revision=21889
This commit is contained in:
Yury G. Kudryashov 2010-05-19 21:11:46 +00:00
parent 12e43068cf
commit 2dfd9b51ae
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/installer/cd-dvd/installation-cd-rescue.nix
View File

@ -24,7 +24,7 @@
fuse ntfs3g smbfsFuse sshfsFuse fuse ntfs3g smbfsFuse sshfsFuse
manpages irssi elinks mcabber mutt openssh lftp manpages irssi elinks mcabber mutt openssh lftp
openssl ncat socat openssl ncat socat
gnupg gnupg2 gnupg1 gnupg
patch which diffutils gcc binutils bc file patch which diffutils gcc binutils bc file
screen screen
bvi joe nvi bvi joe nvi

2
modules/services/x11/display-managers/default.nix
View File

@ -43,7 +43,7 @@ let
${optionalString cfg.startGnuPGAgent '' ${optionalString cfg.startGnuPGAgent ''
if test -z "$SSH_AUTH_SOCK"; then if test -z "$SSH_AUTH_SOCK"; then
# Restart this script as a child of the GnuPG agent. # 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 \ --enable-ssh-support --daemon \
--pinentry-program "${pkgs.pinentry}/bin/pinentry-gtk-2" \ --pinentry-program "${pkgs.pinentry}/bin/pinentry-gtk-2" \
--write-env-file "$HOME/.gpg-agent-info" \ --write-env-file "$HOME/.gpg-agent-info" \