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

* Use libsoup 2.33 everywhere.

Browse Source 
svn path=/nixpkgs/trunk/; revision=27613
This commit is contained in:
Eelco Dolstra 2011-07-05 15:14:44 +00:00
parent b5b7cbb9ea
commit 7737d33233
5 changed files with 24 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/desktops/gnome-2.28/default.nix
View File

@ -188,13 +188,6 @@ pkgs.makeOverridable
};
libsoup = import ./desktop/libsoup {
inherit (pkgs) stdenv fetchurl pkgconfig libxml2 gnutls libproxy sqlite
curl libgcrypt;
inherit (pkgs.gtkLibs) glib;
inherit GConf gnome_keyring;
};
libsoup_2_33 = import ./desktop/libsoup/2.33.nix {
inherit (pkgs) stdenv fetchurl pkgconfig libxml2 gnutls libproxy sqlite curl;
inherit (pkgs.gtkLibs) glib;
inherit GConf gnome_keyring;

12
pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.gnutls.patch
View File

@ -1,12 +0,0 @@
diff --git a/libsoup/soup-gnutls.c b/libsoup/soup-gnutls.c
--- a/libsoup/soup-gnutls.c
+++ b/libsoup/soup-gnutls.c
@@ -477,7 +477,7 @@ soup_ssl_wrap_iochannel (GIOChannel *sock, gboolean non_blocking,
goto THROW_CREATE_ERROR;
/* See http://bugzilla.gnome.org/show_bug.cgi?id=581342 */
- if (gnutls_priority_set_direct (session, "NORMAL:!VERS-TLS1.1:!VERS-TLS1.0", NULL) != 0)
+ if (gnutls_priority_set_direct (session, "NORMAL:!VERS-TLS1.2:!VERS-TLS1.1:!VERS-TLS1.0", NULL) != 0)
goto THROW_CREATE_ERROR;
if (gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE,

12
pkgs/desktops/gnome-2.28/desktop/libsoup/2.33.nix
View File

@ -1,12 +0,0 @@
{stdenv, fetchurl, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl,
glib, GConf, gnome_keyring}:
stdenv.mkDerivation rec {
name = "libsoup-2.33.6";
src = fetchurl {
url = "mirror://gnome/sources/libsoup/2.33/${name}.tar.bz2";
sha256 = "988f7897fe125a77a5946b2fd6d47d7374fd94a1406e810482cfff6a52a6a923";
};
buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl
glib GConf gnome_keyring ];
}

14
pkgs/desktops/gnome-2.28/desktop/libsoup/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl
, glib, GConf, gnome_keyring, libgcrypt }:
{stdenv, fetchurl, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl,
glib, GConf, gnome_keyring}:
stdenv.mkDerivation {
name = "libsoup-2.28.2";
stdenv.mkDerivation rec {
name = "libsoup-2.33.6";
src = fetchurl {
url = mirror://gnome/sources/libsoup/2.28/libsoup-2.28.2.tar.bz2;
sha256 = "002kxjh6dwpps4iwly1bazxlzgqhkfszqqy26mp1gy2il3lzrlcx";
url = "mirror://gnome/sources/libsoup/2.33/${name}.tar.bz2";
sha256 = "988f7897fe125a77a5946b2fd6d47d7374fd94a1406e810482cfff6a52a6a923";
};
buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl
glib GConf gnome_keyring libgcrypt ];
glib GConf gnome_keyring ];
}

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

@ -4351,46 +4351,32 @@ let
vxl = callPackage ../development/libraries/vxl { };
webkit =
let p = applyGlobalOverrides (x : {
libsoup = x.gnome28.libsoup_2_33;
gnome28 = x.gnome28 // {
libsoup = x.gnome28.libsoup_2_33;
};
});
in
(p.builderDefsPackage ../development/libraries/webkit {
inherit (p.gnome28) gtkdoc;
inherit (p.gtkLibs) gtk atk pango glib;
inherit (p) freetype fontconfig gettext gperf curl
builderDefsPackage ../development/libraries/webkit {
inherit (gnome28) gtkdoc libsoup;
inherit (gtkLibs) gtk atk pango glib;
inherit freetype fontconfig gettext gperf curl
libjpeg libtiff libpng libxml2 libxslt sqlite
icu cairo perl intltool automake libtool
pkgconfig autoconf bison libproxy enchant
python ruby which flex geoclue libsoup;
inherit (p.gst_all) gstreamer gstPluginsBase gstFfmpeg
python ruby which flex geoclue;
inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg
gstPluginsGood;
inherit (p.xlibs) libXt renderproto libXrender;
});
inherit (xlibs) libXt renderproto libXrender;
};
webkitSVN =
let p = applyGlobalOverrides (x : {
libsoup = x.gnome28.libsoup_2_33;
gnome28 = x.gnome28 // {
libsoup = x.gnome28.libsoup_2_33;
};
});
in
(p.builderDefsPackage ../development/libraries/webkit/svn.nix {
inherit (p.gnome28) gtkdoc;
inherit (p.gtkLibs) gtk atk pango glib;
inherit (p) freetype fontconfig gettext gperf curl
builderDefsPackage ../development/libraries/webkit/svn.nix {
inherit (gnome28) gtkdoc libsoup;
inherit (gtkLibs) gtk atk pango glib;
inherit freetype fontconfig gettext gperf curl
libjpeg libtiff libpng libxml2 libxslt sqlite
icu cairo perl intltool automake libtool
pkgconfig autoconf bison libproxy enchant
python ruby which flex geoclue libsoup;
inherit (p.gst_all) gstreamer gstPluginsBase gstFfmpeg
python ruby which flex geoclue;
inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg
gstPluginsGood;
inherit (p.xlibs) libXt renderproto libXrender;
});
inherit (xlibs) libXt renderproto libXrender;
};
wvstreams = callPackage ../development/libraries/wvstreams { };
@ -7058,8 +7044,7 @@ let
inherit pkgconfig webkit makeWrapper;
inherit (gtkLibs) gtk glib;
inherit (xlibs) libX11 kbproto;
libsoup = gnome28.libsoup_2_33;
inherit (gnome28) glib_networking;
inherit (gnome28) glib_networking libsoup;
};
valknut = callPackage ../applications/networking/p2p/valknut {