Author: urkud
Date: Sat Oct 8 16:58:32 2011
New Revision: 29721
URL: https://nixos.org/websvn/nix/?rev=29721&sc=1
Log:
gnome: use callPackage, move to gnome-2
gnome28 was a mix of packages from various releases, so do not mention 2.28 in
the attribute name.
Added:
nixpkgs/trunk/pkgs/desktops/gnome-2/
nixpkgs/trunk/pkgs/desktops/gnome-2/bindings/
nixpkgs/trunk/pkgs/desktops/gnome-2/bindings/libglademm/
nixpkgs/trunk/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/bindings/libglademm/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-control-center/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gnome-control-center/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-desktop/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gnome-desktop/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gnome-icon-theme/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-keyring/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-menus/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gnome-menus/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-panel/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gnome-panel/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-session/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gnome-session/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gnome-settings-daemon/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gtksourceview/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gtksourceview/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gvfs/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gvfs/builder.sh
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gvfs/builder.sh
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gvfs/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gvfs/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/libcroco/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/libcroco/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libcroco/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/libgnomekbd/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libgnomekbd/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/libgweather/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/libgweather/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/librsvg/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/librsvg/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/librsvg/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/libsoup/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/libsoup/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libsoup/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/libwnck/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/libwnck/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libwnck/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/metacity/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/metacity/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/metacity/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/nautilus/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/nautilus/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/nautilus/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/rarian/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/rarian/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/rarian/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/scrollkeeper/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/scrollkeeper/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/vte/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/vte/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/vte/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/zenity/
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/zenity/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/zenity/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/GConf/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/GConf/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/GConf/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/ORBit2/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/ORBit2/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/at-spi/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/at-spi/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/at-spi/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/audiofile/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/audiofile/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/audiofile/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/esound/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/esound/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/esound/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/glib-networking/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/glib-networking/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gnome-common/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gnome-common/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gnome-mime-data/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gnome-mime-data/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gnome-vfs/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gnome-vfs-monikers/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gtk-doc/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gtk-doc/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gtkglext/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gtkglext/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gtkhtml/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gtkhtml/01_remove-disable-deprecated.patch
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/intltool/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/intltool/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/intltool/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libIDL/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libIDL/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libIDL/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libart_lgpl/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libart_lgpl/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libbonobo/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libbonobo/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libbonoboui/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libbonoboui/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libglade/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libglade/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libglade/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnome/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnome/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomecanvas/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libgnomecanvas/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libgnomecanvasmm/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomecups/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomeprint/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomeprintui/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libgnomeprintui/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomeui/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libgnomeui/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgtkhtml/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libgtkhtml/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libunique/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libunique/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libunique/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/startup-notification/
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/startup-notification/default.nix
- copied, changed from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/startup-notification/default.nix
Deleted:
nixpkgs/trunk/pkgs/desktops/gnome-2.28/
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/bindings/libglademm/default.nix (from
r29720, nixpkgs/trunk/pkgs/desktops/gnome-2.28/bindings/libglademm/default.nix)
==============================================================================
Added: nixpkgs/trunk/pkgs/desktops/gnome-2/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2/default.nix Sat Oct 8 16:58:32
2011 (r29721)
@@ -0,0 +1,133 @@
+{ callPackage, self, stdenv, gettext, overrides ? {} }:
+{
+ __overrides = overrides;
+
+ # Backward compatibility.
+ gtkdoc = self.gtk_doc;
+ startupnotification = self.startup_notification;
+ gnomedocutils = self.gnome_doc_utils;
+ gnomeicontheme = self.gnome_icon_theme;
+ gnomepanel = self.gnome_panel;
+
+#### PLATFORM
+
+ audiofile = callPackage ./platform/audiofile { };
+
+ esound = callPackage ./platform/esound { };
+
+ libIDL = callPackage ./platform/libIDL {
+ gettext = if stdenv.isDarwin then gettext else null;
+ };
+
+ ORBit2 = callPackage ./platform/ORBit2 { };
+
+ libart_lgpl = callPackage ./platform/libart_lgpl { };
+
+ libglade = callPackage ./platform/libglade { };
+
+ libgnomeprint = callPackage ./platform/libgnomeprint { };
+
+ libgnomeprintui = callPackage ./platform/libgnomeprintui { };
+
+ libgnomecups = callPackage ./platform/libgnomecups { };
+
+ libgtkhtml = callPackage ./platform/libgtkhtml { };
+
+ intltool = callPackage ./platform/intltool { };
+
+ GConf = callPackage ./platform/GConf { };
+
+ libgnomecanvas = callPackage ./platform/libgnomecanvas { };
+
+ libgnomecanvasmm = callPackage ./platform/libgnomecanvasmm { };
+
+ # for git-head builds
+ gnome_common = callPackage platform/gnome-common { };
+
+ gnome_mime_data = callPackage ./platform/gnome-mime-data { };
+
+ gnome_vfs = callPackage ./platform/gnome-vfs { };
+
+ gnome_vfs_monikers = callPackage ./platform/gnome-vfs-monikers { };
+
+ libgnome = callPackage ./platform/libgnome { };
+
+ libgnomeui = callPackage ./platform/libgnomeui { };
+
+ libbonobo = callPackage ./platform/libbonobo { };
+
+ libbonoboui = callPackage ./platform/libbonoboui { };
+
+ at_spi = callPackage ./platform/at-spi { };
+
+ glib_networking = callPackage ./platform/glib-networking { };
+
+ gtk_doc = callPackage ./platform/gtk-doc { };
+
+ gtkhtml = callPackage ./platform/gtkhtml { };
+
+
+ # Freedesktop library
+ startup_notification = callPackage ./platform/startup-notification { };
+
+ # Required for nautilus
+ libunique = callPackage ./platform/libunique { };
+
+ gtkglext = callPackage ./platform/gtkglext { };
+
+#### DESKTOP
+
+ gnome_keyring = callPackage ./desktop/gnome-keyring { };
+
+ libsoup = callPackage ./desktop/libsoup { };
+
+ libwnck = callPackage ./desktop/libwnck { };
+
+ # Not part of GNOME desktop, but provides CSS support for librsvg
+ libcroco = callPackage ./desktop/libcroco { };
+
+ librsvg = callPackage ./desktop/librsvg { };
+
+ libgweather = callPackage ./desktop/libgweather { };
+
+ gvfs = callPackage ./desktop/gvfs { };
+
+ libgnomekbd = callPackage ./desktop/libgnomekbd { };
+
+ # Removed from recent GNOME releases, but still required
+ scrollkeeper = callPackage ./desktop/scrollkeeper { };
+
+ # scrollkeeper replacement
+ rarian = callPackage ./desktop/rarian { };
+
+ gnome_doc_utils = callPackage ./desktop/gnome-doc-utils { };
+
+ zenity = callPackage ./desktop/zenity { };
+
+ metacity = callPackage ./desktop/metacity { };
+
+ gnome_menus = callPackage ./desktop/gnome-menus { };
+
+ gnome_desktop = callPackage ./desktop/gnome-desktop { };
+
+ gnome_panel = callPackage ./desktop/gnome-panel { };
+
+ gnome_session = callPackage ./desktop/gnome-session { };
+
+ gnome_settings_daemon = callPackage ./desktop/gnome-settings-daemon { };
+
+ gnome_control_center = callPackage ./desktop/gnome-control-center { };
+
+ gtksourceview = callPackage ./desktop/gtksourceview { };
+
+ nautilus = callPackage ./desktop/nautilus { };
+
+ gnome_icon_theme = callPackage ./desktop/gnome-icon-theme { };
+
+ vte = callPackage ./desktop/vte { };
+
+#### BINDINGS
+
+ libglademm = callPackage ./bindings/libglademm { };
+
+}
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
(from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gnome-control-center/default.nix)
==============================================================================
---
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gnome-control-center/default.nix
Sat Oct 8 14:08:44 2011 (r29720, copy source)
+++
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
Sat Oct 8 16:58:32 2011 (r29721)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, libxklavier, hal,
cairo, popt, which, python
+{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2Python, libxslt, libxklavier,
hal, cairo, popt, which, python
, shared_mime_info, desktop_file_utils, libunique, libtool, bzip2
, glib, gtk, pango, atk, gnome_doc_utils, intltool, GConf, libglade, libgnome,
libgnomeui, libgnomekbd
, librsvg, gnome_menus, gnome_desktop, gnome_panel, metacity,
gnome_settings_daemon
@@ -10,7 +10,7 @@
url =
mirror://gnome/sources/gnome-control-center/2.28/gnome-control-center-2.28.0.tar.bz2;
sha256 = "0m0z7dn5qzl63cpc8ivagm4yfsfgigfawl5v3df3pw3z4jk2bsfp";
};
- buildInputs = [ pkgconfig dbus_glib libxml2 libxslt libxklavier hal popt
which python shared_mime_info desktop_file_utils
+ buildInputs = [ pkgconfig dbus_glib libxml2Python libxslt libxklavier hal
popt which python shared_mime_info desktop_file_utils
gtk gnome_doc_utils intltool GConf libglade libgnomekbd
libunique libtool bzip2
libgnomeui librsvg gnome_menus gnome_desktop gnome_panel
metacity gnome_settings_daemon ];
configureFlags = "--disable-scrollkeeper";
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix (from
r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gnome-desktop/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gnome-desktop/default.nix
Sat Oct 8 14:08:44 2011 (r29720, copy source)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix
Sat Oct 8 16:58:32 2011 (r29721)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, python, libxml2, libxslt, which, libX11, gtk
+{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11,
gtk
, intltool, GConf, gnome_doc_utils}:
stdenv.mkDerivation {
@@ -8,6 +8,6 @@
sha256 = "1raag5c74pyy0f1i37fjxyxcnk9ck4mh6c1hcdmv5dv40xndwvwp";
};
configureFlags = "--disable-scrollkeeper";
- buildInputs = [ pkgconfig python libxml2 libxslt which libX11 gtk
+ buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 gtk
intltool GConf gnome_doc_utils ];
}
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix (from
r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix
Sat Oct 8 14:08:44 2011 (r29720, copy source)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix
Sat Oct 8 16:58:32 2011 (r29721)
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, python, pkgconfig, libxml2, libxslt, intltool, scrollkeeper,
+{stdenv, fetchurl, python, pkgconfig, libxml2Python, libxslt, intltool,
scrollkeeper,
makeWrapper}:
stdenv.mkDerivation {
@@ -8,7 +8,7 @@
sha256 = "1937zr088vn7vhy9rwfc021ih21hhf700c3m4ria8mlcpcvh1380";
};
configureFlags = "--disable-scrollkeeper";
- buildInputs = [ python pkgconfig libxml2 libxslt intltool scrollkeeper
+ buildInputs = [ python pkgconfig libxml2Python libxslt intltool scrollkeeper
makeWrapper ];
postInstall = ''
wrapProgram $out/bin/xml2po --prefix PYTHONPATH : $(toPythonPath $out) \
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix (from
r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gnome-icon-theme/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix (from
r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix (from
r29720, nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gnome-menus/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix (from
r29720, nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gnome-panel/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gnome-panel/default.nix
Sat Oct 8 14:08:44 2011 (r29720, copy source)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix Sat Oct
8 16:58:32 2011 (r29721)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2,
libxslt, bzip2, python
+{ stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which,
libxml2Python, libxslt, bzip2, python
, glib, gtk, pango, atk, libXau
, intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui,
GConf, gnome_menus, gnome_desktop
, libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl,
libtasn1}:
@@ -9,7 +9,7 @@
url = mirror://gnome/sources/gnome-panel/2.28/gnome-panel-2.28.0.tar.bz2;
sha256 = "0rc4f6vmyrm3s8ncbll0a1ik2j1gg068fq3xal120sc4iw68q5n1";
};
- buildInputs = [ pkgconfig gtk dbus_glib popt which libxml2 libxslt bzip2
python libXau
+ buildInputs = [ pkgconfig gtk dbus_glib popt which libxml2Python libxslt
bzip2 python libXau
intltool ORBit2 libglade libgnome libgnomeui libbonobo
libbonoboui GConf gnome_menus gnome_desktop
libwnck librsvg libgweather gnome_doc_utils libtasn1 ];
configureFlags = "--disable-scrollkeeper";
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix (from
r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gnome-session/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix
(from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gnome-settings-daemon/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix (from
r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gtksourceview/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gtksourceview/default.nix
Sat Oct 8 14:08:44 2011 (r29720, copy source)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
Sat Oct 8 16:58:32 2011 (r29721)
@@ -1,5 +1,5 @@
{stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk, pango,
- libxml2, perl, intltool, gettext}:
+ libxml2Python, perl, intltool, gettext}:
stdenv.mkDerivation {
name = "gtksourceview-2.9.9";
@@ -7,6 +7,6 @@
url = mirror://gnome/sources/gtksourceview/2.9/gtksourceview-2.9.9.tar.bz2;
sha256 = "0d0i586nj8jsqqfcjcvaj0yzc3sid3s1a4y62xr0qbddkbn1wllj";
};
- buildInputs = [pkgconfig atk cairo glib gtk pango libxml2 perl intltool
+ buildInputs = [pkgconfig atk cairo glib gtk pango libxml2Python perl intltool
gettext];
}
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gvfs/builder.sh (from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gvfs/builder.sh)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/gvfs/default.nix (from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gvfs/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/libcroco/default.nix (from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libcroco/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix (from
r29720, nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libgnomekbd/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/libgweather/default.nix (from
r29720, nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/librsvg/default.nix (from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/librsvg/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/libsoup/default.nix (from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libsoup/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/libwnck/default.nix (from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libwnck/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/metacity/default.nix (from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/metacity/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/nautilus/default.nix (from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/nautilus/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/rarian/default.nix (from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/rarian/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix (from
r29720, nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/scrollkeeper/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/vte/default.nix (from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/vte/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/zenity/default.nix (from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/zenity/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/GConf/default.nix (from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/GConf/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/ORBit2/default.nix (from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/ORBit2/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/at-spi/default.nix (from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/at-spi/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/audiofile/default.nix (from
r29720, nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/audiofile/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/esound/default.nix (from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/esound/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/glib-networking/default.nix (from
r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gnome-common/default.nix (from
r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gnome-common/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix (from
r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gnome-mime-data/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix
(from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gnome-vfs-monikers/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix (from
r29720, nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix (from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gtk-doc/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gtkglext/default.nix (from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gtkglext/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch
(from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gtkhtml/01_remove-disable-deprecated.patch)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix (from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/intltool/default.nix (from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/intltool/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libIDL/default.nix (from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libIDL/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix (from
r29720, nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libart_lgpl/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libbonobo/default.nix (from
r29720, nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libbonobo/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix (from
r29720, nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libbonoboui/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libglade/default.nix (from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libglade/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnome/default.nix (from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix (from
r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libgnomecanvas/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix (from
r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libgnomecanvasmm/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix (from
r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix (from
r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix (from
r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libgnomeprintui/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix (from
r29720, nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libgnomeui/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix (from
r29720, nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libgtkhtml/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libunique/default.nix (from
r29720, nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libunique/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/startup-notification/default.nix
(from r29720,
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/startup-notification/default.nix)
==============================================================================
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Oct 8 14:08:44
2011 (r29720)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Oct 8 16:58:32
2011 (r29721)
@@ -4544,7 +4544,7 @@
webkit =
builderDefsPackage ../development/libraries/webkit {
- inherit (gnome28) gtkdoc libsoup;
+ inherit (gnome) gtkdoc libsoup;
inherit (gtkLibs) gtk atk pango glib;
inherit freetype fontconfig gettext gperf curl
libjpeg libtiff libpng libxml2 libxslt sqlite
@@ -4558,7 +4558,7 @@
webkitSVN =
builderDefsPackage ../development/libraries/webkit/svn.nix {
- inherit (gnome28) gtkdoc libsoup;
+ inherit (gnome) gtkdoc libsoup;
inherit (gtkLibs) gtk atk pango glib;
inherit freetype fontconfig gettext gperf curl
libjpeg libtiff libpng libxml2 libxslt sqlite
@@ -6952,7 +6952,7 @@
which gettext makeWrapper file libidn sqlite docutils libnotify
vala dbus_glib;
inherit (gtkLibs) gtk glib;
- inherit (gnome28) gtksourceview;
+ inherit (gnome) gtksourceview;
inherit (webkit.passthru.args) libsoup;
inherit (xlibs) kbproto xproto libXScrnSaver scrnsaverproto;
};
@@ -7280,7 +7280,7 @@
surf = callPackage ../applications/misc/surf {
inherit (gtkLibs) gtk glib;
- libsoup = gnome28.libsoup;
+ libsoup = gnome.libsoup;
};
svk = perlPackages.SVK;
@@ -7359,7 +7359,7 @@
inherit pkgconfig webkit makeWrapper;
inherit (gtkLibs) gtk glib;
inherit (xlibs) libX11 kbproto;
- inherit (gnome28) glib_networking libsoup;
+ inherit (gnome) glib_networking libsoup;
};
valknut = callPackage ../applications/networking/p2p/valknut {
@@ -7856,9 +7856,12 @@
# import ../desktops/e17 { inherit callPackage pkgs; }
# );
- gnome28 = recurseIntoAttrs (import ../desktops/gnome-2.28 pkgs);
+ gnome2 = (callPackage ../desktops/gnome-2 {
+ callPackage = pkgs.newScope pkgs.gnome2;
+ self = pkgs.gnome2;
+ } // pkgs.gtkLibs);
- gnome = gnome28;
+ gnome = recurseIntoAttrs gnome2;
kde3 = recurseIntoAttrs {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
