From 45e4dc0d5dc97349a4631d85107e12a260b25b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 26 Mar 2018 19:25:55 +0100 Subject: [PATCH] python.pkgs.gpg: rename to gpgme Let's be honest with what we expose. --- pkgs/development/python-modules/alot/default.nix | 6 +++--- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index 7c704c9dc55..7abc56c4783 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildPythonPackage, fetchFromGitHub, isPy3k -, notmuch, urwid, urwidtrees, twisted, python_magic, configobj, pygpgme, mock, file, gpgme -, service-identity, gpg +, notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme +, service-identity , gnupg ? null, sphinx, awk ? null, procps ? null, future ? null , withManpage ? false }: @@ -36,7 +36,7 @@ buildPythonPackage rec { configobj service-identity file - gpg + gpgme ]; # some twisted tests need the network (test_env_set... ) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7ad86720bb6..b5b86e3586a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8173,7 +8173,7 @@ in { google_gax = callPackage ../development/python-modules/google_gax { }; - gpg = toPythonModule (pkgs.gpgme.override { withPython=true; }); + gpgme = toPythonModule (pkgs.gpgme.override { withPython=true; }); grammalecte = callPackage ../development/python-modules/grammalecte { };