Merge pull request #16446 from vrthra/gnupg21

gnupg21: 2.1.12 -> 2.1.13
This commit is contained in:
zimbatm 2016-06-24 01:04:31 +01:00 committed by GitHub
commit e0dd0c902d
3 changed files with 15 additions and 12 deletions

View File

@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libgcrypt-${version}"; name = "libgcrypt-${version}";
version = "1.7.0"; version = "1.7.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
sha256 = "14pspxwrqcgfklw3dgmywbxqwdzcym7fznfrqh9rk4vl8jkpxrmh"; sha256 = "15bsdpihb8xvr2a6sh0ikzw9wdw3gdi4pl1vpr6wc48npzy9q3a5";
}; };
outputs = [ "dev" "out" "info" ]; outputs = [ "dev" "out" "info" ];
@ -35,12 +35,12 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
meta = { meta = with stdenv.lib; {
homepage = https://www.gnu.org/software/libgcrypt/; homepage = https://www.gnu.org/software/libgcrypt/;
description = "General-pupose cryptographic library"; description = "General-pupose cryptographic library";
license = lib.licenses.lgpl2Plus; license = licenses.lgpl2Plus;
platforms = lib.platforms.all; platforms = platforms.all;
maintainers = [ lib.maintainers.wkennington ]; maintainers = [ maintainers.wkennington maintainers.vrthra ];
repositories.git = git://git.gnupg.org/libgcrypt.git; repositories.git = git://git.gnupg.org/libgcrypt.git;
}; };
} }

View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl, gettext }: { stdenv, fetchurl, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libgpg-error-1.21"; name = "libgpg-error-${version}";
version = "1.23";
src = fetchurl { src = fetchurl {
url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; url = "mirror://gnupg/libgpg-error/${name}.tar.bz2";
sha256 = "0kdq2cbnk84fr4jqcv689rlxpbyl6bda2cn6y3ll19v3mlydpnxp"; sha256 = "1alyjd6671drj92m0qi9943rfmf1sjjbzvmz97v4hh4cp5jpy33z";
}; };
postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure"; postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure";
@ -41,7 +42,7 @@ stdenv.mkDerivation rec {
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;
platforms = platforms.all; platforms = platforms.all;
maintainers = [ maintainers.fuuzetsu ]; maintainers = [ maintainers.fuuzetsu maintainers.vrthra ];
}; };
} }

View File

@ -13,11 +13,13 @@ with stdenv.lib;
assert x11Support -> pinentry != null; assert x11Support -> pinentry != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnupg-2.1.12"; name = "gnupg-${version}";
version = "2.1.13";
src = fetchurl { src = fetchurl {
url = "mirror://gnupg/gnupg/${name}.tar.bz2"; url = "mirror://gnupg/gnupg/${name}.tar.bz2";
sha256 = "01n5py45x0r97l4dzmd803jpbpbcxr1591k3k4s8m9804jfr4d5c"; sha256 = "0xcn46vcb5x5qx0bc803vpzhzhnn6wfhp7x71w9n1ahx4ak877ag";
}; };
buildInputs = [ buildInputs = [
@ -37,7 +39,7 @@ stdenv.mkDerivation rec {
homepage = http://gnupg.org; homepage = http://gnupg.org;
description = "A complete and free implementation of the OpenPGP standard"; description = "A complete and free implementation of the OpenPGP standard";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ wkennington peti fpletz ]; maintainers = with maintainers; [ wkennington peti fpletz vrthra ];
platforms = platforms.all; platforms = platforms.all;
}; };
} }