Author: raskin Date: Sat Aug 27 17:04:25 2011 New Revision: 28853 URL: https://svn.nixos.org/websvn/nix/?rev=28853&sc=1
Log: Re-add GNU TLS 2.12 - it does fix glib-networking Added: nixpkgs/trunk/pkgs/development/libraries/gnutls/2.12.nix - copied, changed from r27583, nixpkgs/trunk/pkgs/development/libraries/gnutls/default.nix Modified: nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix nixpkgs/trunk/pkgs/top-level/all-packages.nix Modified: nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix Sat Aug 27 16:59:32 2011 (r28852) +++ nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix Sat Aug 27 17:04:25 2011 (r28853) @@ -143,7 +143,7 @@ }; 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; }; Modified: nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix Sat Aug 27 16:59:32 2011 (r28852) +++ nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix Sat Aug 27 17:04:25 2011 (r28853) @@ -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 @@ ''; buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ glib libtool intltool gnutls libproxy libgcrypt + propagatedBuildInputs = [ glib libtool intltool gnutls2 libproxy libgcrypt libtasn1]; } Copied and modified: nixpkgs/trunk/pkgs/development/libraries/gnutls/2.12.nix (from r27583, nixpkgs/trunk/pkgs/development/libraries/gnutls/default.nix) ============================================================================== --- nixpkgs/trunk/pkgs/development/libraries/gnutls/default.nix Mon Jul 4 11:52:13 2011 (r27583, copy source) +++ nixpkgs/trunk/pkgs/development/libraries/gnutls/2.12.nix Sat Aug 27 17:04:25 2011 (r28853) @@ -1,27 +1,28 @@ { fetchurl, stdenv, zlib, lzo, libtasn1, nettle -, guileBindings, guile }: +, guileBindings, guile, pkgconfig }: assert guileBindings -> guile != null; stdenv.mkDerivation rec { - name = "gnutls-2.12.7"; + name = "gnutls-2.12.9"; src = fetchurl { url = "mirror://gnu/gnutls/${name}.tar.bz2"; - sha256 = "09vmm1b2iypwk5vh0adyqzra7sgx5hb9xyr1wjncv7947bk4zn3p"; + 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 ] + buildInputs = [ zlib lzo libtasn1 pkgconfig ] ++ stdenv.lib.optional guileBindings guile; propagatedBuildInputs = [ nettle ]; Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix ============================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Aug 27 16:59:32 2011 (r28852) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Aug 27 17:04:25 2011 (r28853) @@ -3438,6 +3438,10 @@ 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 { }; _______________________________________________ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits