diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index db458df1e644..36eb7b70be2b 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -143,7 +143,7 @@ pkgs.makeOverridable }; glib_networking = import ./platform/glib-networking { - inherit (pkgs) stdenv fetchurl pkgconfig glib libtool intltool gnutls + inherit (pkgs) stdenv fetchurl pkgconfig glib libtool intltool gnutls2 libproxy libgcrypt libtasn1; }; diff --git a/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix b/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix index 5b7f590b29ca..53ab1ba08406 100644 --- a/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls, libproxy +{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls2, libproxy , libgcrypt, libtasn1 }: @@ -19,6 +19,6 @@ stdenv.mkDerivation { ''; buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ glib libtool intltool gnutls libproxy libgcrypt + propagatedBuildInputs = [ glib libtool intltool gnutls2 libproxy libgcrypt libtasn1]; } diff --git a/pkgs/development/libraries/gnutls/2.12.nix b/pkgs/development/libraries/gnutls/2.12.nix new file mode 100644 index 000000000000..c79ca0894cd4 --- /dev/null +++ b/pkgs/development/libraries/gnutls/2.12.nix @@ -0,0 +1,54 @@ +{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle +, guileBindings, guile, pkgconfig }: + +assert guileBindings -> guile != null; + +stdenv.mkDerivation rec { + + name = "gnutls-2.12.9"; + + src = fetchurl { + url = "mirror://gnu/gnutls/${name}.tar.bz2"; + sha256 = "0ilfdyw6xr0w57aygmw1fvx56x2zh5la01y8bkx59crq927wk8bl"; + }; + + configurePhase = '' + ./configure --prefix="$out" \ + --disable-dependency-tracking --enable-fast-install \ + --with-lzo --with-libtasn1-prefix="${libtasn1}" \ + --without-p11-kit \ + ${if guileBindings + then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\"" + else ""} + ''; + + buildInputs = [ zlib lzo libtasn1 pkgconfig ] + ++ stdenv.lib.optional guileBindings guile; + + propagatedBuildInputs = [ nettle ]; + + doCheck = true; + + meta = { + description = "The GNU Transport Layer Security Library"; + + longDescription = '' + GnuTLS is a project that aims to develop a library which + provides a secure layer, over a reliable transport + layer. Currently the GnuTLS library implements the proposed + standards by the IETF's TLS working group. + + Quoting from the TLS protocol specification: + + "The TLS protocol provides communications privacy over the + Internet. The protocol allows client/server applications to + communicate in a way that is designed to prevent eavesdropping, + tampering, or message forgery." + ''; + + homepage = http://www.gnu.org/software/gnutls/; + license = "LGPLv2.1+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28f0388cd43c..374193b131bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3438,6 +3438,10 @@ let guileBindings = getConfig ["gnutls" "guile"] true; }; + gnutls2 = callPackage ../development/libraries/gnutls/2.12.nix { + guileBindings = getConfig ["gnutls" "guile"] true; + }; + gpgme = callPackage ../development/libraries/gpgme { }; grantlee = callPackage ../development/libraries/grantlee { };