Author: eelco
Date: Tue Jul 5 15:14:44 2011
New Revision: 27613
URL: https://svn.nixos.org/websvn/nix/?rev=27613&sc=1
Log:
* Use libsoup 2.33 everywhere.
Replaced:
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libsoup/default.nix
- copied unchanged from r27608,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libsoup/2.33.nix
Deleted:
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.gnutls.patch
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libsoup/2.33.nix
Modified:
nixpkgs/trunk/pkgs/desktops/gnome-2.28/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 Tue Jul 5 14:52:15
2011 (r27612)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix Tue Jul 5 15:14:44
2011 (r27613)
@@ -188,13 +188,6 @@
};
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;
Copied: nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libsoup/default.nix
(from r27608, nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libsoup/2.33.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libsoup/default.nix Tue Jul
5 15:14:44 2011 (r27613, copy of r27608,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libsoup/2.33.nix)
@@ -0,0 +1,12 @@
+{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 ];
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jul 5 14:52:15
2011 (r27612)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jul 5 15:14:44
2011 (r27613)
@@ -4351,46 +4351,32 @@
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 @@
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 {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
