Author: urkud
Date: Sat Mar 17 16:45:37 2012
New Revision: 33197
URL: https://nixos.org/websvn/nix/?rev=33197&sc=1
Log:
Move libsoup to development/libraries
It is used in many packages outside of gnome2 set.
Added:
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/libsoup/
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/libsoup/default.nix
- copied, changed from r33190,
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/desktop/libsoup/default.nix
Deleted:
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/desktop/libsoup/
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-3/platform/libsoup.nix
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-3/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix
Modified: nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/default.nix
==============================================================================
--- nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/default.nix Sat Mar
17 16:36:36 2012 (r33196)
+++ nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/default.nix Sat Mar
17 16:45:37 2012 (r33197)
@@ -73,8 +73,6 @@
gnome_keyring = callPackage ./desktop/gnome-keyring { };
- libsoup = callPackage ./desktop/libsoup { };
-
libwnck = callPackage ./desktop/libwnck { };
libgweather = callPackage ./desktop/libgweather { };
Modified: nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-3/default.nix
==============================================================================
--- nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-3/default.nix Sat Mar
17 16:36:36 2012 (r33196)
+++ nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-3/default.nix Sat Mar
17 16:45:37 2012 (r33197)
@@ -12,8 +12,6 @@
libgnome_keyring = callPackage ./platform/libgnome-keyring.nix { };
- libsoup = callPackage ./platform/libsoup.nix { };
-
GConf = callPackage ./platform/GConf.nix { };
gnome_user_docs = callPackage ./platform/gnome-user-docs.nix { };
Copied and modified:
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/libsoup/default.nix
(from r33190,
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/desktop/libsoup/default.nix)
==============================================================================
Modified: nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix Sat Mar
17 16:36:36 2012 (r33196)
+++ nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix Sat Mar
17 16:45:37 2012 (r33197)
@@ -4171,6 +4171,8 @@
libsndfile = callPackage ../development/libraries/libsndfile { };
+ libsoup = callPackage ../development/libraries/libsoup { };
+
libssh = callPackage ../development/libraries/libssh { };
libssh2 = callPackage ../development/libraries/libssh2 { };
@@ -7877,10 +7879,13 @@
# import ../desktops/e17 { inherit callPackage pkgs; }
# );
- gnome2 = (callPackage ../desktops/gnome-2 {
+ gnome2 = callPackage ../desktops/gnome-2 {
callPackage = pkgs.newScope pkgs.gnome2;
self = pkgs.gnome2;
- } // pkgs.gtkLibs);
+ } // pkgs.gtkLibs // {
+ # Backwards compatibility;
+ inherit (pkgs) libsoup;
+ };
gnome3 = (import ../desktops/gnome-3 {
callPackage = pkgs.newScope pkgs.gnome3;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
