Author: urkud
Date: Sat Mar 17 16:46:12 2012
New Revision: 33203
URL: https://nixos.org/websvn/nix/?rev=33203&sc=1

Log:
Move last piece o gnome3 to top-level

Since there is no common release schedule, I'd prefer to avoid gnome3 set at
all.

Added:
   nixpkgs/branches/glib-2.30-take2/pkgs/data/documentation/gnome-user-docs/
   
nixpkgs/branches/glib-2.30-take2/pkgs/data/documentation/gnome-user-docs/default.nix
      - copied, changed from r33202, 
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-3/platform/gnome-user-docs.nix
Deleted:
   nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-3/
Modified:
   nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix

Copied and modified: 
nixpkgs/branches/glib-2.30-take2/pkgs/data/documentation/gnome-user-docs/default.nix
 (from r33202, 
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-3/platform/gnome-user-docs.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:46:06 2012        (r33202)
+++ nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix    Sat Mar 
17 16:46:12 2012        (r33203)
@@ -6135,6 +6135,8 @@
 
   gentium = callPackage ../data/fonts/gentium {};
 
+  gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { };
+
   gsettings_desktop_schemas = callPackage 
../data/misc/gsettings-desktop-schemas {};
 
   hicolor_icon_theme = callPackage ../data/misc/hicolor-icon-theme { };
@@ -7890,10 +7892,6 @@
     inherit (pkgs) libsoup;
   };
 
-  gnome3 = (import ../desktops/gnome-3 {
-    callPackage = pkgs.newScope pkgs.gnome3;
-  });
-
   gnome = recurseIntoAttrs gnome2;
 
   kde3 = recurseIntoAttrs {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to