diff options
| -rw-r--r-- | pkgs/development/libraries/gnutls/3.6.nix (renamed from pkgs/development/libraries/gnutls/3.5.nix) | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.6.nix index 55c917f212e9..2290bb5a37b7 100644 --- a/pkgs/development/libraries/gnutls/3.5.nix +++ b/pkgs/development/libraries/gnutls/3.6.nix @@ -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: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 59ac6093674f..92259a3d560e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; |