nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

gnutls: 3.5.15 -> 3.6.1

Browse Source 
No breaking changes expected, as the ABI is still 3.4.0.
This commit is contained in:
Vladimír Čunát 2017-11-27 12:42:11 +01:00
parent 40a2973f14
commit 529c5c50b1
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/gnutls/3.5.nix → pkgs/development/libraries/gnutls/3.6.nix
View File

@ -1,11 +1,11 @@
{ callPackage, fetchurl, ... } @ args: { callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "3.5.15"; version = "3.6.1";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz"; 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: # Skip two tests introduced in 3.5.11. Probable reasons of failure:

6
pkgs/top-level/all-packages.nix
View File

@ -8535,14 +8535,12 @@ with pkgs;
gnu-efi = callPackage ../development/libraries/gnu-efi { }; gnu-efi = callPackage ../development/libraries/gnu-efi { };
gnutls = gnutls35; gnutls = callPackage
gnutls35 = callPackage
(if stdenv.isDarwin (if stdenv.isDarwin
# Avoid > 3.5.10 due to frameworks for now; see discussion on: # Avoid > 3.5.10 due to frameworks for now; see discussion on:
# https://github.com/NixOS/nixpkgs/commit/d6454e6a1 # https://github.com/NixOS/nixpkgs/commit/d6454e6a1
then ../development/libraries/gnutls/3.5.10.nix 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; guileBindings = config.gnutls.guile or false;
}; };