From b586b00b3b0e2e2a2074422412d65990b00bf78b Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Thu, 23 Jun 2016 00:26:48 -0700 Subject: [PATCH 1/3] gnupg21: 2.1.12 -> 2.1.13 --- pkgs/tools/security/gnupg/21.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index a1cbcb458c5..1266e57e76f 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -13,11 +13,13 @@ with stdenv.lib; assert x11Support -> pinentry != null; stdenv.mkDerivation rec { - name = "gnupg-2.1.12"; + name = "gnupg-${version}"; + + version = "2.1.13"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "01n5py45x0r97l4dzmd803jpbpbcxr1591k3k4s8m9804jfr4d5c"; + sha256 = "0xcn46vcb5x5qx0bc803vpzhzhnn6wfhp7x71w9n1ahx4ak877ag"; }; buildInputs = [ @@ -37,7 +39,7 @@ stdenv.mkDerivation rec { homepage = http://gnupg.org; description = "A complete and free implementation of the OpenPGP standard"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ wkennington peti fpletz ]; + maintainers = with maintainers; [ wkennington peti fpletz vrthra ]; platforms = platforms.all; }; } From ec91698ace81dea98bdb210de3fc38ac999c6cf1 Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Thu, 23 Jun 2016 00:32:25 -0700 Subject: [PATCH 2/3] libgcrypt: 1.7.0 -> 1.7.1 --- pkgs/development/libraries/libgcrypt/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index dd57e74e156..7a62011ddb4 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { name = "libgcrypt-${version}"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "14pspxwrqcgfklw3dgmywbxqwdzcym7fznfrqh9rk4vl8jkpxrmh"; + sha256 = "15bsdpihb8xvr2a6sh0ikzw9wdw3gdi4pl1vpr6wc48npzy9q3a5"; }; outputs = [ "dev" "out" "info" ]; @@ -35,12 +35,12 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with stdenv.lib; { homepage = https://www.gnu.org/software/libgcrypt/; description = "General-pupose cryptographic library"; - license = lib.licenses.lgpl2Plus; - platforms = lib.platforms.all; - maintainers = [ lib.maintainers.wkennington ]; + license = licenses.lgpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.wkennington maintainers.vrthra ]; repositories.git = git://git.gnupg.org/libgcrypt.git; }; } From 1ad68e58df9b398640fe6e754247e0d437c01dc0 Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Thu, 23 Jun 2016 00:34:35 -0700 Subject: [PATCH 3/3] libgpg-error: 1.21 -> 1.23 --- pkgs/development/libraries/libgpg-error/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 9c4f3705b3e..c15dcc4993d 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "libgpg-error-1.21"; + name = "libgpg-error-${version}"; + version = "1.23"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "0kdq2cbnk84fr4jqcv689rlxpbyl6bda2cn6y3ll19v3mlydpnxp"; + sha256 = "1alyjd6671drj92m0qi9943rfmf1sjjbzvmz97v4hh4cp5jpy33z"; }; postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure"; @@ -41,7 +42,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; platforms = platforms.all; - maintainers = [ maintainers.fuuzetsu ]; + maintainers = [ maintainers.fuuzetsu maintainers.vrthra ]; }; }