JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnutls: use 3.5.10 on Darwin for now

Browse Source 
This contains a revert of d6454e6a1.
This commit is contained in:
Vladimír Čunát 2017-04-13 09:27:08 +02:00
parent eb750f9a7b
commit 42fd72091e
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/gnutls/3.5.10.nix Normal file
View File

@ -0,0 +1,10 @@
{ callPackage, fetchurl, libunistring, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "3.5.10";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
sha256 = "17apwvdkkazh5w8z8mbanpj2yj8s2002qwy46wz4v3akpa33wi5g";
};
})

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

@ -1,4 +1,4 @@
{ callPackage, stdenv, fetchurl, libunistring, darwin, ... } @ args:
{ callPackage, fetchurl, libunistring, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "3.5.11";
@ -15,6 +15,4 @@ callPackage ./generic.nix (args // rec {
sed '2iexit 77' -i tests/pkgconfig.sh
sed '/^void doit(void)/,$s/{/{ exit(77);/; t' -i tests/trust-store.c
'';
buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.Security;
})

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

@ -7735,9 +7735,15 @@ with pkgs;
gnutls = gnutls35;
gnutls35 = callPackage ../development/libraries/gnutls/3.5.nix {
guileBindings = config.gnutls.guile or false;
};
gnutls35 = 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)
{
guileBindings = config.gnutls.guile or false;
};
gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix {
guileBindings = config.gnutls.guile or false;