From 2ae4371163944fc89343ea5ced8c31c0e1f0b923 Mon Sep 17 00:00:00 2001 From: Christian Ulrich Date: Sun, 14 Mar 2021 03:13:50 +0100 Subject: [PATCH] gnutls: bump to 3.7.1 --- pkgs/gnutls/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/gnutls/default.nix b/pkgs/gnutls/default.nix index 37448d1..d0e294a 100644 --- a/pkgs/gnutls/default.nix +++ b/pkgs/gnutls/default.nix @@ -8,7 +8,7 @@ assert guileBindings -> guile != null; let - version = "3.7.0"; + version = "3.7.1"; # XXX: Gnulib's `test-select' fails on FreeBSD: # https://hydra.nixos.org/build/2962084/nixlog/1/raw . @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnupg/gnutls/v3.7/gnutls-${version}.tar.xz"; - sha256 = "1y0xi8cabh7i0lgka658qmdhjngkm29v4acq9brcjlnjj4ka5qj9"; + sha256 = "0vxcbig87sdc73h58pmcpbi4al1zgcxid1jn67mhcpna7sbdfxrp"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -46,13 +46,13 @@ stdenv.mkDerivation { # - psk-file: no idea; it broke between 3.6.3 and 3.6.4 # Change p11-kit test to use pkg-config to find p11-kit postPatch = lib.optionalString (lib.versionAtLeast version "3.4") '' - sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' -i tests/cert-tests/name-constraints + sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' -i tests/cert-tests/name-constraints.sh '' + lib.optionalString (lib.versionAtLeast version "3.6") '' sed '2iexit 77' -i tests/{pkgconfig,fastopen}.sh sed '/^void doit(void)/,/^{/ s/{/{ exit(77);/' -i tests/{trust-store,psk-file}.c 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 '' + lib.optionalString stdenv.hostPlatform.isMusl '' # See https://gitlab.com/gnutls/gnutls/-/issues/945 - sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool + sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool.sh ''; preConfigure = "patchShebangs .";