From b29f805a0ab4fa644c2d142f0f316b51caf3acc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 26 Jun 2026 13:54:57 -0700 Subject: [PATCH 1/2] python3Packages.gpg: rename from gpgme The project name (e.g. on PyPI) is gpg. --- pkgs/by-name/al/alot/package.nix | 2 +- pkgs/by-name/ca/caerbannog/package.nix | 2 +- pkgs/by-name/gn/gnome-keysign/package.nix | 2 +- pkgs/by-name/ze/zeyple/package.nix | 2 +- pkgs/development/python-modules/dulwich/default.nix | 4 ++-- pkgs/development/python-modules/{gpgme => gpg}/default.nix | 2 +- pkgs/development/python-modules/pygpgme/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 9 files changed, 11 insertions(+), 10 deletions(-) rename pkgs/development/python-modules/{gpgme => gpg}/default.nix (98%) diff --git a/pkgs/by-name/al/alot/package.nix b/pkgs/by-name/al/alot/package.nix index 1651b1bfe8eb..96edc5a08021 100644 --- a/pkgs/by-name/al/alot/package.nix +++ b/pkgs/by-name/al/alot/package.nix @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication (finalAttrs: { dependencies = with python3Packages; [ configobj - gpgme + gpg notmuch2 python-magic standard-mailcap diff --git a/pkgs/by-name/ca/caerbannog/package.nix b/pkgs/by-name/ca/caerbannog/package.nix index 0ddb78a0006c..48b662b2fba8 100644 --- a/pkgs/by-name/ca/caerbannog/package.nix +++ b/pkgs/by-name/ca/caerbannog/package.nix @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { propagatedBuildInputs = with python3.pkgs; [ anytree fuzzyfinder - gpgme + gpg pygobject3 ]; diff --git a/pkgs/by-name/gn/gnome-keysign/package.nix b/pkgs/by-name/gn/gnome-keysign/package.nix index e4043556cab8..4788899abe4e 100644 --- a/pkgs/by-name/gn/gnome-keysign/package.nix +++ b/pkgs/by-name/gn/gnome-keysign/package.nix @@ -52,7 +52,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { propagatedBuildInputs = with python3.pkgs; [ dbus-python - gpgme + gpg magic-wormhole pygobject3 pybluez diff --git a/pkgs/by-name/ze/zeyple/package.nix b/pkgs/by-name/ze/zeyple/package.nix index dabdc8618f52..3b9dd290e361 100644 --- a/pkgs/by-name/ze/zeyple/package.nix +++ b/pkgs/by-name/ze/zeyple/package.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication { --replace-fail 'from configparser import SafeConfigParser' 'from configparser import ConfigParser as SafeConfigParser' ''; - propagatedBuildInputs = [ python3Packages.gpgme ]; + propagatedBuildInputs = [ python3Packages.gpg ]; installPhase = '' runHook preInstall diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 734517b5f0bd..e553dbb15dc7 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -9,7 +9,7 @@ git, glibcLocales, gnupg, - gpgme, + gpg, merge3, nix-update-script, openssh, @@ -61,7 +61,7 @@ buildPythonPackage (finalAttrs: { https = [ urllib3 ]; merge = [ merge3 ]; pgp = [ - gpgme + gpg gnupg ]; paramiko = [ paramiko ]; diff --git a/pkgs/development/python-modules/gpgme/default.nix b/pkgs/development/python-modules/gpg/default.nix similarity index 98% rename from pkgs/development/python-modules/gpgme/default.nix rename to pkgs/development/python-modules/gpg/default.nix index 1aa561bee793..6e2f0991315b 100644 --- a/pkgs/development/python-modules/gpgme/default.nix +++ b/pkgs/development/python-modules/gpg/default.nix @@ -11,7 +11,7 @@ }: buildPythonPackage rec { - pname = "gpgme"; + pname = "gpg"; version = "2.0.0"; pyproject = true; diff --git a/pkgs/development/python-modules/pygpgme/default.nix b/pkgs/development/python-modules/pygpgme/default.nix index 0b3e07ee068c..f04f0898c6b7 100644 --- a/pkgs/development/python-modules/pygpgme/default.nix +++ b/pkgs/development/python-modules/pygpgme/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchurl, - gpgme, + gpg, isPyPy, pythonAtLeast, }: @@ -24,7 +24,7 @@ buildPythonPackage rec { # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = [ gpgme ]; + propagatedBuildInputs = [ gpg ]; meta = { homepage = "https://launchpad.net/pygpgme"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index d9b4213be09b..ef060c43c5ef 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -251,6 +251,7 @@ mapAliases { googleapis_common_protos = throw "'googleapis_common_protos' has been renamed to/replaced by 'googleapis-common-protos'"; # Converted to throw 2025-10-29 gotrue = throw "'gotrue' has been replaced by 'supabase-auth'"; # Added 2026-03-08 gpapi = throw "'gpapi' has been superseded by google-api-python-client"; # Added 2025-11-09 + gpgme = gpg; # added 2026-06-26 gplaycli = throw "'gplaycli' has been removed as it was broken and lacked maintenance"; # Added 2025-11-09 gpy = throw "'gpy' has been removed as it is based on 'paramz', which was removed"; # added 2025-11-10 gradient_statsd = throw "'gradient_statsd' has been renamed to/replaced by 'gradient-statsd'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9d69c24741f6..9cebce9c388d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6789,7 +6789,7 @@ self: super: with self; { inherit (pkgs) libxc; }; - gpgme = callPackage ../development/python-modules/gpgme { inherit (pkgs) gpgme; }; + gpg = callPackage ../development/python-modules/gpg { inherit (pkgs) gpgme; }; gphoto2 = callPackage ../development/python-modules/gphoto2 { }; From ec28a25106f5299903c7bc08241c7d047b0c37b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 26 Jun 2026 14:12:03 -0700 Subject: [PATCH 2/2] kdePackages: remove unused argument --- pkgs/kde/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index e97e6d866a7d..217405da9e33 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -5,7 +5,6 @@ fetchurl, qt6Packages, cmark, - gpgme, taglib, wayland-protocols, wayland,