mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity

GnuTLS 2.8.3.

Browse source 
svn path=/nixpkgs/trunk/; revision=16739
This commit is contained in:
Ludovic Courtès 2009-08-16 22:59:15 +00:00
parent 8bfccbbcdf
commit ba4ae2ad37
2 changed files with 6 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/libraries/gnutls/default.nix
View file

@ -5,17 +5,16 @@ assert guileBindings -> guile != null;
stdenv.mkDerivation rec {
name = "gnutls-2.6.6";
name = "gnutls-2.8.3";
src = fetchurl {
url = "mirror://gnu/gnutls/${name}.tar.bz2";
sha256 = "17nwmf7hfcjpwi1hmnkjjrygwn1wjripdf391is8ay6aa65mpn03";
sha256 = "163rgpd12w869faki6wkk6lya2pyw7976plr9yxih9nzy3b4k3zh";
};
patches = [ ./tmpdir.patch ];
configurePhase = ''
./configure --prefix="$out" \
./configure --prefix="$out" \
--disable-dependency-tracking --enable-fast-install \
${if guileBindings
then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""
else ""}
@ -47,5 +46,7 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/gnutls/;
license = "LGPLv2.1+";
maintainers = [ stdenv.lib.maintainers.ludo ];
};
}

42
pkgs/development/libraries/gnutls/tmpdir.patch
View file

@ -1,42 +0,0 @@
We disable these tests because OpenCDK's `cdk_stream_tmp_from_mem ()'
stupidly uses `tempfile ()', which does not honor $TMPDIR, leading to
build failures in chroots. See also:
http://thread.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/2693
--- gnutls-2.6.1/tests/Makefile.in 2008-11-10 10:37:52.000000000 +0100
+++ gnutls-2.6.1/tests/Makefile.in 2008-11-10 19:31:52.000000000 +0100
@@ -58,7 +58,7 @@ host_triplet = @host@
@HAVE_FORK_TRUE@am__append_4 = x509self x509signself x509dn anonself pskself dhepskself \
@HAVE_FORK_TRUE@ tlsia resume netconf-psk setcredcrash
-@ENABLE_OPENPGP_TRUE@@HAVE_FORK_TRUE@am__append_5 = openpgpself
+@ENABLE_OPENPGP_TRUE@@HAVE_FORK_TRUE@am__append_5 =
@ENABLE_OPRFI_TRUE@am__append_6 = oprfi
check_PROGRAMS = $(am__EXEEXT_5)
TESTS = $(am__EXEEXT_5)
--- gnutls-2.6.1/tests/openpgp/Makefile.in 2008-11-10 10:37:52.000000000 +0100
+++ gnutls-2.6.1/tests/openpgp/Makefile.in 2008-11-10 19:32:26.000000000 +0100
@@ -51,7 +51,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-@ENABLE_OPENPGP_TRUE@TESTS = keyring$(EXEEXT)
+@ENABLE_OPENPGP_TRUE@TESTS =
@ENABLE_OPENPGP_TRUE@check_PROGRAMS = keyring$(EXEEXT)
subdir = tests/openpgp
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
--- gnutls-2.6.1/guile/tests/Makefile.in 2008-11-10 10:37:50.000000000 +0100
+++ gnutls-2.6.1/guile/tests/Makefile.in 2008-11-10 19:32:50.000000000 +0100
@@ -48,7 +48,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-@ENABLE_OPENPGP_TRUE@am__append_1 = openpgp-keys.scm openpgp-keyring.scm openpgp-auth.scm
+@ENABLE_OPENPGP_TRUE@am__append_1 =
@ENABLE_SRP_TRUE@am__append_2 = srp-base64.scm
subdir = guile/tests
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in