-
-
Notifications
You must be signed in to change notification settings - Fork 12.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Additionally, move all gnupg expressions into the gnupg folder.
- Loading branch information
1 parent
3d04993
commit 850da18
Showing
5 changed files
with
41 additions
and
3 deletions.
There are no files selected for viewing
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, npth | ||
, readline ? null, libusb ? null, gnutls ? null, adns ? null, openldap ? null | ||
, zlib ? null, bzip2 ? null, pinentry ? null | ||
}: | ||
|
||
with stdenv.lib; | ||
stdenv.mkDerivation rec { | ||
name = "gnupg-2.1.0"; | ||
|
||
src = fetchurl { | ||
url = "mirror://gnupg/gnupg/${name}.tar.bz2"; | ||
sha256 = "12q5shx6ldqad3rky154nv8f2cy57sxy9idivz93ggqm1bsw7a0n"; | ||
}; | ||
|
||
buildInputs = [ | ||
pkgconfig libgcrypt libassuan libksba npth | ||
readline libusb gnutls adns openldap zlib bzip2 | ||
]; | ||
|
||
configureFlags = | ||
optional (pinentry != null) "--with-pinentry-pgm=${pinentry}/bin/pinentry"; | ||
|
||
meta = with stdenv.lib; { | ||
homepage = http://gnupg.org; | ||
description = "a complete and free implementation of the OpenPGP standard"; | ||
license = licenses.gpl3Plus; | ||
maintainers = with maintainers; [ wkennington ]; | ||
platforms = platforms.all; | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
850da18
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@wkennington, I believe this commit broke
git-annex
: http://hydra.cryp.to/build/237313/nixlog/1/raw. Are you sure thatgnupg1compat
works correctly with gnupg version 2.1?850da18
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
850da18
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Commit 4c84621 fixed that test suite failure, so clearly there is a difference between 2.1 and 2.0 as far as the compat layer is concerned.
850da18
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
850da18
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why would the compatibility layer to version 1.0 change at all? Wouldn't that negate the entire purpose of of a "compatibility layer" that emulates an old interface?
850da18
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
850da18
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, but gnupg 2.x implements a the old command-line interface from version 1.x. That is not supposed to change, no?
850da18
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
850da18
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, I don't care that much about the subject, to be honest. Switching
gnupg1compat
back to gnupg version 2.0 fixes the issue, so that is good enough for me.