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

gpgme: 1.8.0 -> 1.9.0

Browse Source 
For the license change see:
- https://directory.fsf.org/wiki/GPGME#tab=Details
- AUTHORS [0]

See #24491 for the other changes.

[0]: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=blob;f=AUTHORS;h=bbf1576ad27dc51956c371282862b468c633ea49;hb=HEAD
This commit is contained in:
Michael Weiss 2017-03-30 23:12:00 +02:00
parent c7e885ff99
commit 40d171855f
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/development/libraries/gpgme/default.nix
View File

@ -1,19 +1,11 @@
{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan { stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan }:
, useGnupg1 ? false, gnupg1 ? null }:
assert useGnupg1 -> gnupg1 != null;
assert !useGnupg1 -> gnupg != null;
let
gpgStorePath = if useGnupg1 then gnupg1 else gnupg;
gpgProgram = if useGnupg1 then "gpg" else "gpg2";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gpgme-1.8.0"; name = "gpgme-1.9.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnupg/gpgme/${name}.tar.bz2"; url = "mirror://gnupg/gpgme/${name}.tar.bz2";
sha256 = "0csx3qnycwm0n90ql6gs65if5xi4gqyzzy21fxs2xqicghjrfq2r"; sha256 = "1ssc0gs02r4fasabk7c6v6r865k2j02mpb5g1vkpbmzsigdzwa8v";
}; };
outputs = [ "out" "dev" "info" ]; outputs = [ "out" "dev" "info" ];
@ -24,20 +16,24 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig gnupg ]; nativeBuildInputs = [ pkgconfig gnupg ];
configureFlags = [ configureFlags = [
"--enable-fixed-path=${gpgStorePath}/bin" "--enable-fixed-path=${gnupg}/bin"
]; ];
# https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html
NIX_CFLAGS_COMPILE = NIX_CFLAGS_COMPILE =
with stdenv; lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; with stdenv; lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64";
AM_CXXFLAGS =
with stdenv; lib.optional (isDarwin) "-D_POSIX_C_SOURCE=200809L";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "http://www.gnupg.org/related_software/gpgme"; homepage = "https://gnupg.org/software/gpgme/index.html";
description = "Library for making GnuPG easier to use"; description = "Library for making GnuPG easier to use";
license = licenses.gpl2; longDescription = ''
GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
easier for applications. It provides a High-Level Crypto API for
encryption, decryption, signing, signature verification and key
management.
'';
license = with licenses; [ lgpl21Plus gpl3Plus ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.fuuzetsu ]; maintainers = with maintainers; [ fuuzetsu primeos ];
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -7709,9 +7709,7 @@ with pkgs;
gpac = callPackage ../applications/video/gpac { }; gpac = callPackage ../applications/video/gpac { };
gpgme = callPackage ../development/libraries/gpgme { gpgme = callPackage ../development/libraries/gpgme { };
gnupg1 = gnupg1orig;
};
pgpdump = callPackage ../tools/security/pgpdump { }; pgpdump = callPackage ../tools/security/pgpdump { };