pyrox.dev
Merge #306637: gnutls: 3.8.4 -> 3.8.5
...into staging
+9
-8
pkgs/development/libraries/gnutls/default.nix
+9
-8
pkgs/development/libraries/gnutls/default.nix
···
44
, rsyslog
45
, openconnect
46
, samba
47
}:
48
49
let
···
58
59
stdenv.mkDerivation rec {
60
pname = "gnutls";
61
-
version = "3.8.4";
62
63
src = fetchurl {
64
url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz";
65
-
hash = "sha256-K+pOFUeU8/ABgPoqXFH+iwBax6Mc1YvUTN+n8268Ops=";
66
};
67
68
outputs = [ "bin" "dev" "out" ]
···
97
sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh
98
'' + lib.optionalString stdenv.hostPlatform.isMusl '' # See https://gitlab.com/gnutls/gnutls/-/issues/945
99
sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool.sh
100
-
'' + lib.optionalString stdenv.hostPlatform.isStatic ''
101
-
# Adapted from https://gitlab.com/gnutls/gnutls/-/commit/d214cd4570fb1559a20e941bb7ceac7df52e96d3
102
-
# Can be removed with 3.8.5+.
103
-
sed -i lib/nettle/backport/rsa-sign-tr.c -e \
104
-
'/^#include <nettle\/rsa\.h>/i\
105
-
#define nettle_rsa_compute_root_tr _gnutls_nettle_backport_rsa_compute_root_tr'
106
'';
107
108
preConfigure = "patchShebangs .";
···
152
substituteInPlace "$out/lib/libgnutls.la" \
153
--replace "-lunistring" ""
154
'';
155
156
passthru.tests = {
157
inherit ngtcp2-gnutls curlWithGnuTls ffmpeg emacs qemu knot-resolver samba openconnect;
···
44
, rsyslog
45
, openconnect
46
, samba
47
+
48
+
, gitUpdater
49
}:
50
51
let
···
60
61
stdenv.mkDerivation rec {
62
pname = "gnutls";
63
+
version = "3.8.5";
64
65
src = fetchurl {
66
url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz";
67
+
hash = "sha256-ZiaaLP4OHC2r7Ie9u9irZW85bt2aQN0AaXjgA8+lK/w=";
68
};
69
70
outputs = [ "bin" "dev" "out" ]
···
99
sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh
100
'' + lib.optionalString stdenv.hostPlatform.isMusl '' # See https://gitlab.com/gnutls/gnutls/-/issues/945
101
sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool.sh
102
'';
103
104
preConfigure = "patchShebangs .";
···
148
substituteInPlace "$out/lib/libgnutls.la" \
149
--replace "-lunistring" ""
150
'';
151
+
152
+
153
+
passthru.updateScript = gitUpdater {
154
+
url = "https://gitlab.com/gnutls/gnutls.git";
155
+
};
156
157
passthru.tests = {
158
inherit ngtcp2-gnutls curlWithGnuTls ffmpeg emacs qemu knot-resolver samba openconnect;