diff --git a/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix b/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix
index 750efe12ff778..d4423c3c2f541 100644
--- a/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix
+++ b/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix
@@ -12,26 +12,31 @@
 
 stdenv.mkDerivation rec {
   pname = "gnupg-pkcs11-scd";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchurl {
-    url = "https://github.com/alonbl/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-Kb8p53gPkhxtOhH2COKwSDwbtRDFr6hHMJAkndV8Ukk=";
+    url = "https://github.com/alonbl/gnupg-pkcs11-scd/releases/download/gnupg-pkcs11-scd-${version}/gnupg-pkcs11-scd-${version}.tar.bz2";
+    hash = "sha256-lUeH5WLys9kpQhLDLdDYGizTesolDmaFAC0ok7uVkIc=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
   buildInputs = [
+    libassuan
+    libgcrypt
+    libgpg-error
     pkcs11helper
     openssl
   ];
 
   configureFlags = [
-    "--with-libgpg-error-prefix=${libgpg-error.dev}"
-    "--with-libassuan-prefix=${libassuan.dev}"
     "--with-libgcrypt-prefix=${libgcrypt.dev}"
   ];
 
   meta = with lib; {
+    changelog = "https://github.com/alonbl/gnupg-pkcs11-scd/blob/gnupg-pkcs11-scd-${version}/ChangeLog";
     description = "Smart-card daemon to enable the use of PKCS#11 tokens with GnuPG";
     mainProgram = "gnupg-pkcs11-scd";
     longDescription = ''
diff --git a/pkgs/by-name/gp/gpa/package.nix b/pkgs/by-name/gp/gpa/package.nix
index 79b9268842883..ac4678022c3dc 100644
--- a/pkgs/by-name/gp/gpa/package.nix
+++ b/pkgs/by-name/gp/gpa/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   intltool,
   pkg-config,
-  gtk2,
+  gtk3,
   gpgme,
   libgpg-error,
   libassuan,
@@ -12,25 +12,29 @@
 
 stdenv.mkDerivation rec {
   pname = "gpa";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchurl {
     url = "mirror://gnupg/gpa/gpa-${version}.tar.bz2";
-    sha256 = "1cbpc45f8qbdkd62p12s3q2rdq6fa5xdzwmcwd3xrj55bzkspnwm";
+    hash = "sha256-Jqj6W/cFQct0Hwxxt8/ikbHqVuq2jusHqpYs71zfM8w=";
   };
 
   nativeBuildInputs = [
     intltool
     pkg-config
   ];
+
   buildInputs = [
-    gtk2
+    gtk3
     gpgme
     libgpg-error
     libassuan
   ];
 
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
+
   meta = with lib; {
+    changelog = "https://dev.gnupg.org/source/gpa/browse/master/NEWS;gpa-${version}?view=raw";
     description = "Graphical user interface for the GnuPG";
     homepage = "https://www.gnupg.org/related_software/gpa/";
     license = licenses.gpl3Plus;
diff --git a/pkgs/by-name/li/libassuan/package.nix b/pkgs/by-name/li/libassuan/package.nix
index 25cd5a2ed485c..4c6fbea829515 100644
--- a/pkgs/by-name/li/libassuan/package.nix
+++ b/pkgs/by-name/li/libassuan/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libassuan";
-  version = "2.5.7";
+  version = "3.0.2";
 
   src = fetchurl {
-    url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-AQMIH/wng4ouUEeRU8oQXoc9PWXYqVkygunJTH5q+3Y=";
+    url = "mirror://gnupg/libassuan/libassuan-${version}.tar.bz2";
+    hash = "sha256-0pMc2tJm5jNRD5lw4aLzRgVeNRuxn5t4kSR1uAdMNvY=";
   };
 
   outputs = [
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     ignoredVersions = ".*-base";
   };
 
-  meta = with lib; {
+  meta = {
     description = "IPC library used by GnuPG and related software";
     mainProgram = "libassuan-config";
     longDescription = ''
@@ -60,8 +60,8 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://gnupg.org/software/libassuan/";
     changelog = "https://dev.gnupg.org/source/libassuan/browse/master/NEWS;libassuan-${version}";
-    license = licenses.lgpl2Plus;
-    platforms = platforms.all;
+    license = lib.licenses.lgpl2Plus;
+    platforms = lib.platforms.all;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix
index a6c8395b0a568..28a2750f8a97f 100644
--- a/pkgs/tools/security/pinentry/mac.nix
+++ b/pkgs/tools/security/pinentry/mac.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
     cp -r ${./mac/Main.nib} macosx/Main.nib
     cp -r ${./mac/Pinentry.nib} macosx/Pinentry.nib
     chmod -R u+w macosx/*.nib
+    # pinentry_mac requires updated macros to correctly detect v2 API support in libassuan 3.x.
+    cp '${lib.getDev libassuan}/share/aclocal/libassuan.m4' m4/libassuan.m4
   '';
 
   # Unfortunately, PlistBuddy from xcbuild is not compatible enough pinentry-mac’s build process.