mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 07:53:19 +00:00
gnutls: 3.5.15 -> 3.6.1
No breaking changes expected, as the ABI is still 3.4.0.
This commit is contained in:
parent
40a2973f14
commit
529c5c50b1
@ -1,11 +1,11 @@
|
||||
{ callPackage, fetchurl, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "3.5.15";
|
||||
version = "3.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
|
||||
sha256 = "1mgsxkbs44csw07ngwbqns2y2s03m975lk1sl5ay87wbic882q04";
|
||||
sha256 = "1vdsir53ddxyapnxh5fpnfyij3scx3818iri4hl07g4lk4n0vc90";
|
||||
};
|
||||
|
||||
# Skip two tests introduced in 3.5.11. Probable reasons of failure:
|
@ -8535,14 +8535,12 @@ with pkgs;
|
||||
|
||||
gnu-efi = callPackage ../development/libraries/gnu-efi { };
|
||||
|
||||
gnutls = gnutls35;
|
||||
|
||||
gnutls35 = callPackage
|
||||
gnutls = callPackage
|
||||
(if stdenv.isDarwin
|
||||
# Avoid > 3.5.10 due to frameworks for now; see discussion on:
|
||||
# https://github.com/NixOS/nixpkgs/commit/d6454e6a1
|
||||
then ../development/libraries/gnutls/3.5.10.nix
|
||||
else ../development/libraries/gnutls/3.5.nix)
|
||||
else ../development/libraries/gnutls/3.6.nix)
|
||||
{
|
||||
guileBindings = config.gnutls.guile or false;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user