nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 02:13:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #324413: gnutls: 3.8.5 -> 3.8.6

Browse Source 
...into staging
This commit is contained in:
Vladimír Čunát 2024-07-13 12:16:55 +02:00
commit 6a257a46c6
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/gnutls/default.nix
View File

@ -60,11 +60,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnutls"; pname = "gnutls";
version = "3.8.5"; version = "3.8.6";
src = fetchurl { src = fetchurl {
url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz"; url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz";
hash = "sha256-ZiaaLP4OHC2r7Ie9u9irZW85bt2aQN0AaXjgA8+lK/w="; hash = "sha256-LhWIquU8sy1Dk38fTsoo/r2cDHqhc0/F3WGn6B4OvN0=";
}; };
outputs = [ "bin" "dev" "out" ] outputs = [ "bin" "dev" "out" ]
@ -85,16 +85,6 @@ stdenv.mkDerivation rec {
revert = true; revert = true;
hash = "sha256-r/+Gmwqy0Yc1LHL/PdPLXlErUBC5JxquLzCBAN3LuRM="; hash = "sha256-r/+Gmwqy0Yc1LHL/PdPLXlErUBC5JxquLzCBAN3LuRM=";
}) })
# Makes the system-wide configuration for RSAES-PKCS1-v1_5 actually apply
# and makes it enabled by default when the config file is missing
# Without this an error 113 is thrown when using some RSA certificates
# see https://gitlab.com/gnutls/gnutls/-/issues/1540
# "This is pretty sever[e], since it breaks on letsencrypt-issued RSA keys." (comment from above issue)
(fetchpatch2 {
name = "fix-rsaes-pkcs1-v1_5-system-wide-configuration.patch";
url = "https://gitlab.com/gnutls/gnutls/-/commit/2d73d945c4b1dfcf8d2328c4d23187d62ffaab2d.diff";
hash = "sha256-2aWcLff9jzJnY+XSqCIaK/zdwSLwkNlfDeMlWyRShN8=";
})
]; ];
# Skip some tests: # Skip some tests: