diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 45df332bc0caf..58dccbfa23754 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -10,12 +10,9 @@ pth, libassuan, which, - ncurses, texinfo, buildPackages, qtbase ? null, - pythonSupport ? false, - swig ? null, # only for passthru.tests libsForQt5, qt6Packages, @@ -24,7 +21,7 @@ stdenv.mkDerivation rec { pname = "gpgme"; - version = "1.23.2"; + version = "1.24.0"; pyproject = true; outputs = [ @@ -37,12 +34,10 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnupg/gpgme/gpgme-${version}.tar.bz2"; - hash = "sha256-lJnosfM8zLaBVSehvBYEnTWmGYpsX64BhfK9VhvOUiQ="; + hash = "sha256-YeOmrYkyP+z6/xdrwXKPuMMxLy+qg0JNnVB3uiD199o="; }; patches = [ - # Support Python 3.10-3.12, remove distutils, https://dev.gnupg.org/D545 - ./python-310-312-remove-distutils.patch # Fix a test after disallowing compressed signatures in gpg (PR #180336) ./test_t-verify_double-plaintext.patch # Don't use deprecated LFS64 APIs (removed in musl 1.2.4) @@ -50,31 +45,12 @@ stdenv.mkDerivation rec { ./LFS64.patch ]; - postPatch = '' - # autoconf's beta detection requires a git repo to work - # and otherwise appends -unknown to the version number used in the python package which pip stumbles upon - substituteInPlace autogen.sh \ - --replace-fail 'tmp="-unknown"' 'tmp=""' - ''; - - nativeBuildInputs = - [ - autoreconfHook - gnupg - pkg-config - texinfo - ] - ++ lib.optionals pythonSupport [ - python3.pythonOnBuildForHost - python3.pkgs.pip - python3.pkgs.setuptools - python3.pkgs.wheel - ncurses - swig - which - ]; - - buildInputs = lib.optionals pythonSupport [ python3 ]; + nativeBuildInputs = [ + autoreconfHook + gnupg + pkg-config + texinfo + ]; propagatedBuildInputs = [ glib @@ -95,7 +71,6 @@ stdenv.mkDerivation rec { "--with-libgpg-error-prefix=${libgpg-error.dev}" "--with-libassuan-prefix=${libassuan.dev}" ] - ++ lib.optional pythonSupport "--enable-languages=python" # Tests will try to communicate with gpg-agent instance via a UNIX socket # which has a path length limit. Nix on darwin is using a build directory # that already has quite a long path and the resulting socket path doesn't diff --git a/pkgs/development/libraries/gpgme/python-310-312-remove-distutils.patch b/pkgs/development/libraries/gpgme/python-310-312-remove-distutils.patch deleted file mode 100644 index 774188aee89cd..0000000000000 --- a/pkgs/development/libraries/gpgme/python-310-312-remove-distutils.patch +++ /dev/null @@ -1,647 +0,0 @@ -diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am ---- a/lang/python/Makefile.am -+++ b/lang/python/Makefile.am -@@ -34,8 +34,8 @@ - .PHONY: prepare - prepare: copystamp - --# For VPATH builds we need to copy some files because Python's --# distutils are not VPATH-aware. -+# For VPATH builds we need to copy some files because Python -+# is not VPATH-aware. - copystamp: - ln -sf "$(top_srcdir)/src/data.h" . - ln -sf "$(top_builddir)/conf/config.h" . -@@ -48,7 +48,7 @@ - CFLAGS="$(CFLAGS)" \ - srcdir="$(srcdir)" \ - top_builddir="$(top_builddir)" \ -- $$PYTHON setup.py build --verbose --build-base="$$(basename "$${PYTHON}")-gpg" ; \ -+ $$PYTHON -m pip --verbose install --no-index --no-build-isolation --root="$$(basename "$${PYTHON}")-gpg" ${srcdir} ; \ - done - - python$(PYTHON_VERSION)-gpg/dist/gpg-$(VERSION).tar.gz.asc: copystamp -@@ -57,8 +57,7 @@ - CFLAGS="$(CFLAGS)" \ - srcdir="$(srcdir)" \ - top_builddir="$(top_builddir)" \ -- $(PYTHON) setup.py sdist --verbose --dist-dir=python$(PYTHON_VERSION)-gpg-dist \ -- --manifest=python$(PYTHON_VERSION)-gpg-dist/MANIFEST -+ $(PYTHON) -m build --sdist --outdir=python$(PYTHON_VERSION)-gpg-dist - gpgbin=gpgconf --list-components | grep OpenPGP | sed -e 's/gpg:OpenPGP://g' - $(gpgbin) --detach-sign --armor python$(PYTHON_VERSION)-gpg-dist/gpg-$(VERSION).tar.gz - -@@ -92,17 +91,16 @@ - CFLAGS="$(CFLAGS)" \ - srcdir="$(srcdir)" \ - top_builddir="$(top_builddir)" \ -- $$PYTHON setup.py \ -- build \ -- --build-base="$$(basename "$${PYTHON}")-gpg" \ -+ $$PYTHON -m pip --verbose \ - install \ -+ --no-index --no-build-isolation \ - --prefix "$(DESTDIR)$(prefix)" \ -- --verbose ; \ -+ ${srcdir} ; \ - done - - uninstall-local: - set -x; GV=$$(echo $(VERSION) | tr - _); for PYTHON in $(PYTHONS); do \ - PLATLIB="$(prefix)/$$("$${PYTHON}" -c 'import sysconfig, os; print(os.path.relpath(sysconfig.get_path("platlib", scheme="posix_prefix"), sysconfig.get_config_var("prefix")))')" ; \ - rm -rf -- "$(DESTDIR)$${PLATLIB}/gpg" \ -- "$(DESTDIR)$${PLATLIB}"/gpg-$$GV-py*.egg-info ; \ -+ "$(DESTDIR)$${PLATLIB}"/gpg-$$GV.dist-info ; \ - done -diff --git a/lang/python/doc/src/gpgme-python-howto.org b/lang/python/doc/src/gpgme-python-howto.org ---- a/lang/python/doc/src/gpgme-python-howto.org -+++ b/lang/python/doc/src/gpgme-python-howto.org -@@ -2945,7 +2945,7 @@ - =setup.py= file which contains this: - - #+BEGIN_SRC python -i --from distutils.core import setup -+from setuptools import setup - from Cython.Build import cythonize - - setup( -diff --git a/lang/python/examples/howto/advanced/cython/setup.py b/lang/python/examples/howto/advanced/cython/setup.py ---- a/lang/python/examples/howto/advanced/cython/setup.py -+++ b/lang/python/examples/howto/advanced/cython/setup.py -@@ -1,4 +1,4 @@ --from distutils.core import setup -+from setuptools import setup - from Cython.Build import cythonize - - setup( -diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in ---- a/lang/python/setup.py.in -+++ b/lang/python/setup.py.in -@@ -18,8 +18,8 @@ - # License along with this library; if not, write to the Free Software - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - --from distutils.core import setup, Extension --from distutils.command.build import build -+from setuptools import setup, Extension -+from setuptools.command.build import build - - import glob - import os -@@ -225,9 +225,8 @@ - build.run(self) - - --py3 = [] if sys.version_info.major < 3 else ['-py3'] - swig_sources = [] --swig_opts = ['-threads'] + py3 + extra_swig_opts -+swig_opts = ['-threads'] + extra_swig_opts - swige = Extension( - 'gpg._gpgme', - sources=swig_sources, -diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 ---- a/m4/ax_python_devel.m4 -+++ b/m4/ax_python_devel.m4 -@@ -1,10 +1,10 @@ - # =========================================================================== --# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html -+# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html - # =========================================================================== - # - # SYNOPSIS - # --# AX_PYTHON_DEVEL([version]) -+# AX_PYTHON_DEVEL([version[,optional]]) - # - # DESCRIPTION - # -@@ -12,8 +12,8 @@ - # in your configure.ac. - # - # This macro checks for Python and tries to get the include path to --# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS) --# output variables. It also exports $(PYTHON_EXTRA_LIBS) and -+# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LIBS) output -+# variables. It also exports $(PYTHON_EXTRA_LIBS) and - # $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code. - # - # You can search for some particular version of Python by passing a -@@ -23,6 +23,11 @@ - # version number. Don't use "PYTHON_VERSION" for this: that environment - # variable is declared as precious and thus reserved for the end-user. - # -+# By default this will fail if it does not detect a development version of -+# python. If you want it to continue, set optional to true, like -+# AX_PYTHON_DEVEL([], [true]). The ax_python_devel_found variable will be -+# "no" if it fails. -+# - # This macro should work for all versions of Python >= 2.1.0. As an end - # user, you can disable the check for the python version by setting the - # PYTHON_NOVERSIONCHECK environment variable to something else than the -@@ -67,10 +72,18 @@ - # modified version of the Autoconf Macro, you may extend this special - # exception to the GPL to apply to your modified version as well. - --#serial 17 -+#serial 36 - - AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL]) - AC_DEFUN([AX_PYTHON_DEVEL],[ -+ # Get whether it's optional -+ if test -z "$2"; then -+ ax_python_devel_optional=false -+ else -+ ax_python_devel_optional=$2 -+ fi -+ ax_python_devel_found=yes -+ - # - # Allow the use of a (user set) custom python version - # -@@ -81,81 +94,147 @@ - - AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]]) - if test -z "$PYTHON"; then -- AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path]) -+ AC_MSG_WARN([Cannot find python$PYTHON_VERSION in your system path]) -+ if ! $ax_python_devel_optional; then -+ AC_MSG_ERROR([Giving up, python development not available]) -+ fi -+ ax_python_devel_found=no - PYTHON_VERSION="" - fi - -- # -- # Check for a version of Python >= 2.1.0 -- # -- AC_MSG_CHECKING([for a version of Python >= '2.1.0']) -- ac_supports_python_ver=`$PYTHON -c "import sys; \ -+ if test $ax_python_devel_found = yes; then -+ # -+ # Check for a version of Python >= 2.1.0 -+ # -+ AC_MSG_CHECKING([for a version of Python >= '2.1.0']) -+ ac_supports_python_ver=`$PYTHON -c "import sys; \ - ver = sys.version.split ()[[0]]; \ - print (ver >= '2.1.0')"` -- if test "$ac_supports_python_ver" != "True"; then -+ if test "$ac_supports_python_ver" != "True"; then - if test -z "$PYTHON_NOVERSIONCHECK"; then - AC_MSG_RESULT([no]) -- AC_MSG_FAILURE([ -+ AC_MSG_WARN([ - This version of the AC@&t@_PYTHON_DEVEL macro - doesn't work properly with versions of Python before - 2.1.0. You may need to re-run configure, setting the --variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG, -+variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG, - PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. - Moreover, to disable this check, set PYTHON_NOVERSIONCHECK - to something else than an empty string. - ]) -+ if ! $ax_python_devel_optional; then -+ AC_MSG_FAILURE([Giving up]) -+ fi -+ ax_python_devel_found=no -+ PYTHON_VERSION="" - else - AC_MSG_RESULT([skip at user request]) - fi -- else -+ else - AC_MSG_RESULT([yes]) -+ fi - fi - -- # -- # if the macro parameter ``version'' is set, honour it -- # -- if test -n "$1"; then -+ if test $ax_python_devel_found = yes; then -+ # -+ # If the macro parameter ``version'' is set, honour it. -+ # A Python shim class, VPy, is used to implement correct version comparisons via -+ # string expressions, since e.g. a naive textual ">= 2.7.3" won't work for -+ # Python 2.7.10 (the ".1" being evaluated as less than ".3"). -+ # -+ if test -n "$1"; then - AC_MSG_CHECKING([for a version of Python $1]) -- ac_supports_python_ver=`$PYTHON -c "import sys; \ -- ver = sys.version.split ()[[0]]; \ -+ cat << EOF > ax_python_devel_vpy.py -+class VPy: -+ def vtup(self, s): -+ return tuple(map(int, s.strip().replace("rc", ".").split("."))) -+ def __init__(self): -+ import sys -+ self.vpy = tuple(sys.version_info)[[:3]] -+ def __eq__(self, s): -+ return self.vpy == self.vtup(s) -+ def __ne__(self, s): -+ return self.vpy != self.vtup(s) -+ def __lt__(self, s): -+ return self.vpy < self.vtup(s) -+ def __gt__(self, s): -+ return self.vpy > self.vtup(s) -+ def __le__(self, s): -+ return self.vpy <= self.vtup(s) -+ def __ge__(self, s): -+ return self.vpy >= self.vtup(s) -+EOF -+ ac_supports_python_ver=`$PYTHON -c "import ax_python_devel_vpy; \ -+ ver = ax_python_devel_vpy.VPy(); \ - print (ver $1)"` -+ rm -rf ax_python_devel_vpy*.py* __pycache__/ax_python_devel_vpy*.py* - if test "$ac_supports_python_ver" = "True"; then -- AC_MSG_RESULT([yes]) -+ AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) -- AC_MSG_ERROR([this package requires Python $1. -+ AC_MSG_WARN([this package requires Python $1. - If you have it installed, but it isn't the default Python - interpreter in your system path, please pass the PYTHON_VERSION - variable to configure. See ``configure --help'' for reference. - ]) -+ if ! $ax_python_devel_optional; then -+ AC_MSG_ERROR([Giving up]) -+ fi -+ ax_python_devel_found=no - PYTHON_VERSION="" - fi -+ fi - fi - -- # -- # Check if you have distutils, else fail -- # -- AC_MSG_CHECKING([for the distutils Python package]) -- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` -- if test -z "$ac_distutils_result"; then -+ if test $ax_python_devel_found = yes; then -+ # -+ # Check if you have distutils, else fail -+ # -+ AC_MSG_CHECKING([for the sysconfig Python package]) -+ ac_sysconfig_result=`$PYTHON -c "import sysconfig" 2>&1` -+ if test $? -eq 0; then - AC_MSG_RESULT([yes]) -- else -+ IMPORT_SYSCONFIG="import sysconfig" -+ else - AC_MSG_RESULT([no]) -- AC_MSG_ERROR([cannot import Python module "distutils". -+ -+ AC_MSG_CHECKING([for the distutils Python package]) -+ ac_sysconfig_result=`$PYTHON -c "from distutils import sysconfig" 2>&1` -+ if test $? -eq 0; then -+ AC_MSG_RESULT([yes]) -+ IMPORT_SYSCONFIG="from distutils import sysconfig" -+ else -+ AC_MSG_WARN([cannot import Python module "distutils". - Please check your Python installation. The error was: --$ac_distutils_result]) -- PYTHON_VERSION="" -+$ac_sysconfig_result]) -+ if ! $ax_python_devel_optional; then -+ AC_MSG_ERROR([Giving up]) -+ fi -+ ax_python_devel_found=no -+ PYTHON_VERSION="" -+ fi -+ fi - fi - -- # -- # Check for Python include path -- # -- AC_MSG_CHECKING([for Python include path]) -- if test -z "$PYTHON_CPPFLAGS"; then -- python_path=`$PYTHON -c "import distutils.sysconfig; \ -- print (distutils.sysconfig.get_python_inc ());"` -- plat_python_path=`$PYTHON -c "import distutils.sysconfig; \ -- print (distutils.sysconfig.get_python_inc (plat_specific=1));"` -+ if test $ax_python_devel_found = yes; then -+ # -+ # Check for Python include path -+ # -+ AC_MSG_CHECKING([for Python include path]) -+ if test -z "$PYTHON_CPPFLAGS"; then -+ if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then -+ # sysconfig module has different functions -+ python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ -+ print (sysconfig.get_path ('include'));"` -+ plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ -+ print (sysconfig.get_path ('platinclude'));"` -+ else -+ # old distutils way -+ python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ -+ print (sysconfig.get_python_inc ());"` -+ plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ -+ print (sysconfig.get_python_inc (plat_specific=1));"` -+ fi - if test -n "${python_path}"; then - if test "${plat_python_path}" != "${python_path}"; then - python_path="-I$python_path -I$plat_python_path" -@@ -164,22 +243,22 @@ - fi - fi - PYTHON_CPPFLAGS=$python_path -- fi -- AC_MSG_RESULT([$PYTHON_CPPFLAGS]) -- AC_SUBST([PYTHON_CPPFLAGS]) -+ fi -+ AC_MSG_RESULT([$PYTHON_CPPFLAGS]) -+ AC_SUBST([PYTHON_CPPFLAGS]) - -- # -- # Check for Python library path -- # -- AC_MSG_CHECKING([for Python library path]) -- if test -z "$PYTHON_LDFLAGS"; then -+ # -+ # Check for Python library path -+ # -+ AC_MSG_CHECKING([for Python library path]) -+ if test -z "$PYTHON_LIBS"; then - # (makes two attempts to ensure we've got a version number - # from the interpreter) - ac_python_version=`cat<]], - [[Py_Initialize();]]) - ],[pythonexists=yes],[pythonexists=no]) -- AC_LANG_POP([C]) -- # turn back to default flags -- CPPFLAGS="$ac_save_CPPFLAGS" -- LIBS="$ac_save_LIBS" -+ AC_LANG_POP([C]) -+ # turn back to default flags -+ CPPFLAGS="$ac_save_CPPFLAGS" -+ LIBS="$ac_save_LIBS" -+ LDFLAGS="$ac_save_LDFLAGS" - -- AC_MSG_RESULT([$pythonexists]) -+ AC_MSG_RESULT([$pythonexists]) - -- if test ! "x$pythonexists" = "xyes"; then -- AC_MSG_WARN([ -+ if test ! "x$pythonexists" = "xyes"; then -+ AC_MSG_WARN([ - Could not link test program to Python. Maybe the main Python library has been - installed in some non-standard library path. If so, pass it to configure, -- via the LDFLAGS environment variable. -- Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib" -+ via the LIBS environment variable. -+ Example: ./configure LIBS="-L/usr/non-standard-path/python/lib" - ============================================================================ -+ ERROR! - You probably have to install the development version of the Python package - for your distribution. The exact name of this package varies among them. - ============================================================================ -- ]) -- PYTHON_VERSION="" -+ ]) -+ if ! $ax_python_devel_optional; then -+ AC_MSG_ERROR([Giving up]) -+ fi -+ ax_python_devel_found=no -+ PYTHON_VERSION="" -+ fi - fi - - # - # all done! - # --]) -+]) -\ No newline at end of file -diff --git a/m4/python.m4 b/m4/python.m4 ---- a/m4/python.m4 -+++ b/m4/python.m4 -@@ -41,7 +41,7 @@ - m4_define_default([_AM_PYTHON_INTERPRETER_LIST], - [python2 python2.7 dnl - python dnl -- python3 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 -+ python3 python3.12 python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 - ]) - - AC_ARG_VAR([PYTHON], [the Python interpreter]) - diff --git a/pkgs/development/python-modules/gpgme/default.nix b/pkgs/development/python-modules/gpgme/default.nix new file mode 100644 index 0000000000000..18604bf1d5351 --- /dev/null +++ b/pkgs/development/python-modules/gpgme/default.nix @@ -0,0 +1,51 @@ +{ + buildPythonPackage, + gpgme, + lib, + setuptools, + swig, +}: + +buildPythonPackage { + pname = "gpgme"; + inherit (gpgme) version src; + pyproject = true; + + patches = gpgme.patches or [ ] ++ [ + ./python313-support.patch + ]; + + postPatch = '' + substituteInPlace lang/python/setup.py.in \ + --replace-fail "gpgme_h = '''" "gpgme_h = '${lib.getDev gpgme}/include/gpgme.h'" + ''; + + configureFlags = gpgme.configureFlags ++ [ + "--enable-languages=python" + ]; + + postConfigure = " + cd lang/python + "; + + preBuild = '' + make copystamp + ''; + + build-system = [ setuptools ]; + + nativeBuildInputs = [ + swig + ]; + + buildInputs = [ + gpgme + ]; + + pythonImportsCheck = [ "gpg" ]; + + meta = gpgme.meta // { + description = "Python bindings to the GPGME API of the GnuPG cryptography library"; + homepage = "https://dev.gnupg.org/source/gpgme/browse/master/lang/python/"; + }; +} diff --git a/pkgs/development/python-modules/gpgme/python313-support.patch b/pkgs/development/python-modules/gpgme/python313-support.patch new file mode 100644 index 0000000000000..d314ad329d19c --- /dev/null +++ b/pkgs/development/python-modules/gpgme/python313-support.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 7eef3523..b8e7d274 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -614,7 +614,7 @@ if test "$found_py" = "1"; then + if test "$found_py" = "1" -o "$found_py3" = "1"; then + # Reset everything, so that we can look for another Python. + m4_foreach([mym4pythonver], +- [[2.7],[3.6],[3.8],[3.9],[3.10],[3.11],[3.12],[all]], ++ [[2.7],[3.6],[3.8],[3.9],[3.10],[3.11],[3.12],[3.13],[all]], + [unset PYTHON + unset PYTHON_VERSION + unset PYTHON_CPPFLAGS diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2b1ee8937623f..a239033bf849d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5417,10 +5417,9 @@ self: super: with self; { gplaycli = callPackage ../development/python-modules/gplaycli { }; - gpgme = toPythonModule (pkgs.gpgme.override { - pythonSupport = true; - python3 = python; - }); + gpgme = callPackage ../development/python-modules/gpgme { + inherit (pkgs) gpgme; + }; gphoto2 = callPackage ../development/python-modules/gphoto2 { };