From a246126b01d0a23d4f1fa5bc57255bae75b033b1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 19 Nov 2023 12:23:40 +0000 Subject: [PATCH] gnutls: 3.8.1 -> 3.8.2 Changes: https://lists.gnupg.org/pipermail/gnutls-help/2023-November/004837.html (cherry picked from commit 2707f6791a51fa4e20fa1ae7a8202d884b8d2369) --- pkgs/development/libraries/gnutls/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 5f4a295e3b09..bbbdf19a1909 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,6 +1,6 @@ { config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkg-config, lzip , perl, gmp, autoconf, automake, libidn2, libiconv -, fetchpatch, texinfo +, texinfo , unbound, dns-root-data, gettext, util-linux , cxxBindings ? !stdenv.hostPlatform.isStatic # tries to link libstdc++.so , tpmSupport ? false, trousers, which, nettools, libunistring @@ -35,11 +35,11 @@ in stdenv.mkDerivation rec { pname = "gnutls"; - version = "3.8.1"; + version = "3.8.2"; src = fetchurl { url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz"; - hash = "sha256-uoueFa4gq6iPRGYZePW1hjSUMW/n5yLt6dBp/mKUgpw="; + hash = "sha256-52XlAW/6m53SQ+NjoEYNV3B0RE7iSRJn2y6WycKt73c="; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -48,12 +48,6 @@ stdenv.mkDerivation rec { outputDoc = "devdoc"; patches = [ - (fetchpatch { #TODO: when updating drop this patch and texinfo - name = "GNUTLS_NO_EXTENSIONS.patch"; - url = "https://gitlab.com/gnutls/gnutls/-/commit/abfa8634db940115a11a07596ce53c8f9c4f87d2.diff"; - hash = "sha256-3M5WdNoVx9gUwTUPgu/sXmsaNg+j5d6liXs0UZz8fGU="; - }) - ./nix-ssl-cert-file.patch ];