Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gpgme: 1.23.2 -> 1.24.0 #354635

Merged
merged 2 commits into from
Nov 23, 2024
Merged

gpgme: 1.23.2 -> 1.24.0 #354635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3797b6
gpgme: 1.23.2 -> 1.24.0
dotlambda Nov 8, 2024
29c88a0
python312Packages.gpgme: build out of tree
dotlambda Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 8 additions & 35 deletions pkgs/development/libraries/gpgme/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,9 @@
pth,
libassuan,
which,
ncurses,
texinfo,
buildPackages,
qtbase ? null,
pythonSupport ? false,
swig ? null,
# only for passthru.tests
libsForQt5,
qt6Packages,
Expand All @@ -24,7 +21,7 @@

stdenv.mkDerivation rec {
pname = "gpgme";
version = "1.23.2";
version = "1.24.0";
pyproject = true;

outputs = [
Expand All @@ -37,46 +34,23 @@ 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
# Support Python 3.13
./python313-support.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)
# https://dev.gnupg.org/D600
./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
Expand All @@ -97,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
Expand Down
Loading