From d05fa3ccfeafbf81e514a82cf2f04fff2b03659b Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 21:08:04 +0200 Subject: [PATCH 01/73] Branch gnome 3.12 --- .../{ => 3.10}/apps/bijiben/default.nix | 0 .../{ => 3.10}/apps/evolution/default.nix | 0 .../{ => 3.10}/apps/file-roller/default.nix | 0 .../gnome-3/{ => 3.10}/apps/gedit/default.nix | 0 .../gnome-3/{ => 3.10}/apps/glade/default.nix | 0 .../{ => 3.10}/apps/gnome-clocks/default.nix | 0 .../apps/gnome-documents/default.nix | 0 .../{ => 3.10}/apps/gnome-music/default.nix | 0 .../{ => 3.10}/apps/gnome-photos/default.nix | 0 .../{ => 3.10}/apps/seahorse/default.nix | 0 .../{ => 3.10}/core/at-spi2-atk/default.nix | 0 .../{ => 3.10}/core/at-spi2-core/default.nix | 0 .../{ => 3.10}/core/baobab/default.nix | 0 .../{ => 3.10}/core/caribou/default.nix | 0 .../gnome-3/{ => 3.10}/core/dconf/default.nix | 0 .../{ => 3.10}/core/empathy/default.nix | 0 .../gnome-3/{ => 3.10}/core/eog/default.nix | 0 .../{ => 3.10}/core/epiphany/default.nix | 0 .../{ => 3.10}/core/evince/default.nix | 0 .../core/evolution-data-server/default.nix | 0 .../gnome-3/{ => 3.10}/core/folks/default.nix | 0 .../gnome-3/{ => 3.10}/core/gconf/default.nix | 0 .../gnome-3/{ => 3.10}/core/gcr/default.nix | 0 .../gnome-3/{ => 3.10}/core/gdm/default.nix | 0 .../{ => 3.10}/core/geocode-glib/default.nix | 0 .../gnome-3/{ => 3.10}/core/gjs/default.nix | 0 .../core/gnome-backgrounds/default.nix | 0 .../core/gnome-calculator/default.nix | 0 .../{ => 3.10}/core/gnome-common/default.nix | 0 .../gnome-contacts/configure_dbus_glib.patch | 0 .../core/gnome-contacts/default.nix | 0 .../gnome-contacts/fix_row_selected.patch | 0 .../core/gnome-control-center/default.nix | 0 .../search_providers_dir.patch | 0 .../{ => 3.10}/core/gnome-desktop/default.nix | 0 .../core/gnome-dictionary/default.nix | 0 .../core/gnome-disk-utility/default.nix | 0 .../core/gnome-font-viewer/default.nix | 0 .../gnome-icon-theme-symbolic/default.nix | 0 .../core/gnome-icon-theme/default.nix | 0 .../core/gnome-icon-theme/setup-hook.sh | 0 .../{ => 3.10}/core/gnome-keyring/default.nix | 0 .../{ => 3.10}/core/gnome-menus/default.nix | 0 .../core/gnome-online-accounts/default.nix | 0 .../core/gnome-online-miners/default.nix | 0 .../core/gnome-screenshot/default.nix | 0 .../{ => 3.10}/core/gnome-session/default.nix | 0 .../core/gnome-settings-daemon/default.nix | 0 .../core/gnome-shell-extensions/default.nix | 0 .../{ => 3.10}/core/gnome-shell/default.nix | 0 .../fix_background_corruption.patch | 0 .../core/gnome-system-log/default.nix | 0 .../core/gnome-system-monitor/default.nix | 0 .../core/gnome-terminal/default.nix | 0 .../core/gnome-themes-standard/default.nix | 0 .../core/gnome-user-docs/default.nix | 0 .../core/gnome-user-share/default.nix | 0 .../{ => 3.10}/core/grilo-plugins/default.nix | 0 .../gnome-3/{ => 3.10}/core/grilo/default.nix | 0 .../gsettings-desktop-schemas/default.nix | 0 .../{ => 3.10}/core/gtksourceview/default.nix | 0 .../{ => 3.10}/core/gucharmap/default.nix | 0 .../{ => 3.10}/core/libcroco/default.nix | 0 .../{ => 3.10}/core/libgdata/default.nix | 0 .../{ => 3.10}/core/libgee/default.nix | 0 .../core/libgee/fix_introspection_paths.patch | 0 .../core/libgnome-keyring/default.nix | 0 .../{ => 3.10}/core/libgnomekbd/default.nix | 0 .../{ => 3.10}/core/libgweather/default.nix | 0 .../{ => 3.10}/core/libgxps/default.nix | 0 .../{ => 3.10}/core/libpeas/default.nix | 0 .../{ => 3.10}/core/libzapojit/default.nix | 0 .../{ => 3.10}/core/mutter/default.nix | 0 .../{ => 3.10}/core/nautilus/default.nix | 0 .../gnome-3/{ => 3.10}/core/rest/default.nix | 0 .../gnome-3/{ => 3.10}/core/sushi/default.nix | 0 .../core/totem-pl-parser/default.nix | 0 .../gnome-3/{ => 3.10}/core/totem/default.nix | 0 .../{ => 3.10}/core/tracker/default.nix | 0 .../gnome-3/{ => 3.10}/core/vino/default.nix | 0 .../gnome-3/{ => 3.10}/core/vte/default.nix | 0 .../{ => 3.10}/core/yelp-tools/default.nix | 0 .../{ => 3.10}/core/yelp-xsl/default.nix | 0 .../gnome-3/{ => 3.10}/core/yelp/default.nix | 0 .../{ => 3.10}/core/zenity/default.nix | 0 pkgs/desktops/gnome-3/{ => 3.10}/default.nix | 0 .../{ => 3.10}/desktop/rarian/default.nix | 0 .../{ => 3.10}/misc/gexiv2/default.nix | 0 .../{ => 3.10}/misc/gfbgraph/default.nix | 0 .../gnome-3/{ => 3.10}/misc/gitg/default.nix | 0 .../misc/gnome-tweak-tool/default.nix | 0 .../gnome-tweak-tool/find_gsettings.patch | 0 .../gnome-3/{ => 3.10}/misc/goffice/0.8.nix | 0 .../{ => 3.10}/misc/goffice/default.nix | 0 .../{ => 3.10}/misc/goffice/pcre_info.patch | 0 .../{ => 3.10}/misc/gtkhtml/default.nix | 0 .../{ => 3.10}/misc/libgit2-glib/default.nix | 0 .../{ => 3.10}/misc/libmediaart/default.nix | 0 .../gnome-3/3.12/apps/bijiben/default.nix | 41 ++++ .../gnome-3/3.12/apps/evolution/default.nix | 48 +++++ .../gnome-3/3.12/apps/file-roller/default.nix | 30 +++ .../gnome-3/3.12/apps/gedit/default.nix | 39 ++++ .../gnome-3/3.12/apps/glade/default.nix | 37 ++++ .../3.12/apps/gnome-clocks/default.nix | 41 ++++ .../3.12/apps/gnome-documents/default.nix | 54 +++++ .../gnome-3/3.12/apps/gnome-music/default.nix | 54 +++++ .../3.12/apps/gnome-photos/default.nix | 44 ++++ .../gnome-3/3.12/apps/seahorse/default.nix | 41 ++++ .../gnome-3/3.12/core/at-spi2-atk/default.nix | 21 ++ .../3.12/core/at-spi2-core/default.nix | 32 +++ .../gnome-3/3.12/core/baobab/default.nix | 42 ++++ .../gnome-3/3.12/core/caribou/default.nix | 27 +++ .../gnome-3/3.12/core/dconf/default.nix | 28 +++ .../gnome-3/3.12/core/empathy/default.nix | 56 +++++ .../gnome-3/3.12/core/eog/default.nix | 31 +++ .../gnome-3/3.12/core/epiphany/default.nix | 48 +++++ .../gnome-3/3.12/core/evince/default.nix | 70 +++++++ .../core/evolution-data-server/default.nix | 32 +++ .../gnome-3/3.12/core/folks/default.nix | 40 ++++ .../gnome-3/3.12/core/gconf/default.nix | 30 +++ .../gnome-3/3.12/core/gcr/default.nix | 28 +++ .../gnome-3/3.12/core/gdm/default.nix | 18 ++ .../3.12/core/geocode-glib/default.nix | 20 ++ .../gnome-3/3.12/core/gjs/default.nix | 21 ++ .../3.12/core/gnome-backgrounds/default.nix | 16 ++ .../3.12/core/gnome-calculator/default.nix | 36 ++++ .../3.12/core/gnome-common/default.nix | 17 ++ .../gnome-contacts/configure_dbus_glib.patch | 10 + .../3.12/core/gnome-contacts/default.nix | 51 +++++ .../gnome-contacts/fix_row_selected.patch | 11 + .../core/gnome-control-center/default.nix | 62 ++++++ .../search_providers_dir.patch | 17 ++ .../3.12/core/gnome-desktop/default.nix | 27 +++ .../3.12/core/gnome-dictionary/default.nix | 38 ++++ .../3.12/core/gnome-disk-utility/default.nix | 42 ++++ .../3.12/core/gnome-font-viewer/default.nix | 37 ++++ .../gnome-icon-theme-symbolic/default.nix | 24 +++ .../3.12/core/gnome-icon-theme/default.nix | 18 ++ .../3.12/core/gnome-icon-theme/setup-hook.sh | 10 + .../3.12/core/gnome-keyring/default.nix | 38 ++++ .../gnome-3/3.12/core/gnome-menus/default.nix | 24 +++ .../core/gnome-online-accounts/default.nix | 22 ++ .../3.12/core/gnome-online-miners/default.nix | 35 ++++ .../3.12/core/gnome-screenshot/default.nix | 37 ++++ .../3.12/core/gnome-session/default.nix | 30 +++ .../core/gnome-settings-daemon/default.nix | 34 +++ .../core/gnome-shell-extensions/default.nix | 26 +++ .../gnome-3/3.12/core/gnome-shell/default.nix | 48 +++++ .../fix_background_corruption.patch | 147 +++++++++++++ .../3.12/core/gnome-system-log/default.nix | 38 ++++ .../core/gnome-system-monitor/default.nix | 38 ++++ .../3.12/core/gnome-terminal/default.nix | 31 +++ .../core/gnome-themes-standard/default.nix | 15 ++ .../3.12/core/gnome-user-docs/default.nix | 20 ++ .../3.12/core/gnome-user-share/default.nix | 52 +++++ .../3.12/core/grilo-plugins/default.nix | 27 +++ .../gnome-3/3.12/core/grilo/default.nix | 31 +++ .../gsettings-desktop-schemas/default.nix | 30 +++ .../3.12/core/gtksourceview/default.nix | 19 ++ .../gnome-3/3.12/core/gucharmap/default.nix | 40 ++++ .../gnome-3/3.12/core/libcroco/default.nix | 18 ++ .../gnome-3/3.12/core/libgdata/default.nix | 25 +++ .../gnome-3/3.12/core/libgee/default.nix | 25 +++ .../core/libgee/fix_introspection_paths.patch | 13 ++ .../3.12/core/libgnome-keyring/default.nix | 26 +++ .../gnome-3/3.12/core/libgnomekbd/default.nix | 24 +++ .../gnome-3/3.12/core/libgweather/default.nix | 21 ++ .../gnome-3/3.12/core/libgxps/default.nix | 20 ++ .../gnome-3/3.12/core/libpeas/default.nix | 29 +++ .../gnome-3/3.12/core/libzapojit/default.nix | 16 ++ .../gnome-3/3.12/core/mutter/default.nix | 33 +++ .../gnome-3/3.12/core/nautilus/default.nix | 28 +++ .../gnome-3/3.12/core/rest/default.nix | 18 ++ .../gnome-3/3.12/core/sushi/default.nix | 38 ++++ .../3.12/core/totem-pl-parser/default.nix | 20 ++ .../gnome-3/3.12/core/totem/default.nix | 49 +++++ .../gnome-3/3.12/core/tracker/default.nix | 49 +++++ .../gnome-3/3.12/core/vino/default.nix | 31 +++ .../gnome-3/3.12/core/vte/default.nix | 35 ++++ .../gnome-3/3.12/core/yelp-tools/default.nix | 22 ++ .../gnome-3/3.12/core/yelp-xsl/default.nix | 23 ++ .../gnome-3/3.12/core/yelp/default.nix | 36 ++++ .../gnome-3/3.12/core/zenity/default.nix | 23 ++ pkgs/desktops/gnome-3/3.12/default.nix | 198 ++++++++++++++++++ .../gnome-3/3.12/desktop/rarian/default.nix | 16 ++ .../gnome-3/3.12/misc/gexiv2/default.nix | 25 +++ .../gnome-3/3.12/misc/gfbgraph/default.nix | 23 ++ .../gnome-3/3.12/misc/gitg/default.nix | 46 ++++ .../3.12/misc/gnome-tweak-tool/default.nix | 46 ++++ .../gnome-tweak-tool/find_gsettings.patch | 22 ++ .../gnome-3/3.12/misc/goffice/0.8.nix | 37 ++++ .../gnome-3/3.12/misc/goffice/default.nix | 36 ++++ .../gnome-3/3.12/misc/goffice/pcre_info.patch | 13 ++ .../gnome-3/3.12/misc/gtkhtml/default.nix | 17 ++ .../3.12/misc/libgit2-glib/default.nix | 21 ++ .../gnome-3/3.12/misc/libmediaart/default.nix | 19 ++ pkgs/top-level/all-packages.nix | 6 +- 197 files changed, 3317 insertions(+), 1 deletion(-) rename pkgs/desktops/gnome-3/{ => 3.10}/apps/bijiben/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/apps/evolution/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/apps/file-roller/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/apps/gedit/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/apps/glade/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/apps/gnome-clocks/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/apps/gnome-documents/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/apps/gnome-music/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/apps/gnome-photos/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/apps/seahorse/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/at-spi2-atk/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/at-spi2-core/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/baobab/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/caribou/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/dconf/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/empathy/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/eog/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/epiphany/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/evince/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/evolution-data-server/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/folks/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gconf/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gcr/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gdm/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/geocode-glib/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gjs/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-backgrounds/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-calculator/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-common/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-contacts/configure_dbus_glib.patch (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-contacts/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-contacts/fix_row_selected.patch (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-control-center/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-control-center/search_providers_dir.patch (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-desktop/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-dictionary/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-disk-utility/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-font-viewer/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-icon-theme-symbolic/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-icon-theme/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-icon-theme/setup-hook.sh (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-keyring/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-menus/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-online-accounts/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-online-miners/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-screenshot/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-session/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-settings-daemon/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-shell-extensions/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-shell/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-shell/fix_background_corruption.patch (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-system-log/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-system-monitor/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-terminal/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-themes-standard/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-user-docs/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-user-share/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/grilo-plugins/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/grilo/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gsettings-desktop-schemas/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gtksourceview/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/gucharmap/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/libcroco/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/libgdata/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/libgee/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/libgee/fix_introspection_paths.patch (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/libgnome-keyring/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/libgnomekbd/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/libgweather/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/libgxps/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/libpeas/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/libzapojit/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/mutter/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/nautilus/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/rest/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/sushi/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/totem-pl-parser/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/totem/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/tracker/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/vino/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/vte/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/yelp-tools/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/yelp-xsl/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/yelp/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/core/zenity/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/desktop/rarian/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/misc/gexiv2/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/misc/gfbgraph/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/misc/gitg/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/misc/gnome-tweak-tool/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/misc/gnome-tweak-tool/find_gsettings.patch (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/misc/goffice/0.8.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/misc/goffice/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/misc/goffice/pcre_info.patch (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/misc/gtkhtml/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/misc/libgit2-glib/default.nix (100%) rename pkgs/desktops/gnome-3/{ => 3.10}/misc/libmediaart/default.nix (100%) create mode 100644 pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/apps/glade/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/at-spi2-atk/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/at-spi2-core/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/baobab/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/caribou/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/dconf/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/empathy/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/eog/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/evince/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/folks/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gconf/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gcr/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gdm/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gjs/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-contacts/fix_row_selected.patch create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/setup-hook.sh create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-shell/fix_background_corruption.patch create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/grilo/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/libgee/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch create mode 100644 pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/mutter/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/rest/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/sushi/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/totem/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/tracker/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/vino/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/vte/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/yelp/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/core/zenity/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch create mode 100644 pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix create mode 100644 pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch create mode 100644 pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.10/apps/bijiben/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/apps/bijiben/default.nix rename to pkgs/desktops/gnome-3/3.10/apps/bijiben/default.nix diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.10/apps/evolution/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/apps/evolution/default.nix rename to pkgs/desktops/gnome-3/3.10/apps/evolution/default.nix diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.10/apps/file-roller/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/apps/file-roller/default.nix rename to pkgs/desktops/gnome-3/3.10/apps/file-roller/default.nix diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.10/apps/gedit/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/apps/gedit/default.nix rename to pkgs/desktops/gnome-3/3.10/apps/gedit/default.nix diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.10/apps/glade/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/apps/glade/default.nix rename to pkgs/desktops/gnome-3/3.10/apps/glade/default.nix diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.10/apps/gnome-clocks/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix rename to pkgs/desktops/gnome-3/3.10/apps/gnome-clocks/default.nix diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.10/apps/gnome-documents/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/apps/gnome-documents/default.nix rename to pkgs/desktops/gnome-3/3.10/apps/gnome-documents/default.nix diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.10/apps/gnome-music/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/apps/gnome-music/default.nix rename to pkgs/desktops/gnome-3/3.10/apps/gnome-music/default.nix diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.10/apps/gnome-photos/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/apps/gnome-photos/default.nix rename to pkgs/desktops/gnome-3/3.10/apps/gnome-photos/default.nix diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.10/apps/seahorse/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/apps/seahorse/default.nix rename to pkgs/desktops/gnome-3/3.10/apps/seahorse/default.nix diff --git a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix b/pkgs/desktops/gnome-3/3.10/core/at-spi2-atk/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix rename to pkgs/desktops/gnome-3/3.10/core/at-spi2-atk/default.nix diff --git a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix b/pkgs/desktops/gnome-3/3.10/core/at-spi2-core/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/at-spi2-core/default.nix rename to pkgs/desktops/gnome-3/3.10/core/at-spi2-core/default.nix diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.10/core/baobab/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/baobab/default.nix rename to pkgs/desktops/gnome-3/3.10/core/baobab/default.nix diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.10/core/caribou/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/caribou/default.nix rename to pkgs/desktops/gnome-3/3.10/core/caribou/default.nix diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.10/core/dconf/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/dconf/default.nix rename to pkgs/desktops/gnome-3/3.10/core/dconf/default.nix diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.10/core/empathy/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/empathy/default.nix rename to pkgs/desktops/gnome-3/3.10/core/empathy/default.nix diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/3.10/core/eog/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/eog/default.nix rename to pkgs/desktops/gnome-3/3.10/core/eog/default.nix diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.10/core/epiphany/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/epiphany/default.nix rename to pkgs/desktops/gnome-3/3.10/core/epiphany/default.nix diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/3.10/core/evince/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/evince/default.nix rename to pkgs/desktops/gnome-3/3.10/core/evince/default.nix diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.10/core/evolution-data-server/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/evolution-data-server/default.nix rename to pkgs/desktops/gnome-3/3.10/core/evolution-data-server/default.nix diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/3.10/core/folks/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/folks/default.nix rename to pkgs/desktops/gnome-3/3.10/core/folks/default.nix diff --git a/pkgs/desktops/gnome-3/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.10/core/gconf/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gconf/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gconf/default.nix diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.10/core/gcr/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gcr/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gcr/default.nix diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.10/core/gdm/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gdm/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gdm/default.nix diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.10/core/geocode-glib/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/geocode-glib/default.nix rename to pkgs/desktops/gnome-3/3.10/core/geocode-glib/default.nix diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.10/core/gjs/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gjs/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gjs/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-backgrounds/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-backgrounds/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-calculator/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-calculator/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-calculator/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-common/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-common/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-common/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/configure_dbus_glib.patch b/pkgs/desktops/gnome-3/3.10/core/gnome-contacts/configure_dbus_glib.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-contacts/configure_dbus_glib.patch rename to pkgs/desktops/gnome-3/3.10/core/gnome-contacts/configure_dbus_glib.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-contacts/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-contacts/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-contacts/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/fix_row_selected.patch b/pkgs/desktops/gnome-3/3.10/core/gnome-contacts/fix_row_selected.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-contacts/fix_row_selected.patch rename to pkgs/desktops/gnome-3/3.10/core/gnome-contacts/fix_row_selected.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-control-center/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-control-center/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-control-center/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/search_providers_dir.patch b/pkgs/desktops/gnome-3/3.10/core/gnome-control-center/search_providers_dir.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-control-center/search_providers_dir.patch rename to pkgs/desktops/gnome-3/3.10/core/gnome-control-center/search_providers_dir.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-desktop/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-desktop/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-desktop/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-dictionary/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-dictionary/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-disk-utility/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-disk-utility/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-font-viewer/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-font-viewer/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-icon-theme-symbolic/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-icon-theme-symbolic/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-icon-theme-symbolic/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-icon-theme-symbolic/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-icon-theme/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-icon-theme/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-icon-theme/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-icon-theme/setup-hook.sh b/pkgs/desktops/gnome-3/3.10/core/gnome-icon-theme/setup-hook.sh similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-icon-theme/setup-hook.sh rename to pkgs/desktops/gnome-3/3.10/core/gnome-icon-theme/setup-hook.sh diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-keyring/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-keyring/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-keyring/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-menus/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-menus/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-menus/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-online-accounts/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-online-accounts/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-online-miners/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-online-miners/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-screenshot/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-screenshot/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-session/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-session/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-session/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-settings-daemon/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-settings-daemon/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-shell-extensions/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-shell-extensions/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-shell/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-shell/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-shell/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix_background_corruption.patch b/pkgs/desktops/gnome-3/3.10/core/gnome-shell/fix_background_corruption.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-shell/fix_background_corruption.patch rename to pkgs/desktops/gnome-3/3.10/core/gnome-shell/fix_background_corruption.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-system-log/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-system-log/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-system-log/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-system-monitor/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-system-monitor/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-terminal/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-terminal/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-terminal/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-themes-standard/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-themes-standard/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-user-docs/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-user-docs/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-user-share/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-user-share/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gnome-user-share/default.nix diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.10/core/grilo-plugins/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/grilo-plugins/default.nix rename to pkgs/desktops/gnome-3/3.10/core/grilo-plugins/default.nix diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.10/core/grilo/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/grilo/default.nix rename to pkgs/desktops/gnome-3/3.10/core/grilo/default.nix diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.10/core/gsettings-desktop-schemas/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gsettings-desktop-schemas/default.nix diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.10/core/gtksourceview/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gtksourceview/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gtksourceview/default.nix diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.10/core/gucharmap/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gucharmap/default.nix rename to pkgs/desktops/gnome-3/3.10/core/gucharmap/default.nix diff --git a/pkgs/desktops/gnome-3/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.10/core/libcroco/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/libcroco/default.nix rename to pkgs/desktops/gnome-3/3.10/core/libcroco/default.nix diff --git a/pkgs/desktops/gnome-3/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.10/core/libgdata/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/libgdata/default.nix rename to pkgs/desktops/gnome-3/3.10/core/libgdata/default.nix diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.10/core/libgee/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/libgee/default.nix rename to pkgs/desktops/gnome-3/3.10/core/libgee/default.nix diff --git a/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.10/core/libgee/fix_introspection_paths.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch rename to pkgs/desktops/gnome-3/3.10/core/libgee/fix_introspection_paths.patch diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.10/core/libgnome-keyring/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix rename to pkgs/desktops/gnome-3/3.10/core/libgnome-keyring/default.nix diff --git a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.10/core/libgnomekbd/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/libgnomekbd/default.nix rename to pkgs/desktops/gnome-3/3.10/core/libgnomekbd/default.nix diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.10/core/libgweather/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/libgweather/default.nix rename to pkgs/desktops/gnome-3/3.10/core/libgweather/default.nix diff --git a/pkgs/desktops/gnome-3/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.10/core/libgxps/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/libgxps/default.nix rename to pkgs/desktops/gnome-3/3.10/core/libgxps/default.nix diff --git a/pkgs/desktops/gnome-3/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.10/core/libpeas/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/libpeas/default.nix rename to pkgs/desktops/gnome-3/3.10/core/libpeas/default.nix diff --git a/pkgs/desktops/gnome-3/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.10/core/libzapojit/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/libzapojit/default.nix rename to pkgs/desktops/gnome-3/3.10/core/libzapojit/default.nix diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.10/core/mutter/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/mutter/default.nix rename to pkgs/desktops/gnome-3/3.10/core/mutter/default.nix diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.10/core/nautilus/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/nautilus/default.nix rename to pkgs/desktops/gnome-3/3.10/core/nautilus/default.nix diff --git a/pkgs/desktops/gnome-3/core/rest/default.nix b/pkgs/desktops/gnome-3/3.10/core/rest/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/rest/default.nix rename to pkgs/desktops/gnome-3/3.10/core/rest/default.nix diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.10/core/sushi/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/sushi/default.nix rename to pkgs/desktops/gnome-3/3.10/core/sushi/default.nix diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.10/core/totem-pl-parser/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix rename to pkgs/desktops/gnome-3/3.10/core/totem-pl-parser/default.nix diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/3.10/core/totem/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/totem/default.nix rename to pkgs/desktops/gnome-3/3.10/core/totem/default.nix diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.10/core/tracker/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/tracker/default.nix rename to pkgs/desktops/gnome-3/3.10/core/tracker/default.nix diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/3.10/core/vino/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/vino/default.nix rename to pkgs/desktops/gnome-3/3.10/core/vino/default.nix diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/3.10/core/vte/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/vte/default.nix rename to pkgs/desktops/gnome-3/3.10/core/vte/default.nix diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.10/core/yelp-tools/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/yelp-tools/default.nix rename to pkgs/desktops/gnome-3/3.10/core/yelp-tools/default.nix diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.10/core/yelp-xsl/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/yelp-xsl/default.nix rename to pkgs/desktops/gnome-3/3.10/core/yelp-xsl/default.nix diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.10/core/yelp/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/yelp/default.nix rename to pkgs/desktops/gnome-3/3.10/core/yelp/default.nix diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.10/core/zenity/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/zenity/default.nix rename to pkgs/desktops/gnome-3/3.10/core/zenity/default.nix diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/3.10/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/default.nix rename to pkgs/desktops/gnome-3/3.10/default.nix diff --git a/pkgs/desktops/gnome-3/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.10/desktop/rarian/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/desktop/rarian/default.nix rename to pkgs/desktops/gnome-3/3.10/desktop/rarian/default.nix diff --git a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.10/misc/gexiv2/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/misc/gexiv2/default.nix rename to pkgs/desktops/gnome-3/3.10/misc/gexiv2/default.nix diff --git a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.10/misc/gfbgraph/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/misc/gfbgraph/default.nix rename to pkgs/desktops/gnome-3/3.10/misc/gfbgraph/default.nix diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.10/misc/gitg/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/misc/gitg/default.nix rename to pkgs/desktops/gnome-3/3.10/misc/gitg/default.nix diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.10/misc/gnome-tweak-tool/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix rename to pkgs/desktops/gnome-3/3.10/misc/gnome-tweak-tool/default.nix diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.10/misc/gnome-tweak-tool/find_gsettings.patch similarity index 100% rename from pkgs/desktops/gnome-3/misc/gnome-tweak-tool/find_gsettings.patch rename to pkgs/desktops/gnome-3/3.10/misc/gnome-tweak-tool/find_gsettings.patch diff --git a/pkgs/desktops/gnome-3/misc/goffice/0.8.nix b/pkgs/desktops/gnome-3/3.10/misc/goffice/0.8.nix similarity index 100% rename from pkgs/desktops/gnome-3/misc/goffice/0.8.nix rename to pkgs/desktops/gnome-3/3.10/misc/goffice/0.8.nix diff --git a/pkgs/desktops/gnome-3/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/misc/goffice/default.nix rename to pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix diff --git a/pkgs/desktops/gnome-3/misc/goffice/pcre_info.patch b/pkgs/desktops/gnome-3/3.10/misc/goffice/pcre_info.patch similarity index 100% rename from pkgs/desktops/gnome-3/misc/goffice/pcre_info.patch rename to pkgs/desktops/gnome-3/3.10/misc/goffice/pcre_info.patch diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.10/misc/gtkhtml/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/misc/gtkhtml/default.nix rename to pkgs/desktops/gnome-3/3.10/misc/gtkhtml/default.nix diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.10/misc/libgit2-glib/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix rename to pkgs/desktops/gnome-3/3.10/misc/libgit2-glib/default.nix diff --git a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.10/misc/libmediaart/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/misc/libmediaart/default.nix rename to pkgs/desktops/gnome-3/3.10/misc/libmediaart/default.nix diff --git a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix new file mode 100644 index 00000000000..ef460112d21 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix @@ -0,0 +1,41 @@ +{ stdenv, intltool, fetchurl, pkgconfig, glib +, hicolor_icon_theme, makeWrapper, itstool +, clutter_gtk, libuuid, webkitgtk, zeitgeist +, gnome3, librsvg, gdk_pixbuf, libxml2 }: + +stdenv.mkDerivation rec { + name = "bijiben-3.10.2"; + + src = fetchurl { + url = "mirror://gnome/sources/bijiben/3.10/${name}.tar.xz"; + sha256 = "81257f85218968b0ad386da6e1143586de478870ca74bb5387646a479999a7d4"; + }; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ pkgconfig glib intltool itstool libxml2 + clutter_gtk libuuid webkitgtk gnome3.tracker + gnome3.gnome_online_accounts zeitgeist + gnome3.gsettings_desktop_schemas makeWrapper + gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; + + enableParallelBuilding = true; + + preFixup = '' + wrapProgram "$out/bin/bijiben" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Bijiben; + description = "Note editor designed to remain simple to use"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix new file mode 100644 index 00000000000..ee62c951b4c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix @@ -0,0 +1,48 @@ +{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight +, pkgconfig, gtk3, glib, hicolor_icon_theme, libnotify +, makeWrapper, itstool, shared_mime_info, libical, db +, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu +, libcanberra_gtk3, bogofilter, gst_all_1, procps }: + +stdenv.mkDerivation rec { + name = "evolution-3.10.4"; + + src = fetchurl { + url = "mirror://gnome/sources/evolution/3.10/${name}.tar.xz"; + sha256 = "ac60557f264f211e6a7bc0ced919041c154e4c7b9c79600516aee7acc1d03e40"; + }; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 + gdk_pixbuf gnome3.gnome_icon_theme librsvg db icu + gnome3.evolution_data_server libsecret libical + webkitgtk shared_mime_info gnome3.gnome_desktop + libcanberra_gtk3 gnome3.gtkhtml bogofilter gnome3.libgdata + gst_all_1.gstreamer gst_all_1.gst-plugins-base + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic + nss nspr libnotify procps highlight gnome3.libgweather + gnome3.gsettings_desktop_schemas makeWrapper ]; + + configureFlags = [ "--disable-spamassassin" "--disable-pst-import" ]; + + NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss"; + + enableParallelBuilding = true; + + preFixup = '' + wrapProgram "$out/bin/evolution" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Evolution; + description = "Personal information management application that provides integrated mail, calendaring and address book functionality"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix new file mode 100644 index 00000000000..e13e169ccc5 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive +, attr, bzip2, acl, makeWrapper }: + +stdenv.mkDerivation rec { + name = "file-roller-${version}"; + + majVersion = "3.10"; + version = "${majVersion}.2.1"; + + src = fetchurl { + url = "mirror://gnome/sources/file-roller/${majVersion}/${name}.tar.xz"; + sha256 = "14374z1yfbjlgpl4k1ih8b35x8kzvh99y22rwwkc2wfz0d0i1qgx"; + }; + + # TODO: support nautilus + # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so + + buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive + attr bzip2 acl makeWrapper ]; + + preFixup = '' + wrapProgram "$out/bin/file-roller" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix new file mode 100644 index 00000000000..84a77e5a024 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix @@ -0,0 +1,39 @@ +{ stdenv, intltool, fetchurl, enchant, isocodes +, pkgconfig, gtk3, glib, hicolor_icon_theme +, bash, makeWrapper, itstool, libsoup, libxml2 +, gnome3, librsvg, gdk_pixbuf, file }: + +stdenv.mkDerivation rec { + name = "gedit-3.10.4"; + + src = fetchurl { + url = "mirror://gnome/sources/gedit/3.10/${name}.tar.xz"; + sha256 = "40dc10b6e26fd8523087e7321a20a063f4c1e586dffd7ce8ee78eead11359f9e"; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool enchant isocodes + gdk_pixbuf gnome3.gnome_icon_theme librsvg libsoup + gnome3.libpeas gnome3.gtksourceview libxml2 + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic + gnome3.gsettings_desktop_schemas makeWrapper file ]; + + enableParallelBuilding = true; + + preFixup = '' + wrapProgram "$out/bin/gedit" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib" \ + --prefix XDG_DATA_DIRS : "${gnome3.gtksourceview}/share:${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Gedit; + description = "Official text editor of the GNOME desktop environment"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix new file mode 100644 index 00000000000..5979d10fa70 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix @@ -0,0 +1,37 @@ +{ stdenv, intltool, fetchurl, python +, pkgconfig, gtk3, glib, hicolor_icon_theme +, makeWrapper, itstool, libxml2, docbook_xsl +, gnome3, librsvg, gdk_pixbuf, libxslt }: + +stdenv.mkDerivation rec { + name = "glade-3.16.1"; + + src = fetchurl { + url = "mirror://gnome/sources/glade/3.16/${name}.tar.xz"; + sha256 = "994ac258bc100d3907ed40a2880c3144f13997b324477253e812d59f2716523f"; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python + gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl + gdk_pixbuf gnome3.gnome_icon_theme librsvg libxslt + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; + + enableParallelBuilding = true; + + preFixup = '' + wrapProgram "$out/bin/glade" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Glade; + description = "User interface designer for GTK+ applications"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix new file mode 100644 index 00000000000..c39f731e028 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix @@ -0,0 +1,41 @@ +{ stdenv, intltool, fetchurl, libgweather, libnotify +, pkgconfig, gtk3, glib, hicolor_icon_theme +, makeWrapper, itstool, libcanberra_gtk3, libtool +, gnome3, librsvg, gdk_pixbuf, geoclue2 }: + +stdenv.mkDerivation rec { + name = "gnome-clocks-3.10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-clocks/3.10/${name}.tar.xz"; + sha256 = "5f6f3b7bb9929353d974aa444b10bb4d0f414176449cce2c626fabd2d4b55b43"; + }; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 + gnome3.gsettings_desktop_schemas makeWrapper + gdk_pixbuf gnome3.gnome_icon_theme librsvg + gnome3.gnome_desktop gnome3.geocode_glib geoclue2 + libgweather libnotify libtool + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; + + enableParallelBuilding = true; + + preFixup = '' + wrapProgram "$out/bin/gnome-clocks" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Clocks; + description = "Clock application designed for GNOME 3"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix new file mode 100644 index 00000000000..b393bb43931 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix @@ -0,0 +1,54 @@ +{ stdenv, intltool, fetchurl, evince, gjs +, pkgconfig, gtk3, glib, hicolor_icon_theme +, makeWrapper, itstool, libxslt, webkitgtk +, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl +, gobjectIntrospection, json_glib +, gmp, desktop_file_utils }: + +stdenv.mkDerivation rec { + name = "gnome-documents-3.10.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-documents/3.10/${name}.tar.xz"; + sha256 = "2b7267c9c4e5767039632cb31877ed2e57f994b657e8863dd79af5287db45745"; + }; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt + docbook_xsl desktop_file_utils + gnome3.gsettings_desktop_schemas makeWrapper gmp + gdk_pixbuf gnome3.gnome_icon_theme librsvg evince + libsoup webkitgtk gjs gobjectIntrospection gnome3.rest + gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts + gnome3.gnome_desktop gnome3.libzapojit json_glib + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; + + enableParallelBuilding = true; + + preFixup = + let + libPath = stdenv.lib.makeLibraryPath + [ evince gtk3 gnome3.tracker gnome3.gnome_online_accounts ]; + in + '' + substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication" + wrapProgram "$out/bin/gnome-documents" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix LD_LIBRARY_PATH ":" "${libPath}" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --run "if [ -z \"\$XDG_CACHE_DIR\" ]; then XDG_CACHE_DIR=\$HOME/.cache; fi; if [ -w \"\$XDG_CACHE_DIR/..\" ]; then mkdir -p \"\$XDG_CACHE_DIR/gnome-documents\"; fi" + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Documents; + description = "Document manager application designed to work with GNOME 3"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix new file mode 100644 index 00000000000..b8d2bbc79ef --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix @@ -0,0 +1,54 @@ +{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker +, python3, libxml2, python3Packages, libnotify +, pkgconfig, gtk3, glib, hicolor_icon_theme, cairo +, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }: + +stdenv.mkDerivation rec { + name = "gnome-music-3.10.4"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-music/3.10/${name}.tar.xz"; + sha256 = "64220d4c0f9115a6ed27ec99c7ec7afc065d12e5a32371936f303ef981f5325f"; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart + gdk_pixbuf gnome3.gnome_icon_theme librsvg python3 + gnome3.grilo libxml2 python3Packages.pygobject3 libnotify + python3Packages.pycairo python3Packages.dbus + gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic + gnome3.gsettings_desktop_schemas makeWrapper tracker ]; + + enableParallelBuilding = true; + + preFixup = + let + libPath = stdenv.lib.makeLibraryPath + [ glib gtk3 libnotify tracker gnome3.grilo cairo + gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad ]; + in + '' + wrapProgram "$out/bin/gnome-music" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix LD_LIBRARY_PATH : "${libPath}" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ + --prefix PYTHONPATH : "$PYTHONPATH" + + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Music; + description = "Music player and management application for the GNOME desktop environment"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix new file mode 100644 index 00000000000..68d4e3690f9 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix @@ -0,0 +1,44 @@ +{ stdenv, intltool, fetchurl, exempi, libxml2 +, pkgconfig, gtk3, glib, hicolor_icon_theme +, makeWrapper, itstool, gegl, babl, lcms2 +, desktop_file_utils, gmp +, gnome3, librsvg, gdk_pixbuf, libexif }: + +stdenv.mkDerivation rec { + name = "gnome-photos-3.10.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-photos/3.10/${name}.tar.xz"; + sha256 = "820503c26a0f829682dd46653e8f0850ac687aba42728ac74350ba8406e80975"; + }; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl + gnome3.gsettings_desktop_schemas makeWrapper gmp + gdk_pixbuf gnome3.gnome_icon_theme librsvg exempi + gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo + gnome3.gnome_online_accounts gnome3.gnome_desktop + lcms2 libexif gnome3.tracker libxml2 desktop_file_utils + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; + + preFixup = '' + wrapProgram "$out/bin/gnome-photos" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Photos; + description = "Photos is an application to access, organize and share your photos with GNOME 3"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix new file mode 100644 index 00000000000..cecc4a8913d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix @@ -0,0 +1,41 @@ +{ stdenv, intltool, fetchurl +, pkgconfig, gtk3, glib, hicolor_icon_theme +, makeWrapper, itstool, gnupg, libsoup +, gnome3, librsvg, gdk_pixbuf, gpgme +, libsecret, avahi, p11_kit }: + +stdenv.mkDerivation rec { + name = "seahorse-3.10.2"; + + src = fetchurl { + url = "mirror://gnome/sources/seahorse/3.10/${name}.tar.xz"; + sha256 = "89cabf19f77a55f220bc61a3b97e4db845a0980f0f1d9c66147cc9a4ced8cd16"; + }; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr + gnome3.gsettings_desktop_schemas makeWrapper gnupg + gdk_pixbuf gnome3.gnome_icon_theme librsvg gpgme + libsecret avahi libsoup p11_kit + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; + + preFixup = '' + wrapProgram "$out/bin/seahorse" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Seahorse; + description = "Application for managing encryption keys and passwords in the GnomeKeyring"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/at-spi2-atk/default.nix b/pkgs/desktops/gnome-3/3.12/core/at-spi2-atk/default.nix new file mode 100644 index 00000000000..fc0c4f2a6bc --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/at-spi2-atk/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xlibs, libXi +, intltool, dbus_glib, at_spi2_core, libSM }: + +stdenv.mkDerivation rec { + versionMajor = "2.12"; + versionMinor = "0"; + moduleName = "at-spi2-atk"; + name = "${moduleName}-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + sha256 = "0crn3k6qvn6fjvgm68dj5ska1ppfgmdkaia2db1jp0b9y74nfm1v"; + }; + + buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi + intltool dbus_glib at_spi2_core libSM ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/at-spi2-core/default.nix b/pkgs/desktops/gnome-3/3.12/core/at-spi2-core/default.nix new file mode 100644 index 00000000000..d60a0ff7480 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/at-spi2-core/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, python, pkgconfig, popt, intltool, dbus_glib +, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: + +stdenv.mkDerivation (rec { + versionMajor = "2.12"; + versionMinor = "0"; + moduleName = "at-spi2-core"; + name = "${moduleName}-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + sha256 = "12gvsgdaxnxskndlhlmdkc50cfqgmzfc4n8la9944fz5k3fhwmfv"; + }; + + buildInputs = [ + python pkgconfig popt intltool dbus_glib + libX11 xextproto libSM libICE libXtst libXi + gobjectIntrospection + ]; + + # ToDo: on non-NixOS we create a symlink from there? + configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/"; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} + // stdenv.lib.optionalAttrs stdenv.isDarwin { + NIX_LDFLAGS = "-lintl"; + } +) + diff --git a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix new file mode 100644 index 00000000000..9381f45105d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix @@ -0,0 +1,42 @@ +{ stdenv, intltool, fetchurl, vala, libgtop +, pkgconfig, gtk3, glib, hicolor_icon_theme +, bash, makeWrapper, itstool, libxml2 +, gnome3, librsvg, gdk_pixbuf, file }: + +stdenv.mkDerivation rec { + name = "baobab-3.10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/baobab/3.10/${name}.tar.xz"; + sha256 = "23ce8e4847ce5f1c8230e757532d94c84e6e273d6ec8fca20eecaed5f96563f9"; + }; + + configureFlags = [ "--disable-static" ]; + + doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; + + buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2 + gnome3.gsettings_desktop_schemas makeWrapper file ]; + + preFixup = '' + rm $out/share/icons/hicolor/icon-theme.cache + rm $out/share/icons/HighContrast/icon-theme.cache + wrapProgram "$out/bin/baobab" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Baobab; + description = "Graphical application to analyse disk usage in any Gnome environment"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix new file mode 100644 index 00000000000..41a997c1f71 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix @@ -0,0 +1,27 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2 +, libxklavier, libXtst, gtk2, intltool, libxslt }: + + +stdenv.mkDerivation rec { + name = "caribou-0.4.12"; + + src = fetchurl { + url = "mirror://gnome/sources/caribou/0.4/${name}.tar.xz"; + sha256 = "0235sws58rg0kadxbp2nq5ha76zmhd4mr10n9qlbryf8p78qsvii"; + }; + + buildInputs = with gnome3; + [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python pythonPackages.pygobject3 + libxml2 libXtst gtk2 intltool libxslt ]; + + propagatedBuildInputs = [ gnome3.libgee libxklavier ]; + + preBuild = '' + patchShebangs . + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix new file mode 100644 index 00000000000..a6236f16744 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 +, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }: + +stdenv.mkDerivation rec { + name = "dconf-${version}"; + version = "0.18.0"; + + src = fetchurl { + url = "mirror://gnome/sources/dconf/0.18/${name}.tar.xz"; + sha256 = "0mf921pnkhs8xn1dr2wxfq277vjsbkpl9cccv0gaz4460z31p6qh"; + }; + + buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 + intltool docbook_xsl docbook_xsl_ns makeWrapper ]; + + preFixup = '' + wrapProgram "$out/bin/dconf-editor" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + + rm $out/lib/gio/modules/giomodule.cache + rm $out/share/icons/hicolor/icon-theme.cache + rm $out/share/icons/HighContrast/icon-theme.cache + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix new file mode 100644 index 00000000000..051bc9b7fb2 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix @@ -0,0 +1,56 @@ +{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib +, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf +, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream +, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts +, gcr, libsecret, folks, pulseaudio, telepathy_mission_control +, telepathy_logger, libnotify, clutter, libsoup, gnutls +, evolution_data_server +, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info +, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee }: + +# TODO: enable more features + +stdenv.mkDerivation rec { + name = "empathy-3.10.3"; + + src = fetchurl { + url = "mirror://gnome/sources/empathy/3.10/${name}.tar.xz"; + sha256 = "49366acdd3c3ef9a74f63eb09920803c4c9df83056acbf8a7899e7890a9fb196"; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard + gnome3.gnome_icon_theme hicolor_icon_theme + gnome_online_accounts shared_mime_info + gnome3.gnome_icon_theme_symbolic ]; + propagatedBuildInputs = [ folks telepathy_logger evolution_data_server + telepathy_mission_control ]; + buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool + libxml2 libxslt icu file makeWrapper + telepathy_glib clutter_gtk clutter-gst cogl + gst_all_1.gstreamer gst_all_1.gst-plugins-base + gcr libsecret pulseaudio gnome3.yelp_xsl gdk_pixbuf + libnotify clutter libsoup gnutls libgee p11_kit + libcanberra_gtk3 telepathy_farstream farstream + gnome3.gsettings_desktop_schemas file libtool librsvg ]; + + NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0" + "-I${dbus_libs}/include/dbus-1.0" + "-I${dbus_libs}/lib/dbus-1.0/include" ]; + + preFixup = '' + for f in $out/bin/* $out/libexec/*; do + wrapProgram $f \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${hicolor_icon_theme}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + done + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Empathy; + description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols"; + maintainers = with maintainers; [ lethalman ]; + # TODO: license = [ licenses.gpl2 licenses.lgpl2 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix b/pkgs/desktops/gnome-3/3.12/core/eog/default.nix new file mode 100644 index 00000000000..57f19dcaa32 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/eog/default.nix @@ -0,0 +1,31 @@ +{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3 +, shared_mime_info, makeWrapper, librsvg, libexif }: + + +stdenv.mkDerivation rec { + name = "eog-3.10.2"; + + src = fetchurl { + url = "mirror://gnome/sources/eog/3.10/${name}.tar.xz"; + sha256 = "0qs7wmn987vd0cw8w16gmb0bnda3nkcwfg1q343l4rm6kih9ik2w"; + }; + + buildInputs = with gnome3; + [ intltool pkgconfig itstool libxml2 libjpeg gtk glib libpeas makeWrapper librsvg + gsettings_desktop_schemas shared_mime_info gnome_icon_theme gnome_desktop libexif ]; + + preFixup = '' + wrapProgram "$out/bin/eog" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${shared_mime_info}/share:${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/EyeOfGnome; + platforms = platforms.linux; + description = "GNOME image viewer"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix new file mode 100644 index 00000000000..9df3a7ed01e --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix @@ -0,0 +1,48 @@ +{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu +, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool +, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit +, sqlite, gcr, avahi, nss, isocodes, itstool, file +, hicolor_icon_theme, gdk_pixbuf, librsvg }: + +stdenv.mkDerivation rec { + name = "epiphany-3.10.3"; + + src = fetchurl { + url = "mirror://gnome/sources/epiphany/3.10/${name}.tar.xz"; + sha256 = "c18235ecceaa9c76e7d90d370861cb2bba45019e1e14391a00dac3d2e94a0db7"; + }; + + # Tests need an X display + configureFlags = [ "--disable-static --disable-tests" ]; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; + + nativeBuildInputs = [ pkgconfig file ]; + + preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; + + buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file + webkitgtk libsoup libsecret gnome_desktop libnotify libtool + sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools + gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ]; + + NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss"; + + enableParallelBuilding = true; + + preFixup = '' + wrapProgram "$out/bin/epiphany" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Epiphany; + description = "WebKit based web browser for GNOME"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix new file mode 100644 index 00000000000..4b50840534c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix @@ -0,0 +1,70 @@ +{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2 +, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 +, poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper +, librsvg, recentListSize ? null # 5 is not enough, allow passing a different number +, gobjectIntrospection +}: + +stdenv.mkDerivation rec { + name = "evince-3.10.3"; + + src = fetchurl { + url = "mirror://gnome/sources/evince/3.10/${name}.tar.xz"; + sha256 = "1bz9ypsvlfw1vgs7i5glba1h1n6c90f0d1g64linhg6xjcxcq3dk"; + }; + + buildInputs = [ + pkgconfig intltool perl perlXMLParser libxml2 + glib gtk3 pango atk gdk_pixbuf gobjectIntrospection + itstool gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic + gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas + poppler ghostscriptX djvulibre libspectre + makeWrapper libsecret librsvg + ]; + + configureFlags = [ + "--disable-nautilus" # Do not use nautilus + "--enable-introspection" + ]; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + preConfigure = with stdenv.lib; + optionalString doCheck '' + for file in test/*.py; do + echo "patching $file" + sed '1s,/usr,${python},' -i "$file" + done + '' + optionalString (recentListSize != null) '' + sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c + sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c + ''; + + preFixup = '' + # Tell Glib/GIO about the MIME info directory, which is used + # by `g_file_info_get_content_type ()'. + wrapProgram "$out/bin/evince" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + doCheck = false; # would need pythonPackages.dogTail, which is missing + + meta = with stdenv.lib; { + homepage = http://www.gnome.org/projects/evince/; + description = "GNOME's document viewer"; + + longDescription = '' + Evince is a document viewer for multiple document formats. It + currently supports PDF, PostScript, DjVu, TIFF and DVI. The goal + of Evince is to replace the multiple document viewers that exist + on the GNOME Desktop with a single simple application. + ''; + + license = "GPLv2+"; + platforms = platforms.linux; + maintainers = [ maintainers.vcunat ]; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix new file mode 100644 index 00000000000..685f8c24e7c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix @@ -0,0 +1,32 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, python, intltool, libsoup, libxml2, libsecret +, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }: + + +stdenv.mkDerivation rec { + name = "evolution-data-server-3.10.4"; + + src = fetchurl { + url = "mirror://gnome/sources/evolution-data-server/3.10/${name}.tar.xz"; + sha256 = "5c2d5e19af19ecfa81f31306411ab6155c3c62cf407d5a5aaa675a8ce940fa2d"; + }; + + buildInputs = with gnome3; + [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret + gcr p11_kit db nspr nss libgweather libical libgdata gperf makeWrapper ] + ++ stdenv.lib.optional valaSupport vala; + + # uoa irrelevant for now + configureFlags = ["--disable-uoa" "--with-nspr-includes=${nspr}/include/nspr" "--with-nss-includes=${nss}/include/nss"] + ++ stdenv.lib.optional valaSupport "--enable-vala-bindings"; + + preFixup = '' + for f in "$out/libexec/evolution-addressbook-factory" "$out/libexec/evolution-calendar-factory"; do + wrapProgram $f --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + done + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix new file mode 100644 index 00000000000..12518c634c4 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix @@ -0,0 +1,40 @@ +{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool +, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs +, telepathy_glib, evolution_data_server, libsecret, db }: + +# TODO: enable more folks backends + +stdenv.mkDerivation rec { + name = "folks-0.9.6"; + + src = fetchurl { + url = "mirror://gnome/sources/folks/0.9/${name}.tar.xz"; + sha256 = "a67e055b5a2724a34a80946e2940c4c0ad708cb1f4e0a09407c6b69a5e40267f"; + }; + + propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; + # dbus_daemon needed for tests + buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs + vala libsecret libxml2 libsoup nspr nss intltool db ]; + nativeBuildInputs = [ pkgconfig ]; + + configureFlags = "--disable-fatal-warnings"; + + NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss" + "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"]; + + enableParallelBuilding = true; + + postBuild = "rm -rf $out/share/gtk-doc"; + + meta = { + description = "Folks"; + + homepage = https://wiki.gnome.org/Projects/Folks; + + license = "LGPLv2+"; + + maintainers = with stdenv.lib.maintainers; [ lethalman ]; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix new file mode 100644 index 00000000000..47dae0486e9 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3, glib, libxml2 +, intltool, polkit, orbit }: + +stdenv.mkDerivation rec { + + versionMajor = "3.2"; + versionMinor = "6"; + moduleName = "GConf"; + + origName = "${moduleName}-${versionMajor}.${versionMinor}"; + + name = "gconf-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz"; + sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"; + }; + + buildInputs = [ libxml2 polkit gnome3.gtk orbit ]; + propagatedBuildInputs = [ glib dbus_glib ]; + nativeBuildInputs = [ pkgconfig intltool ]; + + # ToDo: ldap reported as not found but afterwards reported as supported + + meta = with stdenv.lib; { + homepage = http://projects.gnome.org/gconf/; + description = "A system for storing application preferences"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix new file mode 100644 index 00000000000..a1fdd471282 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib +, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk +, gobjectIntrospection, makeWrapper }: + +stdenv.mkDerivation rec { + name = "gcr-3.10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gcr/3.10/${name}.tar.xz"; + sha256 = "0nv470a8cvw4rw49hf5aqvll1rpkacmsr3pj8s1l205yaid4yvq0"; + }; + + buildInputs = [ + pkgconfig intltool gnupg p11_kit glib gobjectIntrospection + libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper + ]; + + #doCheck = true; + + preFixup = '' + wrapProgram "$out/bin/gcr-viewer" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix new file mode 100644 index 00000000000..3df5ab40eaf --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountservice, libX11 +, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gdm-3.10.0.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gdm/3.10/${name}.tar.xz"; + sha256 = "1rva3djas48m8w1gyv3nds3jxfkirdfl0bk30x79mizrk80456jl"; + }; + + buildInputs = [ pkgconfig glib itstool libxml2 intltool accountservice + gobjectIntrospection libX11 gtk libcanberra_gtk3 pam libtool ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix new file mode 100644 index 00000000000..d3b21bef167 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix @@ -0,0 +1,20 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }: + + +stdenv.mkDerivation rec { + name = "geocode-glib-3.10.0"; + + + src = fetchurl { + url = "mirror://gnome/sources/geocode-glib/3.10/${name}.tar.xz"; + sha256 = "0dx6v9n4dsskcy6630s77cyb32xlykdall0d555976warycc3v8a"; + }; + + buildInputs = with gnome3; + [ intltool pkgconfig glib libsoup json_glib ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix new file mode 100644 index 00000000000..429d147e728 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix @@ -0,0 +1,21 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_17, pango }: + + +stdenv.mkDerivation rec { + name = "gjs-1.38.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gjs/1.38/${name}.tar.xz"; + sha256 = "0xl1zc5ncaxqs5ww5j82rzqrg429l8pdapqclxiba7dxwyh6a83b"; + }; + + buildInputs = with gnome3; + [ gobjectIntrospection pkgconfig glib pango ]; + + propagatedBuildInputs = [ spidermonkey_17 ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix new file mode 100644 index 00000000000..3879b81859a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, pkgconfig, intltool }: + +stdenv.mkDerivation rec { + name = "gnome-backgrounds-3.10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-backgrounds/3.10/${name}.tar.xz"; + sha256 = "11rv03m4hznpx0brf47hil04199z3jjvl1aq7q0lnill3yrffiyc"; + }; + + nativeBuildInputs = [ pkgconfig intltool ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix new file mode 100644 index 00000000000..205961a9171 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix @@ -0,0 +1,36 @@ +{ stdenv, intltool, fetchurl, pkgconfig, libxml2 +, bash, gtk3, glib, hicolor_icon_theme, makeWrapper +, itstool, gnome3, librsvg, gdk_pixbuf }: + +stdenv.mkDerivation rec { + name = "gnome-calculator-3.10.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-calculator/3.10/${name}.tar.xz"; + sha256 = "0gkddnk9x76895xrz0ps4yny36w62fhi459gwmxqqb9kx5934n1f"; + }; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; + + buildInputs = [ bash pkgconfig gtk3 glib intltool itstool + libxml2 gnome3.gtksourceview + gnome3.gsettings_desktop_schemas makeWrapper ]; + + preFixup = '' + wrapProgram "$out/bin/gnome-calculator" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/action/show/Apps/Calculator; + description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix new file mode 100644 index 00000000000..12b2510dc43 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, which, autoconf, automake }: + +stdenv.mkDerivation rec { + name = "gnome-common-3.10.0"; + + src = fetchurl { + url = "https://download.gnome.org/sources/gnome-common/3.10/${name}.tar.xz"; + sha256 = "aed69474a671e046523827f73ba5e936d57235b661db97900db7356e1e03b0a3"; + }; + + patches = [(fetchurl { + url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935"; + sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl"; + })]; + + propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch new file mode 100644 index 00000000000..926762defbd --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch @@ -0,0 +1,10 @@ +--- configure.ac.orig 2014-04-08 10:25:49.497620879 +0200 ++++ configure.ac 2014-04-08 10:26:36.639440950 +0200 +@@ -43,6 +43,7 @@ + folks-telepathy + folks-eds + libnotify ++ dbus-glib-1 + telepathy-glib >= 0.17.5 + libebook-1.2 >= 3.5.3 + libedataserver-1.2 >= 3.5.3 diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix new file mode 100644 index 00000000000..f8059f952e6 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix @@ -0,0 +1,51 @@ +{ stdenv, intltool, fetchurl, evolution_data_server, db +, pkgconfig, gtk3, glib, hicolor_icon_theme, libsecret +, bash, makeWrapper, itstool, folks, libnotify, libxml2 +, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss +, libsoup, vala, dbus_glib, automake114x, autoconf }: + +stdenv.mkDerivation rec { + name = "gnome-contacts-3.10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-contacts/3.10/${name}.tar.xz"; + sha256 = "e119c32bb10136e7190f11f79334fa82ed56468cff5bb7836da0ebf7b572779b"; + }; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; + + # force build from vala + preBuild = '' + touch src/*.vala + ''; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server + gnome3.gsettings_desktop_schemas makeWrapper file libnotify + folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib + libxml2 libsoup gnome3.gnome_online_accounts nspr nss + vala automake114x autoconf db ]; + + preFixup = '' + for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do + wrapProgram $f \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + done + ''; + + patches = [ ./configure_dbus_glib.patch ./fix_row_selected.patch ]; + + patchFlags = "-p0"; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Contacts; + description = "Contacts is GNOME's integrated address book"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/fix_row_selected.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/fix_row_selected.patch new file mode 100644 index 00000000000..b379b4b8ee9 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/fix_row_selected.patch @@ -0,0 +1,11 @@ +--- src/contacts-view.vala.orig 2014-04-08 11:35:36.302252460 +0200 ++++ src/contacts-view.vala 2014-04-08 11:37:37.045343221 +0200 +@@ -265,7 +265,7 @@ + data.destroy (); + } + +- public override void row_selected (ListBoxRow row) { ++ public override void row_selected (ListBoxRow? row) { + var data = row as ContactDataRow; + var contact = data != null ? data.contact : null; + selection_changed (contact); diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix new file mode 100644 index 00000000000..1222f03d66e --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix @@ -0,0 +1,62 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper +, libcanberra, accountservice, libpwquality, pulseaudio, fontconfig +, gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify +, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk +, cracklib, python, krb5, networkmanagerapplet, networkmanager +, libwacom, samba, shared_mime_info, tzdata, icu, libtool +, docbook_xsl, docbook_xsl_ns, modemmanager }: + +# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules +# TODO: bluetooth, wacom, smbclient, printers + +stdenv.mkDerivation rec { + name = "gnome-control-center-3.10.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-control-center/3.10/${name}.tar.xz"; + sha256 = "1ac34kqkf174w0qc12p927dfhcm69xnv7fqzmbhjab56rn49wypn"; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.libgnomekbd ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; + + enableParallelBuilding = true; + + buildInputs = with gnome3; + [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas + libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus + gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality + accountservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile + shared_mime_info icu libtool docbook_xsl docbook_xsl_ns + networkmanager modemmanager makeWrapper ]; + + preBuild = '' + substituteInPlace tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" + substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" + + # hack to make test-endianess happy + mkdir -p $out/share/locale + substituteInPlace panels/datetime/test-endianess.c --replace "/usr/share/locale/" "$out/share/locale/" + ''; + + preFixup = with gnome3; '' + wrapProgram $out/bin/gnome-control-center \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${gnome_settings_daemon}/share:${glib}/share:${gtk}/share:${colord}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + for i in $out/share/applications/*; do + substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" + done + + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + patches = [ ./search_providers_dir.patch ]; + + meta = with stdenv.lib; { + description = "Single sign-on framework for GNOME"; + maintainers = with maintainers; [ lethalman ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch new file mode 100644 index 00000000000..7f5ad970f34 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch @@ -0,0 +1,17 @@ +diff --git a/panels/search/cc-search-panel.c b/panels/search/cc-search-panel.c +index d08e230..3bff4ad 100644 +--- a/panels/search/cc-search-panel.c ++++ b/panels/search/cc-search-panel.c +@@ -574,7 +574,11 @@ populate_search_providers (CcSearchPanel *self) + { + GFile *providers_location; + +- providers_location = g_file_new_for_path (DATADIR "/gnome-shell/search-providers"); ++ const gchar* search_providers_dir = g_getenv ("GNOME_SEARCH_PROVIDERS_DIR"); ++ if (search_providers_dir == NULL) { ++ search_providers_dir = DATADIR "/gnome-shell/search-providers"; ++ } ++ providers_location = g_file_new_for_path (search_providers_dir); + g_file_enumerate_children_async (providers_location, + "standard::type,standard::name,standard::content-type", + G_FILE_QUERY_INFO_NONE, diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix new file mode 100644 index 00000000000..584705d658e --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib +, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland +, gobjectIntrospection }: + +stdenv.mkDerivation rec { + + majorVersion = "3.10"; + minorVersion = "1"; + name = "gnome-desktop-${majorVersion}.${minorVersion}"; + + # this should probably be setuphook for glib + NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; + + enableParallelBuilding = true; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-desktop/${majorVersion}/${name}.tar.xz"; + sha256 = "0hdvm909lbpnixqv11qdx9iaycx4dpxys46fa128bqp8alisgb0h"; + }; + + buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 xkeyboard_config isocodes itstool wayland + gtk3 glib intltool gnome_doc_utils libxkbfile gnome3.gsettings_desktop_schemas gobjectIntrospection ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix new file mode 100644 index 00000000000..6f68916b781 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix @@ -0,0 +1,38 @@ +{ stdenv, intltool, fetchurl +, pkgconfig, gtk3, glib, hicolor_icon_theme +, bash, makeWrapper, itstool, libxml2 +, gnome3, librsvg, gdk_pixbuf, file }: + +stdenv.mkDerivation rec { + name = "gnome-dictionary-3.10.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-dictionary/3.10/${name}.tar.xz"; + sha256 = "258b60fe50f7d0580a7dc3bb83f7fe2f6f0597d4013d97ac083c3f062c350ed7"; + }; + + doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file + gnome3.gsettings_desktop_schemas makeWrapper ]; + + preFixup = '' + wrapProgram "$out/bin/gnome-dictionary" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Dictionary; + description = "Dictionary is the GNOME application to look up definitions"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix new file mode 100644 index 00000000000..334471c2943 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix @@ -0,0 +1,42 @@ +{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread +, bash, gtk3, glib, hicolor_icon_theme, makeWrapper, cracklib, libnotify +, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python +, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }: + +stdenv.mkDerivation rec { + name = "gnome-disk-utility-3.10.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-disk-utility/3.10/${name}.tar.xz"; + sha256 = "1amqi2bribxn8r8k8mvxh3710rmdll9963smf0v59v0iwxi3mqil"; + }; + + doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme + librsvg udisks2 gnome3.gnome_settings_daemon + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; + + buildInputs = [ bash pkgconfig gtk3 glib intltool itstool + libxslt libtool libsecret libpwquality cracklib + libnotify libdvdread libcanberra_gtk3 docbook_xsl + gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; + + preFixup = '' + wrapProgram "$out/bin/gnome-disks" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = with stdenv.lib; { + homepage = http://en.wikipedia.org/wiki/GNOME_Disks; + description = "A udisks graphical front-end"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix new file mode 100644 index 00000000000..cba651ca36a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix @@ -0,0 +1,37 @@ +{ stdenv, intltool, fetchurl +, pkgconfig, gtk3, glib, hicolor_icon_theme +, bash, makeWrapper, itstool +, gnome3, librsvg, gdk_pixbuf }: + +stdenv.mkDerivation rec { + name = "gnome-font-viewer-3.10.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-font-viewer/3.10/${name}.tar.xz"; + sha256 = "3928350f58ac6c95f44b64cba1a5f03437b19d9b2645a7b01176067504fdd652"; + }; + + doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop + gnome3.gsettings_desktop_schemas makeWrapper ]; + + preFixup = '' + wrapProgram "$out/bin/gnome-font-viewer" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + description = "Program that can preview fonts and create thumbnails for fonts"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix new file mode 100644 index 00000000000..feb3d84b994 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, iconnamingutils, gtk }: + +stdenv.mkDerivation rec { + name = "gnome-icon-theme-symbolic-3.10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-icon-theme-symbolic/3.10/${name}.tar.xz"; + sha256 = "344e88e5f9dac3184bf012d9bac972110df2133b93d76f2ad128d4c9cbf41412"; + }; + + configureFlags = "--enable-icon-mapping"; + + # Avoid postinstall make hooks + installPhase = '' + make install-exec-am install-data-local install-pkgconfigDATA + make -C src install + ''; + + buildInputs = [ pkgconfig iconnamingutils gtk gnome3.gnome_icon_theme ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix new file mode 100644 index 00000000000..5b16f827ae0 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk }: + +stdenv.mkDerivation rec { + name = "gnome-icon-theme-3.10.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-icon-theme/3.10/${name}.tar.xz"; + sha256 = "1xinbgkkvlhazj887ajcl13i7kdc1wcca02jwxzvjrvchjsp4m66"; + }; + + setupHook = ./setup-hook.sh; + + nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/setup-hook.sh b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/setup-hook.sh new file mode 100644 index 00000000000..d7156f3d463 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/setup-hook.sh @@ -0,0 +1,10 @@ +make_gtk_applications_find_icon_themes() { + + # where to find icon themes + if [ -d "$1/share/icons" ]; then + addToSearchPath XDG_ICON_DIRS $1/share + fi + +} + +envHooks+=(make_gtk_applications_find_icon_themes) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix new file mode 100644 index 00000000000..dbb8da93c6c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt +, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper +, docbook_xsl_ns, docbook_xsl, gnome3 }: + +stdenv.mkDerivation rec { + name = "gnome-keyring-3.10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-keyring/3.10/${name}.tar.xz"; + sha256 = "1y6v2p14jx5h6yh14c53pd8r0r5zbmcgw8v4nxvf94kd9jliy00q"; + }; + + buildInputs = with gnome3; [ + dbus libgcrypt pam python gtk3 gconf libgnome_keyring + pango gcr gdk_pixbuf atk p11_kit makeWrapper + ]; + + propagatedBuildInputs = [ glib libtasn1 libxslt ]; + + nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ]; + + configureFlags = [ + "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path + "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories + "--with-pkcs11-modules=$$out/lib/pkcs11/" + ]; + + preFixup = '' + wrapProgram "$out/bin/gnome-keyring" \ + --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + wrapProgram "$out/bin/gnome-keyring-daemon" \ + --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix new file mode 100644 index 00000000000..37d2ea1c086 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gnome-menus-${version}"; + version = "3.10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz"; + sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6"; + }; + + makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; + + preBuild = "patchShebangs ./scripts"; + + buildInputs = [ intltool pkgconfig glib gobjectIntrospection ]; + + meta = { + homepage = "http://www.gnome.org"; + description = "Gnome menu specification"; + + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix new file mode 100644 index 00000000000..8c459435733 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, webkitgtk, json_glib, rest, libsecret, dbus_glib +, telepathy_glib, intltool, dbus_libs, icu, libsoup, docbook_xsl_ns, docbook_xsl +}: + +stdenv.mkDerivation rec { + name = "gnome-online-accounts-3.10.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-online-accounts/3.10/${name}.tar.xz"; + sha256 = "15qvw40dmi886491s3abpidsm2lx65fhglhj99bvcdskhk0ih90b"; + }; + + NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0"; + + enableParallelBuilding = true; + + buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest libsecret dbus_glib telepathy_glib intltool icu libsoup docbook_xsl_ns docbook_xsl]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix new file mode 100644 index 00000000000..4c904bf40f6 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2 +, libsoup, json_glib, gmp, openssl, makeWrapper }: + +stdenv.mkDerivation rec { + name = "gnome-online-miners-3.10.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-online-miners/3.10/${name}.tar.xz"; + sha256 = "129807d398e7744870110e6875629b6858d289021271550569ce5afa10fe9ea8"; + }; + + doCheck = true; + + buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl + gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins + gnome3.gnome_online_accounts makeWrapper + gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ]; + + enableParallelBuilding = true; + + preFixup = '' + for f in $out/libexec/*; do + wrapProgram "$f" \ + --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" + done + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners; + description = "A set of crawlers that go through your online content and index them locally in Tracker"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix new file mode 100644 index 00000000000..7b94d0f9027 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix @@ -0,0 +1,37 @@ +{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3 +, bash, gtk3, glib, hicolor_icon_theme, makeWrapper +, itstool, gnome3, librsvg, gdk_pixbuf }: + +stdenv.mkDerivation rec { + name = "gnome-screenshot-3.10.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-screenshot/3.10/${name}.tar.xz"; + sha256 = "1nb56kzcj5z4hmrmxap5r53smi52ki3pc8qmhi4rymkgqswyk7bh"; + }; + + doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; + + buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 + gnome3.gsettings_desktop_schemas makeWrapper ]; + + preFixup = '' + wrapProgram "$out/bin/gnome-screenshot" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot; + description = "Utility used in the GNOME desktop environment for taking screenshots"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix new file mode 100644 index 00000000000..f999702af54 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix @@ -0,0 +1,30 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower +, libxslt, intltool, makeWrapper, systemd }: + + +stdenv.mkDerivation rec { + name = "gnome-session-3.10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-session/3.10/${name}.tar.xz"; + sha256 = "1k59yss7r748nvr0cdjrqmx0zy26b93rfn66lsdg9fz60x77087n"; + }; + + configureFlags = "--enable-systemd"; + + buildInputs = with gnome3; + [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt + gnome3.gnome_settings_daemon + gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ]; + + preFixup = '' + wrapProgram "$out/bin/gnome-session" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix new file mode 100644 index 00000000000..7a50b8db56f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix @@ -0,0 +1,34 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst +, libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit +, geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool +, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus }: + +stdenv.mkDerivation rec { + name = "gnome-settings-daemon-3.10.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-settings-daemon/3.10/${name}.tar.xz"; + sha256 = "0r42lzlgk0w40ws4d3s7yayn6n8zqlnh5b6k88gvgv1lwk39k240"; + }; + + # fatal error: gio/gunixfdlist.h: No such file or directory + NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; + + buildInputs = with gnome3; + [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas libnotify gnome_desktop + lcms2 libXtst libxkbfile pulseaudio libcanberra_gtk3 upower colord libgweather + polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt + libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ]; + + preFixup = '' + wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix PATH : "${glib}/bin" \ + --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix new file mode 100644 index 00000000000..00974edb1db --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix @@ -0,0 +1,26 @@ +{ stdenv, intltool, fetchurl, libgtop +, pkgconfig, gtk3, glib, hicolor_icon_theme +, bash, makeWrapper, itstool +, gnome3, file }: + +stdenv.mkDerivation rec { + name = "gnome-shell-extensions-3.10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-shell-extensions/3.10/${name}.tar.xz"; + sha256 = "9baa9ddaf4e14cab6d4d7944d8dc009378b25f995acfd0fd72843f599cb5ae43"; + }; + + doCheck = true; + + buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool + makeWrapper file ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions; + description = "Modify and extend GNOME Shell functionality and behavior"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix new file mode 100644 index 00000000000..554b09a1e59 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix @@ -0,0 +1,48 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret +, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns +, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip +, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper +, accountservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: + +# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup + +stdenv.mkDerivation rec { + name = "gnome-shell-3.10.2.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-shell/3.10/${name}.tar.xz"; + sha256 = "0k642y6h878v6mczx4z1zj4pjl7z4bvq02raxxwxkjyvyz2fv36j"; + }; + + buildInputs = with gnome3; + [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountservice + libcroco intltool libsecret pkgconfig python libsoup polkit libcanberra gdk_pixbuf librsvg + clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns + libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server + libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm gnome_control_center + at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ]; + + preBuild = '' + patchShebangs src/data-to-c.pl + substituteInPlace data/Makefile --replace " install-keysDATA" "" + ''; + + preFixup = with gnome3; '' + wrapProgram "$out/bin/gnome-shell" \ + --prefix PATH : "${unzip}/bin" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix LD_LIBRARY_PATH : "${accountservice}/lib:${ibus}/lib:${gdm}/lib" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:${gtk}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + + wrapProgram "$out/libexec/gnome-shell-calendar-server" \ + --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + patches = [ ./fix_background_corruption.patch ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/fix_background_corruption.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/fix_background_corruption.patch new file mode 100644 index 00000000000..9cb041bcce2 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/fix_background_corruption.patch @@ -0,0 +1,147 @@ +commit 831bd07b0d6b7055fea8317f2cdf8fd4a408c36d +Author: Jasper St. Pierre +Date: Thu Nov 7 17:14:47 2013 -0500 + + layout: Fix several issues with the background management code + + If monitor-changed fires at startup, it will destroy all of the + backgrounds, but since this._isStartup is true, won't recreate any + of them. Additionally, since _bgManagers is indexed by monitor index, + if the primary index is not 0, it could become a sparse array (e.g. + [undefined, undefined, primaryBackground]), and our for loop will + crash trying to access properties of undefined. + + Fix both of these issues by always creating background managers for + every monitor, hiding them on startup but only showing them after + the startup animation is complete. + + One thing we need to watch out for is that while LayoutManager is + constructing, Main.uiGroup / Main.layoutManager will be undefined, + so addBackgroundMenu will fail. Fix this by passing down the uiGroup + to the background menu code. + + https://bugzilla.gnome.org/show_bug.cgi?id=709313 + +diff --git a/js/ui/backgroundMenu.js b/js/ui/backgroundMenu.js +index 06e698c..dcbbb39 100644 +--- a/js/ui/backgroundMenu.js ++++ b/js/ui/backgroundMenu.js +@@ -13,7 +13,7 @@ const BackgroundMenu = new Lang.Class({ + Name: 'BackgroundMenu', + Extends: PopupMenu.PopupMenu, + +- _init: function(source) { ++ _init: function(source, layoutManager) { + this.parent(source, 0, St.Side.TOP); + + this.addSettingsAction(_("Settings"), 'gnome-control-center.desktop'); +@@ -22,17 +22,17 @@ const BackgroundMenu = new Lang.Class({ + + this.actor.add_style_class_name('background-menu'); + +- Main.uiGroup.add_actor(this.actor); ++ layoutManager.uiGroup.add_actor(this.actor); + this.actor.hide(); + } + }); + +-function addBackgroundMenu(actor) { ++function addBackgroundMenu(actor, layoutManager) { + let cursor = new St.Bin({ opacity: 0 }); +- Main.uiGroup.add_actor(cursor); ++ layoutManager.uiGroup.add_actor(cursor); + + actor.reactive = true; +- actor._backgroundMenu = new BackgroundMenu(cursor); ++ actor._backgroundMenu = new BackgroundMenu(cursor, layoutManager); + actor._backgroundManager = new PopupMenu.PopupMenuManager({ actor: actor }); + actor._backgroundManager.addMenu(actor._backgroundMenu); + +diff --git a/js/ui/layout.js b/js/ui/layout.js +index 17073a6..80bae9d 100644 +--- a/js/ui/layout.js ++++ b/js/ui/layout.js +@@ -352,26 +352,26 @@ const LayoutManager = new Lang.Class({ + this.emit('hot-corners-changed'); + }, + +- _createBackground: function(monitorIndex) { ++ _addBackgroundMenu: function(bgManager) { ++ BackgroundMenu.addBackgroundMenu(bgManager.background.actor, this); ++ }, ++ ++ _createBackgroundManager: function(monitorIndex) { + let bgManager = new Background.BackgroundManager({ container: this._backgroundGroup, + layoutManager: this, + monitorIndex: monitorIndex }); +- BackgroundMenu.addBackgroundMenu(bgManager.background.actor); +- +- bgManager.connect('changed', Lang.bind(this, function() { +- BackgroundMenu.addBackgroundMenu(bgManager.background.actor); +- })); + +- this._bgManagers[monitorIndex] = bgManager; ++ bgManager.connect('changed', Lang.bind(this, this._addBackgroundMenu)); ++ this._addBackgroundMenu(bgManager); + +- return bgManager.background; ++ return bgManager; + }, + +- _createSecondaryBackgrounds: function() { ++ _showSecondaryBackgrounds: function() { + for (let i = 0; i < this.monitors.length; i++) { + if (i != this.primaryIndex) { +- let background = this._createBackground(i); +- ++ let background = this._bgManagers[i].background; ++ background.actor.show(); + background.actor.opacity = 0; + Tweener.addTween(background.actor, + { opacity: 255, +@@ -381,10 +381,6 @@ const LayoutManager = new Lang.Class({ + } + }, + +- _createPrimaryBackground: function() { +- this._createBackground(this.primaryIndex); +- }, +- + _updateBackgrounds: function() { + let i; + for (i = 0; i < this._bgManagers.length; i++) +@@ -395,11 +391,12 @@ const LayoutManager = new Lang.Class({ + if (Main.sessionMode.isGreeter) + return; + +- if (this._startingUp) +- return; +- + for (let i = 0; i < this.monitors.length; i++) { +- this._createBackground(i); ++ let bgManager = this._createBackgroundManager(i); ++ this._bgManagers.push(bgManager); ++ ++ if (i != this.primaryIndex && this._startingUp) ++ bgManager.background.actor.hide(); + } + }, + +@@ -595,7 +592,7 @@ const LayoutManager = new Lang.Class({ + if (Main.sessionMode.isGreeter) { + this.panelBox.translation_y = -this.panelBox.height; + } else { +- this._createPrimaryBackground(); ++ this._updateBackgrounds(); + + // We need to force an update of the regions now before we scale + // the UI group to get the coorect allocation for the struts. +@@ -673,7 +670,7 @@ const LayoutManager = new Lang.Class({ + this.keyboardBox.show(); + + if (!Main.sessionMode.isGreeter) { +- this._createSecondaryBackgrounds(); ++ this._showSecondaryBackgrounds(); + global.window_group.remove_clip(); + } + diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix new file mode 100644 index 00000000000..cdc4b732b97 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix @@ -0,0 +1,38 @@ +{ stdenv, intltool, fetchurl, pkgconfig +, bash, gtk3, glib, hicolor_icon_theme, makeWrapper +, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }: + +stdenv.mkDerivation rec { + name = "gnome-system-log-3.9.90"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz"; + sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411"; + }; + + doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; + + buildInputs = [ bash pkgconfig gtk3 glib intltool itstool + gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; + + preFixup = '' + wrapProgram "$out/bin/gnome-system-log" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = with stdenv.lib; { + homepage = https://help.gnome.org/users/gnome-system-log/3.9/; + description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix new file mode 100644 index 00000000000..91fbe67957f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix @@ -0,0 +1,38 @@ +{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2 +, bash, gtk3, glib, hicolor_icon_theme, makeWrapper +, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }: + +stdenv.mkDerivation rec { + name = "gnome-system-monitor-3.10.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-system-monitor/3.10/${name}.tar.xz"; + sha256 = "bd009e15672afe4ad3ebd7ed286cce79b9f76420fd39bc77a5826b29134b9db0"; + }; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; + + buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 + gtkmm3 libgtop makeWrapper + gnome3.gsettings_desktop_schemas ]; + + preFixup = '' + wrapProgram "$out/bin/gnome-system-monitor" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://help.gnome.org/users/gnome-system-monitor/3.10/; + description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix new file mode 100644 index 00000000000..541db5720db --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango +, gnome_doc_utils, intltool, libX11, which, gconf, libuuid +, desktop_file_utils, itstool, ncurses, makeWrapper }: + +stdenv.mkDerivation rec { + + versionMajor = "3.10"; + versionMinor = "2"; + + name = "gnome-terminal-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-terminal/${versionMajor}/${name}.tar.xz"; + sha256 = "04yrk9531f373nl64jx3pczsnq7a56mj3n436jbhjp74kp12fa70"; + }; + + buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte + gnome3.dconf gnome3.gconf itstool ncurses makeWrapper ]; + + nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ]; + + preFixup = '' + for f in "$out/libexec/gnome-terminal-migration" "$out/libexec/gnome-terminal-server"; do + wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" + done + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix new file mode 100644 index 00000000000..08d82b7ae91 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl, intltool, gtk3, librsvg, pkgconfig, pango, atk, gtk2, gdk_pixbuf }: + +stdenv.mkDerivation rec { + name = "gnome-themes-standard-3.10.0"; + src = fetchurl { + url = "mirror://gnome/sources/gnome-themes-standard/3.10/${name}.tar.xz"; + sha256 = "0f2b3ypkfvrdsxcvp14ja9wqj382f1p46yrjvhhxkkjgagy6qb41"; + }; + + buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix new file mode 100644 index 00000000000..d66863a2218 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }: + +stdenv.mkDerivation rec { + name = "gnome-user-docs-3.10.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-user-docs/3.10/${name}.tar.xz"; + sha256 = "960b6373ea52e41e3deb3501930e024005b29d2cc958bfadc87450a291d2a905"; + }; + + buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ]; + + meta = with stdenv.lib; { + homepage = https://help.gnome.org/users/gnome-help/3.10; + description = "User and system administration help for the Gnome desktop"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.cc-by-30; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix new file mode 100644 index 00000000000..976b0eaca45 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix @@ -0,0 +1,52 @@ +{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus +, pkgconfig, gtk3, glib, hicolor_icon_theme, libxml2, gnused +, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd +, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }: + +stdenv.mkDerivation rec { + name = "gnome-user-share-3.10.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-user-share/3.10/${name}.tar.xz"; + sha256 = "1d1ea57a49224c36e7cba04f80265e835639377f474a7582c9e8ac946eda0f8f"; + }; + + doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + preConfigure = '' + sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf + ''; + + configureFlags = [ "--with-httpd=${apacheHttpd_2_2}/bin/httpd" + "--with-modules-path=${apacheHttpd_2_2}/modules" + "--disable-bluetooth" + "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool + makeWrapper file gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic + nautilus libnotify libcanberra_gtk3 ]; + + postInstall = '' + mkdir -p $out/share/gsettings-schemas/$name + mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name + ${glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas + ''; + + preFixup = '' + wrapProgram "$out/libexec/gnome-user-share" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = with stdenv.lib; { + homepage = https://help.gnome.org/users/gnome-user-share/3.8; + description = "Service that exports the contents of the Public folder in your home directory on the local network"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix new file mode 100644 index 00000000000..a8a1c244767 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite +, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av +, gmime, json_glib, avahi, tracker, itstool }: + +stdenv.mkDerivation rec { + name = "grilo-plugins-0.2.12"; + + src = fetchurl { + url = "mirror://gnome/sources/grilo-plugins/0.2/${name}.tar.xz"; + sha256 = "15bed8a633c81b251920ab677d455433e641388f605277ca88e549cc89012b48"; + }; + + installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-0.2" ]; + + buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata + lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts + gnome3.totem-pl-parser gnome3.rest gmime json_glib + avahi gnome3.libmediaart tracker intltool itstool ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/action/show/Projects/Grilo; + description = "A collection of plugins for the Grilo framework"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix new file mode 100644 index 00000000000..6f1bfbbcfe9 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, file, intltool, glib +, libxml2, gnome3, gobjectIntrospection, libsoup }: + +stdenv.mkDerivation rec { + name = "grilo-0.2.10"; + + src = fetchurl { + url = "mirror://gnome/sources/grilo/0.2/${name}.tar.xz"; + sha256 = "559a2470fe541b0090bcfdfac7a33e92dba967727bbab6d0eca70e5636a77b25"; + }; + + configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ]; + + preConfigure = '' + for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do + substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/" + substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0" + done + ''; + + buildInputs = [ pkgconfig file intltool glib libxml2 libsoup + gnome3.totem-pl-parser gobjectIntrospection ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/action/show/Projects/Grilo; + description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix new file mode 100644 index 00000000000..13f357db29a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection + # just for passthru +, gtk3, gsettings_desktop_schemas }: + +stdenv.mkDerivation rec { + + versionMajor = "3.10"; + versionMinor = "1"; + moduleName = "gsettings-desktop-schemas"; + + name = "${moduleName}-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + sha256 = "04b8wy10l6pzs5928gnzaia73dz5fjlcdy39xi3mf50ajv27h8s5"; + }; + + buildInputs = [ glib gobjectIntrospection ]; + + nativeBuildInputs = [ pkgconfig intltool ]; + + passthru = { + doCompileSchemas = '' + for pkg in "${gsettings_desktop_schemas}" "${gtk3}"; do + cp -s $pkg/share/glib-2.0/schemas/*.gschema.xml $out/share/glib-2.0/schemas/ + done + ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ + ''; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix new file mode 100644 index 00000000000..900bb2c922b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango +, libxml2Python, perl, intltool, gettext }: + +stdenv.mkDerivation rec { + name = "gtksourceview-${version}"; + version = "3.10.1"; + + src = fetchurl { + url = "https://download.gnome.org/sources/gtksourceview/3.10/gtksourceview-${version}.tar.xz"; + sha256 = "008bzfr1s6ywpj8c8qx7495lz9g0ziccwbxg88s0l4dl6bw49piq"; + }; + + buildInputs = [ pkgconfig atk cairo glib gtk3 pango + libxml2Python perl intltool gettext ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix new file mode 100644 index 00000000000..a6bf72b2fc7 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix @@ -0,0 +1,40 @@ +{ stdenv, intltool, fetchurl, pkgconfig, gtk3 +, glib, desktop_file_utils, bash +, makeWrapper, gnome3, file, itstool, libxml2 }: + +# TODO: icons and theme still does not work +# use packaged gnome3.gnome_icon_theme_symbolic + +stdenv.mkDerivation rec { + name = "gucharmap-3.10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gucharmap/3.10/${name}.tar.xz"; + sha256 = "04e8606c65adb14d267b50b1cf9eb4fee92bd9c5ab512a346bd4c9c686403f78"; + }; + + configureFlags = [ "--disable-static" ]; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; + + buildInputs = [ pkgconfig gtk3 intltool itstool glib + gnome3.yelp_tools libxml2 file desktop_file_utils + gnome3.gsettings_desktop_schemas makeWrapper ]; + + preFixup = '' + wrapProgram "$out/bin/gucharmap" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Gucharmap; + description = "GNOME Character Map, based on the Unicode Character Database"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix new file mode 100644 index 00000000000..e5f6a0aa9b8 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, glib }: + +stdenv.mkDerivation rec { + name = "libcroco-0.6.8"; + + src = fetchurl { + url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz"; + sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa"; + }; + + configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; + + buildInputs = [ pkgconfig libxml2 glib ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix new file mode 100644 index 00000000000..9a1a45e0d1a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib +, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl }: + +stdenv.mkDerivation rec { + name = "libgdata-0.14.0"; + + src = fetchurl { + url = "mirror://gnome/sources/libgdata/0.14/${name}.tar.xz"; + sha256 = "1scjs944kjazbsh86kdj6w2vprib6yd3wzxzabcs59acmr0m4hax"; + }; + + NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1"; + + buildInputs = with gnome3; + [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection + liboauth gcr gnome_online_accounts p11_kit openssl ]; + + meta = with stdenv.lib; { + description = "GData API library"; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix new file mode 100644 index 00000000000..c7ed541082d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }: +let + ver_maj = "0.12"; + ver_min = "0"; +in +stdenv.mkDerivation rec { + name = "libgee-${ver_maj}.${ver_min}"; + + src = fetchurl { + url = "https://download.gnome.org/sources/libgee/${ver_maj}/${name}.tar.xz"; + sha256 = "19bf94ia1h5z8h0hdhwcd2b2p6ngffirg0dai7pdb98dzriys1ni"; + }; + + doCheck = true; + + patches = [ ./fix_introspection_paths.patch ]; + + buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ]; + + meta = with stdenv.lib; { + description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch new file mode 100644 index 00000000000..67003f45164 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch @@ -0,0 +1,13 @@ +--- fix_introspection_paths.patch/configure 2014-01-07 17:43:53.521339338 +0000 ++++ fix_introspection_paths.patch/configure-fix 2014-01-07 17:45:11.068635069 +0000 +@@ -12085,8 +12085,8 @@ + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` +- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` +- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" ++ INTROSPECTION_GIRDIR="${datadir}/gir-1.0" ++ INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0" + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection diff --git a/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix new file mode 100644 index 00000000000..28c7b80c0d4 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "libgnome-keyring-3.10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/libgnome-keyring/3.10/${name}.tar.xz"; + sha256 = "0wip88r91kwx4zp6sc9b38mnlv11grgl4k2kzsd3a8x83c9g2b05"; + }; + + propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ]; + nativeBuildInputs = [ pkgconfig intltool ]; + + meta = { + description = "Framework for managing passwords and other secrets"; + homepage = http://live.gnome.org/GnomeKeyring; + # TODO license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; + inherit (glib.meta) platforms maintainers; + + longDescription = '' + gnome-keyring is a program that keeps password and other secrets for + users. The library libgnome-keyring is used by applications to integrate + with the gnome-keyring system. + ''; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix new file mode 100644 index 00000000000..1156474e5a7 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper }: + +stdenv.mkDerivation rec { + name = "libgnomekbd-3.6.0"; + + src = fetchurl { + url = "mirror://gnome/sources/libgnomekbd/3.6/${name}.tar.xz"; + sha256 = "c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09"; + }; + + buildInputs = [ pkgconfig file intltool glib gtk3 libxklavier makeWrapper ]; + + preFixup = '' + wrapProgram $out/bin/gkbd-keyboard-display \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + description = "Keyboard management library"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix new file mode 100644 index 00000000000..c480a59e453 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf +, pango, gdk_pixbuf, atk, tzdata }: + +stdenv.mkDerivation rec { + name = "libgweather-3.10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/libgweather/3.10/${name}.tar.xz"; + sha256 = "1iyg0l90m14iw0ksjbmrrhb5fqn0y7x5f726y56gxd4qcxgpi3mf"; + }; + + makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; + + configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ]; + propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk ]; + nativeBuildInputs = [ pkgconfig intltool ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix new file mode 100644 index 00000000000..72d307f4f1a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff +, openssl, bzip2, acl, attr +}: + +stdenv.mkDerivation rec { + name = "libgxps-0.2.2"; + + src = fetchurl { + url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz"; + sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r"; + }; + + buildInputs = [ pkgconfig glib cairo libarchive freetype libjpeg libtiff acl openssl bzip2 attr]; + + configureFlags = "--without-liblcms2"; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix new file mode 100644 index 00000000000..9cf8426104b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, intltool +, glib, gtk3, gobjectIntrospection, python, pygobject3 +}: + +stdenv.mkDerivation rec { + name = "libpeas-${version}"; + version = "1.9.0"; + + buildInputs = [ + intltool pkgconfig + glib gtk3 gobjectIntrospection python pygobject3 + ]; + + src = fetchurl { + url = "mirror://gnome/sources/libpeas/1.9/${name}.tar.xz"; + sha256 = "13fzyzv6c0cfdj83z1s16lv8k997wpnzyzr0wfwcfkcmvz64g1q0"; + }; + + preFixup = '' + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = { + description = "A GObject-based plugins engine"; + homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/"; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix new file mode 100644 index 00000000000..e0e4c02c084 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }: + +stdenv.mkDerivation rec { + name = "libzapojit-0.0.3"; + + src = fetchurl { + url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz"; + sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; + }; + + buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix new file mode 100644 index 00000000000..0acfa9f36ae --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix @@ -0,0 +1,33 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo +, pango, cogl, clutter, libstartup_notification, libcanberra, zenity, libcanberra_gtk3 +, libtool, makeWrapper }: + + +stdenv.mkDerivation rec { + name = "mutter-3.10.2"; + + src = fetchurl { + url = "mirror://gnome/sources/mutter/3.10/${name}.tar.xz"; + sha256 = "000iclb96mgc4rp2q0cy72nfwyfzl6avijl9nmk87f5sgyy670a3"; + }; + + # fatal error: gio/gunixfdlist.h: No such file or directory + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra"; + + buildInputs = with gnome3; + [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower + gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra + libcanberra_gtk3 zenity libtool makeWrapper ]; + + preFixup = '' + wrapProgram "$out/bin/mutter" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix new file mode 100644 index 00000000000..2041a71a82c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif +, gtk, gnome3, libunique, intltool, gobjectIntrospection +, libnotify, makeWrapper, exempi, librsvg }: + +stdenv.mkDerivation rec { + name = "nautilus-3.10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/nautilus/3.10/${name}.tar.xz"; + sha256 = "09y7dxaw4bjgan3q10azky0h6kndqv2lfn75iip12zchf2hk59gn"; + }; + + configureFlags = [ "--enable-tracker=no" ]; + + buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg + gnome3.gnome_desktop gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.gsettings_desktop_schemas libnotify makeWrapper ]; + + preFixup = '' + wrapProgram "$out/bin/nautilus" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk}/share:${gnome3.gnome_icon_theme}:${gnome3.gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/rest/default.nix b/pkgs/desktops/gnome-3/3.12/core/rest/default.nix new file mode 100644 index 00000000000..f543f8e13b8 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/rest/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "rest-0.7.90"; + + src = fetchurl { + url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz"; + sha256 = "08n0cvz44l4b1gkmjryap3ysd0wcbbbdjbcar73nr52dmk52ls0x"; + }; + + buildInputs = [ pkgconfig glib libsoup gobjectIntrospection]; + + configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt"; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix new file mode 100644 index 00000000000..089b5cd03c1 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib +, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz +, webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1 +, gdk_pixbuf, librsvg, hicolor_icon_theme }: + +stdenv.mkDerivation rec { + name = "sushi-3.10.0"; + + src = fetchurl { + url = "mirror://gnome/sources/sushi/3.10/${name}.tar.xz"; + sha256 = "cffcf28b170f5825e84983a979972d4d901a453b61cbe3e560d362e8dd4b4bc8"; + }; + + propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; + + buildInputs = [ pkgconfig file intltool gobjectIntrospection glib + clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf librsvg + gnome3.gnome_icon_theme hicolor_icon_theme gnome3.gnome_icon_theme_symbolic + libmusicbrainz5 webkitgtk gnome3.evince icu makeWrapper ]; + + enableParallelBuilding = true; + + preFixup = '' + wrapProgram $out/libexec/sushi-start \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = "http://en.wikipedia.org/wiki/Sushi_(software)"; + description = "A quick previewer for Nautilus"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix new file mode 100644 index 00000000000..f1b3bfe53c1 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup }: + +stdenv.mkDerivation rec { + name = "totem-pl-parser-3.10.2"; + + src = fetchurl { + url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz"; + sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469"; + }; + + buildInputs = [ pkgconfig file intltool gmime libxml2 libsoup ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Videos; + description = "Simple GObject-based library to parse and save a host of playlist formats"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix new file mode 100644 index 00000000000..c6b78c827db --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix @@ -0,0 +1,49 @@ +{ stdenv, intltool, fetchurl, gst_all_1 +, clutter_gtk, clutter-gst, pygobject3, shared_mime_info +, pkgconfig, gtk3, glib, hicolor_icon_theme +, bash, makeWrapper, itstool, libxml2, dbus_glib +, gnome3, librsvg, gdk_pixbuf, file }: + +stdenv.mkDerivation rec { + name = "totem-3.10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/totem/3.10/${name}.tar.xz"; + sha256 = "b6b6038c9104965671a6d25e98496a487c3a9c590c9c104f668bd9f4fa7be9e2"; + }; + + doCheck = true; + + enableParallelBuilding = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo + clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins + gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad + gnome3.libpeas pygobject3 shared_mime_info dbus_glib + gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic + gnome3.gsettings_desktop_schemas makeWrapper file ]; + + preFixup = '' + wrapProgram "$out/bin/totem" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Videos; + description = "Movie player for the GNOME desktop based on GStreamer"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix new file mode 100644 index 00000000000..dbae108d2e9 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix @@ -0,0 +1,49 @@ +{ stdenv, intltool, fetchurl, libxml2, upower +, pkgconfig, gtk3, glib, hicolor_icon_theme +, bash, makeWrapper, itstool, vala, sqlite +, gnome3, librsvg, gdk_pixbuf, file, libnotify +, evolution_data_server, gst_all_1, poppler +, icu, taglib, libjpeg, libtiff, giflib, libcue +, libvorbis, flac, exempi, networkmanager +, libpng, libexif, libgsf, libuuid, bzip2 }: + +stdenv.mkDerivation rec { + name = "tracker-0.16.4"; + + src = fetchurl { + url = "mirror://gnome/sources/tracker/0.16/${name}.tar.xz"; + sha256 = "9c2f50839c2b8b352ab9a022597ef985c1900e6286c0c3bcb7a64da39dbb3580"; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + enableParallelBuilding = true; + + buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2 + bzip2 gnome3.totem-pl-parser + gnome3.gsettings_desktop_schemas makeWrapper file + gdk_pixbuf gnome3.gnome_icon_theme librsvg sqlite + upower libnotify evolution_data_server gnome3.libgee + gst_all_1.gstreamer gst_all_1.gst-plugins-base flac + poppler icu taglib libjpeg libtiff giflib libvorbis + exempi networkmanager libpng libexif libgsf libuuid + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; + + preFixup = '' + for f in $out/bin/* $out/libexec/*; do + wrapProgram $f \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + done + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/Tracker; + description = "Desktop-neutral user information store, search tool and indexer"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix b/pkgs/desktops/gnome-3/3.12/core/vino/default.nix new file mode 100644 index 00000000000..65668dce6a2 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/vino/default.nix @@ -0,0 +1,31 @@ +{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper +, libnotify, file }: + +stdenv.mkDerivation rec { + name = "vino-${versionMajor}.${versionMinor}"; + versionMajor = "3.10"; + versionMinor = "1"; + + src = fetchurl { + url = "mirror://gnome/sources/vino/${versionMajor}/${name}.tar.xz"; + sha256 = "0imyvz96b7kikikwxn1r5sfxwmi40523nd66gp9hrl23gik0vwgs"; + }; + + doCheck = true; + + buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify file makeWrapper ]; + + preFixup = '' + for f in "$out/bin/vino-passwd" "$out/libexec/vino-server"; do + wrapProgram $f --prefix XDG_DATA_DIRS : "${gtk3}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + done + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/action/show/Projects/Vino; + description = "GNOME desktop sharing server"; + maintainers = with maintainers; [ lethalman iElectric ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix new file mode 100644 index 00000000000..d98ddc716de --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection }: + +stdenv.mkDerivation rec { + + versionMajor = "0.35"; + versionMinor = "90"; + moduleName = "vte"; + + name = "${moduleName}-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + sha256 = "c47182d1724db479095b918898ce62297ec71988f24cd575506151c59f7b98cf"; + }; + + buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ]; + + configureFlags = ''--enable-introspection''; + + meta = { + homepage = http://www.gnome.org/; + description = "A library implementing a terminal emulator widget for GTK+"; + longDescription = '' + VTE is a library (libvte) implementing a terminal emulator widget for + GTK+, and a minimal sample application (vte) using that. Vte is + mainly used in gnome-terminal, but can also be used to embed a + console/terminal in games, editors, IDEs, etc. VTE supports Unicode and + character set conversion, as well as emulating any terminal known to + the system's terminfo database. + ''; + license = "LGPLv2"; + maintainers = with stdenv.lib.maintainers; [ astsmtl antono ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix new file mode 100644 index 00000000000..39ff3838f4a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: + +stdenv.mkDerivation rec { + name = "yelp-tools-3.10.0"; + + src = fetchurl { + url = "https://download.gnome.org/sources/yelp-tools/3.10/${name}.tar.xz"; + sha256 = "0496xyx1657db22ks3k92al64fp6236y5bgh7s7b0j8hcc112ppz"; + }; + + buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ]; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Yelp/Tools; + description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation"; + maintainers = with maintainers; [ iElectric ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix new file mode 100644 index 00000000000..c5060bdba75 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix @@ -0,0 +1,23 @@ +{ stdenv, intltool, fetchurl, pkgconfig, bash +, itstool, libxml2, libxslt }: + +stdenv.mkDerivation rec { + name = "yelp-xsl-3.10.1"; + + src = fetchurl { + url = "https://download.gnome.org/sources/yelp-xsl/3.10/${name}.tar.xz"; + sha256 = "59c6dee3999121f6ffd33a9c5228316b75bc22e3bd68fff310beb4eeff245887"; + }; + + doCheck = true; + + buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Yelp; + description = "Yelp's universal stylesheets for Mallard and DocBook"; + maintainers = with maintainers; [ lethalman ]; + # TODO license = [licenses.gpl2 licenses.lgpl2]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix new file mode 100644 index 00000000000..b58aa99721e --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix @@ -0,0 +1,36 @@ +{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib +, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf +, bash, makeWrapper, itstool, libxml2, libxslt, icu }: + +stdenv.mkDerivation rec { + name = "yelp-3.10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/yelp/3.10/${name}.tar.xz"; + sha256 = "17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816"; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedBuildInputs = [ librsvg gdk_pixbuf gnome3.gnome_icon_theme + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; + + preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; + + buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool + libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl + gnome3.gsettings_desktop_schemas ]; + + preFixup = '' + wrapProgram "$out/bin/yelp" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/yelp:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Yelp; + description = "Yelp is the help viewer in Gnome."; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix new file mode 100644 index 00000000000..366088c6729 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango +, gnome_doc_utils, intltool, libX11, which, itstool }: + +stdenv.mkDerivation rec { + + versionMajor = "3.8"; + versionMinor = "0"; + + name = "zenity-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/zenity/${versionMajor}/zenity-${versionMajor}.${versionMinor}.tar.xz"; + sha256 = "0gsnwvhsqqba5i6d4jh86j29q4q18hmvhj9c1v76vwlj2nvz1ywl"; + }; + + buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ]; + + nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix new file mode 100644 index 00000000000..e5c57903da0 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -0,0 +1,198 @@ +{ callPackage, pkgs }: + +rec { + inherit (pkgs) glib gtk2 gtk3 gnome2; + gnome3 = pkgs.gnome3_12; + gtk = gtk3; # just to be sure + libcanberra = pkgs.libcanberra_gtk3; # just to be sure + inherit (pkgs.gnome2) ORBit2; + orbit = ORBit2; + inherit (pkgs) libsoup; + +#### Core (http://ftp.acc.umu.se/pub/GNOME/core/) + + at_spi2_atk = callPackage ./core/at-spi2-atk { }; + + at_spi2_core = callPackage ./core/at-spi2-core { }; + + baobab = callPackage ./core/baobab { }; + + caribou = callPackage ./core/caribou { }; + + dconf = callPackage ./core/dconf { }; + + empathy = callPackage ./core/empathy { }; + + epiphany = callPackage ./core/epiphany { }; + + evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests + + evolution_data_server = callPackage ./core/evolution-data-server { }; + + gconf = callPackage ./core/gconf { }; + + geocode_glib = callPackage ./core/geocode-glib { }; + + gcr = callPackage ./core/gcr { }; # ToDo: tests fail + + gdm = callPackage ./core/gdm { }; + + gjs = callPackage ./core/gjs { }; + + gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; + + gnome-contacts = callPackage ./core/gnome-contacts { }; + + gnome_control_center = callPackage ./core/gnome-control-center { }; + + gnome-calculator = callPackage ./core/gnome-calculator { }; + + gnome_common = callPackage ./core/gnome-common { }; + + gnome_desktop = callPackage ./core/gnome-desktop { }; + + gnome-dictionary = callPackage ./core/gnome-dictionary { }; + + gnome-disk-utility = callPackage ./core/gnome-disk-utility { }; + + gnome-font-viewer = callPackage ./core/gnome-font-viewer { }; + + gnome_icon_theme = callPackage ./core/gnome-icon-theme { }; + + gnome_icon_theme_symbolic = callPackage ./core/gnome-icon-theme-symbolic { }; + + gnome-menus = callPackage ./core/gnome-menus { }; + + gnome_keyring = callPackage ./core/gnome-keyring { }; + + libgnome_keyring = callPackage ./core/libgnome-keyring { }; + + libgnomekbd = callPackage ./core/libgnomekbd { }; + + folks = callPackage ./core/folks { }; + + gnome_online_accounts = callPackage ./core/gnome-online-accounts { }; + + gnome-online-miners = callPackage ./core/gnome-online-miners { }; + + gnome_session = callPackage ./core/gnome-session { }; + + gnome_shell = callPackage ./core/gnome-shell { }; + + gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { }; + + gnome-screenshot = callPackage ./core/gnome-screenshot { }; + + gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { }; + + gnome-system-log = callPackage ./core/gnome-system-log { }; + + gnome-system-monitor = callPackage ./core/gnome-system-monitor { }; + + gnome_terminal = callPackage ./core/gnome-terminal { }; + + gnome_themes_standard = callPackage ./core/gnome-themes-standard { }; + + gnome-user-docs = callPackage ./core/gnome-user-docs { }; + + gnome-user-share = callPackage ./core/gnome-user-share { }; + + grilo = callPackage ./core/grilo { }; + + grilo-plugins = callPackage ./core/grilo-plugins { }; + + gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { }; + + gtksourceview = callPackage ./core/gtksourceview { }; + + gucharmap = callPackage ./core/gucharmap { }; + + gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; }; + + eog = callPackage ./core/eog { }; + + libcroco = callPackage ./core/libcroco {}; + + libgee = callPackage ./core/libgee { }; + + libgdata = callPackage ./core/libgdata { }; + + libgxps = callPackage ./core/libgxps { }; + + libpeas = callPackage ./core/libpeas {}; + + libgweather = callPackage ./core/libgweather { }; + + libzapojit = callPackage ./core/libzapojit { }; + + mutter = callPackage ./core/mutter { }; + + nautilus = callPackage ./core/nautilus { }; + + rest = callPackage ./core/rest { }; + + sushi = callPackage ./core/sushi { }; + + totem = callPackage ./core/totem { }; + + totem-pl-parser = callPackage ./core/totem-pl-parser { }; + + tracker = callPackage ./core/tracker { }; + + vte = callPackage ./core/vte { }; + + vino = callPackage ./core/vino { }; + + yelp = callPackage ./core/yelp { }; + + yelp_xsl = callPackage ./core/yelp-xsl { }; + + yelp_tools = callPackage ./core/yelp-tools { }; + + zenity = callPackage ./core/zenity { }; + + +#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) + + bijiben = callPackage ./apps/bijiben { }; + + evolution = callPackage ./apps/evolution { }; + + file-roller = callPackage ./apps/file-roller { }; + + gedit = callPackage ./apps/gedit { }; + + glade = callPackage ./apps/glade { }; + + gnome-clocks = callPackage ./apps/gnome-clocks { }; + + gnome-documents = callPackage ./apps/gnome-documents { }; + + gnome-music = callPackage ./apps/gnome-music { }; + + gnome-photos = callPackage ./apps/gnome-photos { }; + + # scrollkeeper replacement + rarian = callPackage ./desktop/rarian { }; + + seahorse = callPackage ./apps/seahorse { }; + + +#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ + + gfbgraph = callPackage ./misc/gfbgraph { }; + + goffice = callPackage ./misc/goffice { }; + + gitg = callPackage ./misc/gitg { }; + + libgit2-glib = callPackage ./misc/libgit2-glib { }; + + libmediaart = callPackage ./misc/libmediaart { }; + + gexiv2 = callPackage ./misc/gexiv2 { }; + + gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { }; + + gtkhtml = callPackage ./misc/gtkhtml { }; +} diff --git a/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix new file mode 100644 index 00000000000..a1b38b21869 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}: + +stdenv.mkDerivation rec { + name = "rarian-0.8.1"; + src = fetchurl { + url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2"; + sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; + }; + + buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; + configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix new file mode 100644 index 00000000000..86942c13f34 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4 }: + + +stdenv.mkDerivation rec { + name = "gexiv2-${version}"; + version = "0.7.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gexiv2/0.7/${name}.tar.xz"; + sha256 = "12pfc5a57dhlf0c3yg5x3jissxi7jy2b6ir6y99cn510801gwcdn"; + }; + + preConfigure = '' + patchShebangs . + ''; + + buildInputs = [ pkgconfig glib libtool m4 ]; + propagatedBuildInputs = [ exiv2 ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/gexiv2; + description = "GObject wrapper around the Exiv2 photo metadata library"; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix new file mode 100644 index 00000000000..ee8259af8d6 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix @@ -0,0 +1,23 @@ +{ stdenv, intltool, fetchurl, pkgconfig, glib +, gnome3, libsoup, json_glib }: + +stdenv.mkDerivation rec { + name = "gfbgraph-0.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz"; + sha256 = "534ca84920445b9d89e2480348eedde3ce950db3628ae0a79703e8f2d52fa724"; + }; + + buildInputs = [ pkgconfig glib libsoup gnome3.gnome_online_accounts + json_glib gnome3.rest ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "GLib/GObject wrapper for the Facebook Graph API"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix new file mode 100644 index 00000000000..7ca35a8255f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, fetchgit, vala, intltool, libgit2, pkgconfig, gtk3, glib +, json_glib, webkitgtk, makeWrapper, libpeas, bash, gobjectIntrospection +, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg }: + +# TODO: icons and theme still does not work +# use packaged gnome3.gnome_icon_theme_symbolic + +stdenv.mkDerivation rec { + name = "gitg-0.3.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gitg/0.3/${name}.tar.xz"; + sha256 = "03vc59d1r3326piqdph6qjqnc40chm1lpg52lpf8466ddjs0x8vp"; + }; + + preCheck = '' + substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash" + ''; + doCheck = true; + + makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; + + propagatedUserEnvPkgs = [ shared_mime_info + gnome3.gnome_themes_standard ]; + + buildInputs = [ vala intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas + libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview librsvg + gobjectIntrospection makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ]; + + preFixup = '' + wrapProgram "$out/bin/gitg" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + rm $out/share/icons/hicolor/icon-theme.cache + rm $out/share/gitg/icons/hicolor/icon-theme.cache + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/action/show/Apps/Gitg; + description = "GNOME GUI client to view git repositories"; + maintainers = with maintainers; [ iElectric ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix new file mode 100644 index 00000000000..2eccb9a32cf --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix @@ -0,0 +1,46 @@ +{ stdenv, intltool, fetchurl, python, pygobject3, atk +, pkgconfig, gtk3, glib, hicolor_icon_theme, libsoup +, bash, makeWrapper, itstool, libxml2, python3Packages +, gnome3, librsvg, gdk_pixbuf, file, libnotify }: + +stdenv.mkDerivation rec { + name = "gnome-tweak-tool-3.10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-tweak-tool/3.10/${name}.tar.xz"; + sha256 = "fb5af9022c0521a925ef9f295e4080212b1b45427cd5f5f3a901667590afa7ec"; + }; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + makeFlags = [ "DESTDIR=/" ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 + gnome3.gsettings_desktop_schemas makeWrapper file + gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic + python pygobject3 libnotify gnome3.gnome_shell + libsoup gnome3.gnome_settings_daemon gnome3.nautilus + gnome3.gnome_desktop ]; + + preFixup = '' + wrapProgram "$out/bin/gnome-tweak-tool" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix LD_LIBRARY_PATH ":" "${libsoup}/lib:${gnome3.gnome_desktop}/lib:${libnotify}/lib:${gtk3}/lib:${atk}/lib" \ + --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)" + ''; + + patches = [ ./find_gsettings.patch ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool; + description = "A tool to customize advanced GNOME 3 options"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch new file mode 100644 index 00000000000..3e68c04cb3a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch @@ -0,0 +1,22 @@ +diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py +index a00fe19..dce74b2 100644 +--- a/gtweak/gsettings.py ++++ b/gtweak/gsettings.py +@@ -33,10 +33,15 @@ class GSettingsMissingError(Exception): + + class _GSettingsSchema: + def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options): +- if not schema_dir: +- schema_dir = gtweak.GSETTINGS_SCHEMA_DIR + if not schema_filename: + schema_filename = schema_name + ".gschema.xml" ++ if not schema_dir: ++ schema_dir = gtweak.GSETTINGS_SCHEMA_DIR ++ for xdg_dir in GLib.get_system_data_dirs(): ++ dir = os.path.join(xdg_dir, "glib-2.0", "schemas") ++ if os.path.exists(os.path.join(dir, schema_filename)): ++ schema_dir = dir ++ break + + schema_path = os.path.join(schema_dir, schema_filename) + if not os.path.exists(schema_path): diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix b/pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix new file mode 100644 index 00000000000..02520a9f121 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix @@ -0,0 +1,37 @@ +{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2 +, pango, libgsf, libxml2, libart, intltool, gettext +, cairo, gconf, libgnomeui, pcre, gnome3/*just meta*/ }: + +stdenv.mkDerivation rec { + name = "goffice-0.8.17"; + + src = fetchurl { + url = "mirror://gnome/sources/goffice/0.8/${name}.tar.xz"; + sha256 = "165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15"; + }; + + # fix linking error: undefined reference to pcre_info + patches = [ ./pcre_info.patch ]; # inspired by https://bugs.php.net/bug.php?id=60986 + + buildInputs = [ + pkgconfig libglade bzip2 libart intltool gettext + gconf libgnomeui pcre + ]; + + propagatedBuildInputs = [ + # All these are in the "Requires:" field of `libgoffice-0.6.pc'. + glib libgsf libxml2 gtk libglade libart cairo pango + ]; + + postInstall = + '' + # Get GnuCash to build. Might be unnecessary if we upgrade pkgconfig. + substituteInPlace $out/lib/pkgconfig/libgoffice-*.pc --replace Requires.private Requires + ''; + + doCheck = true; + + meta = gnome3.goffice.meta // { + maintainers = [ ]; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix new file mode 100644 index 00000000000..0390fc13368 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix @@ -0,0 +1,36 @@ +{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3 +, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }: + +stdenv.mkDerivation rec { + name = "goffice-0.10.12"; + + src = fetchurl { + url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; + sha256 = "0vh0sdig5n8sxzh4xx82lm8y8d0jcdhc2ipb1kq02qs142zs74ff"; + }; + + nativeBuildInputs = [ pkgconfig intltool ]; + + propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection? + glib gtk3 libxml2 cairo pango libgsf + ]; + + buildInputs = [ libxslt librsvg ]; + + enableParallelBuilding = true; + doCheck = true; + + meta = { + description = "A Glib/GTK+ set of document centric objects and utilities"; + + longDescription = '' + There are common operations for document centric applications that are + conceptually simple, but complex to implement fully: plugins, load/save + documents, undo/redo. + ''; + + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.gnu; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch b/pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch new file mode 100644 index 00000000000..cd4ef3c9fed --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch @@ -0,0 +1,13 @@ +diff --git a/goffice/utils/regutf8.c b/goffice/utils/regutf8.c +index bc4aae4..3adb696 100644 +--- a/goffice/utils/regutf8.c ++++ b/goffice/utils/regutf8.c +@@ -155,7 +155,7 @@ go_regcomp (GORegexp *gor, const char *pat, int cflags) + default: return GO_REG_BADPAT; + } + } else { +- gor->re_nsub = pcre_info (r, NULL, NULL); ++ gor->re_nsub = pcre_fullinfo (r, NULL, NULL, NULL); + gor->nosub = (cflags & GO_REG_NOSUB) != 0; + return 0; + } diff --git a/pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix new file mode 100644 index 00000000000..5e27b474cbd --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, intltool +, gnome3, enchant, isocodes }: + +stdenv.mkDerivation rec { + name = "gtkhtml-4.6.6"; + + src = fetchurl { + url = "mirror://gnome/sources/gtkhtml/4.6/${name}.tar.xz"; + sha256 = "145d23bbe729ff4ee7e7027bb5ff405b34822271327fdd81fe913134831374cd"; + }; + + buildInputs = [ pkgconfig gtk3 intltool gnome3.gnome_icon_theme + gnome3.gsettings_desktop_schemas ]; + + propagatedBuildInputs = [ enchant isocodes ]; + +} diff --git a/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix new file mode 100644 index 00000000000..17c3b4fa0a8 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, gnome3, libtool, pkgconfig +, gtk_doc, gobjectIntrospection, libgit2, glib }: + +stdenv.mkDerivation rec { + name = "libgit2-glib-${version}"; + version = "0.0.10"; + + src = fetchurl { + url = "https://github.com/GNOME/libgit2-glib/archive/v${version}.tar.gz"; + sha256 = "0zn3k85jw6yks8s5ca8dyh9mwh4if1lni9gz9bd5lqlpa803ixxs"; + }; + + configureScript = "sh ./autogen.sh"; + + buildInputs = [ gnome3.gnome_common libtool pkgconfig + gtk_doc gobjectIntrospection libgit2 glib ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix new file mode 100644 index 00000000000..4985bfa902c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf }: + +stdenv.mkDerivation rec { + name = "libmediaart-0.4.0"; + + src = fetchurl { + url = "mirror://gnome/sources/libmediaart/0.4/${name}.tar.xz"; + sha256 = "e8ec92a642f4df7f988364f6451adf89e1611d7379a636d8c7eff4ca21a0fd1c"; + }; + + buildInputs = [ pkgconfig glib gdk_pixbuf ]; + + meta = with stdenv.lib; { + description = "Library tasked with managing, extracting and handling media art caches"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a241e5a99ba..16930c82c8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10171,11 +10171,15 @@ let inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils; }; - gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { + gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.10 { callPackage = pkgs.newScope pkgs.gnome3; self = pkgs.gnome3; }); + gnome3_12 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.12 { + callPackage = pkgs.newScope pkgs.gnome3_12; + }); + gnome = recurseIntoAttrs gnome2; hsetroot = callPackage ../tools/X11/hsetroot { }; From b01b15bb0bcb14588cb327f63d09dc3dba29e13a Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 21:19:56 +0200 Subject: [PATCH 02/73] baobab: add 3.12.1 version and cleanup expr --- pkgs/desktops/gnome-3/3.12/core/baobab/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix index 9381f45105d..e4da596ae21 100644 --- a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix @@ -4,15 +4,13 @@ , gnome3, librsvg, gdk_pixbuf, file }: stdenv.mkDerivation rec { - name = "baobab-3.10.1"; + name = "baobab-3.12.1"; src = fetchurl { - url = "mirror://gnome/sources/baobab/3.10/${name}.tar.xz"; - sha256 = "23ce8e4847ce5f1c8230e757532d94c84e6e273d6ec8fca20eecaed5f96563f9"; + url = "mirror://gnome/sources/baobab/3.12/${name}.tar.xz"; + sha256 = "494808d8a5b1776377749a1dcd5b251eb399208a4c90380dc8b8c789811e514c"; }; - configureFlags = [ "--disable-static" ]; - doCheck = true; NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; @@ -22,14 +20,16 @@ stdenv.mkDerivation rec { hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2 - gnome3.gsettings_desktop_schemas makeWrapper file ]; + gnome3.gsettings_desktop_schemas makeWrapper file + gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; preFixup = '' rm $out/share/icons/hicolor/icon-theme.cache rm $out/share/icons/HighContrast/icon-theme.cache wrapProgram "$out/bin/baobab" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { From 11be39c23827de994b21e2b5c5bf76dc9eb4e5d4 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:11:18 +0200 Subject: [PATCH 03/73] gnome-icon-theme: add 3.12.0 version --- .../desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix index 5b16f827ae0..aa0c9d24dfe 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk }: stdenv.mkDerivation rec { - name = "gnome-icon-theme-3.10.0"; + name = "gnome-icon-theme-3.12.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-icon-theme/3.10/${name}.tar.xz"; - sha256 = "1xinbgkkvlhazj887ajcl13i7kdc1wcca02jwxzvjrvchjsp4m66"; + url = "mirror://gnome/sources/gnome-icon-theme/3.12/${name}.tar.xz"; + sha256 = "359e720b9202d3aba8d477752c4cd11eced368182281d51ffd64c8572b4e503a"; }; setupHook = ./setup-hook.sh; From b0dc8bf703cdf343e98fd9d85e2855b25306a490 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:18:15 +0200 Subject: [PATCH 04/73] evince: add 3.12.1 version --- pkgs/desktops/gnome-3/3.12/core/evince/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix index 4b50840534c..ca983258d95 100644 --- a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "evince-3.10.3"; + name = "evince-3.12.1"; src = fetchurl { - url = "mirror://gnome/sources/evince/3.10/${name}.tar.xz"; - sha256 = "1bz9ypsvlfw1vgs7i5glba1h1n6c90f0d1g64linhg6xjcxcq3dk"; + url = "mirror://gnome/sources/evince/3.12/${name}.tar.xz"; + sha256 = "ef22cc29a7cbe70d2e7ce8c0b5b7ee774187ea69f3ae49a64c6d4a91559ef137"; }; buildInputs = [ From 7b7a9253eadb38988ae25b5a12a18b9ec239cca6 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:19:38 +0200 Subject: [PATCH 05/73] eog: add 3.12.2 version --- pkgs/desktops/gnome-3/3.12/core/eog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix b/pkgs/desktops/gnome-3/3.12/core/eog/default.nix index 57f19dcaa32..8c8a49cb7ed 100644 --- a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/eog/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { - name = "eog-3.10.2"; + name = "eog-3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/eog/3.10/${name}.tar.xz"; - sha256 = "0qs7wmn987vd0cw8w16gmb0bnda3nkcwfg1q343l4rm6kih9ik2w"; + url = "mirror://gnome/sources/eog/3.12/${name}.tar.xz"; + sha256 = "0ca8be7f20c98e9b104b2c1fa53df293e5403e6d517de845ae0f3b72777453fd"; }; buildInputs = with gnome3; From a1dbe6ba4316b3038c81804c69715271ba4ad4fe Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:21:45 +0200 Subject: [PATCH 06/73] libgnome-keyring: add 3.12.0 version --- .../desktops/gnome-3/3.12/core/libgnome-keyring/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix index 28c7b80c0d4..65d1c9d1493 100644 --- a/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }: stdenv.mkDerivation rec { - name = "libgnome-keyring-3.10.1"; + name = "libgnome-keyring-3.12.0"; src = fetchurl { - url = "mirror://gnome/sources/libgnome-keyring/3.10/${name}.tar.xz"; - sha256 = "0wip88r91kwx4zp6sc9b38mnlv11grgl4k2kzsd3a8x83c9g2b05"; + url = "mirror://gnome/sources/libgnome-keyring/3.12/${name}.tar.xz"; + sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783"; }; propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ]; From 2708d9798aa6bd1dd76ba3350414e74ee414ee0f Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:21:50 +0200 Subject: [PATCH 07/73] totem: add 3.12.1 version --- .../gnome-3/3.12/core/totem/default.nix | 8 ++- .../3.12/core/totem/fix_files_loss.patch | 72 +++++++++++++++++++ 2 files changed, 77 insertions(+), 3 deletions(-) create mode 100644 pkgs/desktops/gnome-3/3.12/core/totem/fix_files_loss.patch diff --git a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix index c6b78c827db..3589299df3e 100644 --- a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix @@ -5,11 +5,11 @@ , gnome3, librsvg, gdk_pixbuf, file }: stdenv.mkDerivation rec { - name = "totem-3.10.1"; + name = "totem-3.12.1"; src = fetchurl { - url = "mirror://gnome/sources/totem/3.10/${name}.tar.xz"; - sha256 = "b6b6038c9104965671a6d25e98496a487c3a9c590c9c104f668bd9f4fa7be9e2"; + url = "mirror://gnome/sources/totem/3.12/${name}.tar.xz"; + sha256 = "dd168cdd4051d01131d47c24fa45bfd08b6ccf45900ac4b64bae47f6f47a35e3"; }; doCheck = true; @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { rm $out/share/icons/hicolor/icon-theme.cache ''; + patches = [ ./fix_files_loss.patch ]; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Videos; description = "Movie player for the GNOME desktop based on GStreamer"; diff --git a/pkgs/desktops/gnome-3/3.12/core/totem/fix_files_loss.patch b/pkgs/desktops/gnome-3/3.12/core/totem/fix_files_loss.patch new file mode 100644 index 00000000000..b85ad1efd00 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/totem/fix_files_loss.patch @@ -0,0 +1,72 @@ +From 524c9e39a0ca6f2d1699e6e6d9ba3db1ea80d9f9 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Thu, 15 May 2014 19:28:35 +0200 +Subject: main: Fix potential data loss when removing multiple files + +We were using a list of GtkTreePaths and deleting the items one-by-one +when the user clicked the "Delete" button. But after the first deletion, +the tree model would have changed, and instead of pointing to the 2nd +item we wanted to delete, the GtkTreePath would have pointed to another +item, usually not one that we wanted to delete. + +We now use GtkTreeRowReferences, which will always point to the same +row, as long as it exists. + +https://bugzilla.gnome.org/show_bug.cgi?id=729778 + +diff --git a/src/totem-grilo.c b/src/totem-grilo.c +index 2133d77..0cff0d6 100644 +--- a/src/totem-grilo.c ++++ b/src/totem-grilo.c +@@ -2074,7 +2074,8 @@ static void + delete_foreach (gpointer data, + gpointer user_data) + { +- GtkTreePath *path = data; ++ GtkTreeRowReference *ref = data; ++ GtkTreePath *path; + GtkTreeModel *view_model = user_data; + GtkTreeIter iter; + GrlSource *source; +@@ -2085,8 +2086,11 @@ delete_foreach (gpointer data, + GtkTreeModel *model; + GtkTreeIter real_model_iter; + +- if (!gtk_tree_model_get_iter (view_model, &iter, path)) ++ path = gtk_tree_row_reference_get_path (ref); ++ if (!path || !gtk_tree_model_get_iter (view_model, &iter, path)) { ++ g_warning ("An item that was scheduled for removal isn't available any more"); + return; ++ } + + gtk_tree_model_get (view_model, &iter, + MODEL_RESULTS_CONTENT, &media, +@@ -2151,14 +2155,23 @@ delete_cb (TotemSelectionToolbar *bar, + TotemGrilo *self) + { + GtkTreeModel *model; +- GList *list; ++ GList *list, *l; + + g_signal_handlers_block_by_func (self->priv->browser, "view-selection-changed", self); + + model = gd_main_view_get_model (GD_MAIN_VIEW (self->priv->browser)); + list = gd_main_view_get_selection (GD_MAIN_VIEW (self->priv->browser)); ++ ++ /* GList of GtkTreePaths to a GList of GtkTreeRowReferences */ ++ for (l = list; l != NULL; l = l->next) { ++ GtkTreeRowReference *ref; ++ ++ ref = gtk_tree_row_reference_new (model, l->data); ++ gtk_tree_path_free (l->data); ++ l->data = ref; ++ } + g_list_foreach (list, delete_foreach, model); +- g_list_free_full (list, (GDestroyNotify) gtk_tree_path_free); ++ g_list_free_full (list, (GDestroyNotify) gtk_tree_row_reference_free); + + g_signal_handlers_unblock_by_func (self->priv->browser, "view-selection-changed", self); + +-- +cgit v0.10.1 + From ae20e1c5f576f186f011cc3ac1a5d34f1cf96f52 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:22:30 +0200 Subject: [PATCH 08/73] yelp: add 3.12 version --- pkgs/desktops/gnome-3/3.12/core/yelp/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix index b58aa99721e..d8897e262d5 100644 --- a/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix @@ -3,27 +3,27 @@ , bash, makeWrapper, itstool, libxml2, libxslt, icu }: stdenv.mkDerivation rec { - name = "yelp-3.10.1"; + name = "yelp-3.12.0"; src = fetchurl { - url = "mirror://gnome/sources/yelp/3.10/${name}.tar.xz"; - sha256 = "17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816"; + url = "mirror://gnome/sources/yelp/3.12/${name}.tar.xz"; + sha256 = "0k2a1fggidmh98x2fv8zki2lbx7wx7p4b25iq11p6q8j9fwr2ff8"; }; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ librsvg gdk_pixbuf gnome3.gnome_icon_theme - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl + librsvg gdk_pixbuf gnome3.gnome_icon_theme + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.gsettings_desktop_schemas ]; preFixup = '' wrapProgram "$out/bin/yelp" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/yelp:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/yelp:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { From b6286bf481176e700735e697353a4d10f56cb00d Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:23:21 +0200 Subject: [PATCH 09/73] gnome-session: add 3.12.1 version --- .../gnome-3/3.12/core/gnome-session/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix index f999702af54..bebd0b4b77c 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix @@ -1,20 +1,20 @@ { fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower -, libxslt, intltool, makeWrapper, systemd }: +, libxslt, intltool, makeWrapper, systemd, xorg }: stdenv.mkDerivation rec { - name = "gnome-session-3.10.1"; + name = "gnome-session-3.12.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-session/3.10/${name}.tar.xz"; - sha256 = "1k59yss7r748nvr0cdjrqmx0zy26b93rfn66lsdg9fz60x77087n"; + url = "mirror://gnome/sources/gnome-session/3.12/${name}.tar.xz"; + sha256 = "fa308771ac18bc5f77e5a5be3b2d93df1625168cb40167c1dfa898e9006e25d3"; }; configureFlags = "--enable-systemd"; buildInputs = with gnome3; [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt - gnome3.gnome_settings_daemon + gnome3.gnome_settings_daemon xorg.xtrans gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ]; preFixup = '' From 3bf7226d8c94e2be08da189da1786ddfc3682b5b Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:23:59 +0200 Subject: [PATCH 10/73] gnome-shell: add 3.12.2 version --- .../gnome-3/3.12/core/gnome-shell/default.nix | 12 +- .../fix_background_corruption.patch | 147 ------------------ 2 files changed, 6 insertions(+), 153 deletions(-) delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-shell/fix_background_corruption.patch diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix index 554b09a1e59..49154aa9221 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix @@ -7,11 +7,11 @@ # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup stdenv.mkDerivation rec { - name = "gnome-shell-3.10.2.1"; + name = "gnome-shell-3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell/3.10/${name}.tar.xz"; - sha256 = "0k642y6h878v6mczx4z1zj4pjl7z4bvq02raxxwxkjyvyz2fv36j"; + url = "mirror://gnome/sources/gnome-shell/3.12/${name}.tar.xz"; + sha256 = "3ae230e8cb7a31e7b782c16ca178af5957858810788e26a6d630b69b3f85ce71"; }; buildInputs = with gnome3; @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm gnome_control_center at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ]; + installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ]; + preBuild = '' patchShebangs src/data-to-c.pl substituteInPlace data/Makefile --replace " install-keysDATA" "" @@ -33,14 +35,12 @@ stdenv.mkDerivation rec { --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix LD_LIBRARY_PATH : "${accountservice}/lib:${ibus}/lib:${gdm}/lib" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:${gtk}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" wrapProgram "$out/libexec/gnome-shell-calendar-server" \ --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; - patches = [ ./fix_background_corruption.patch ]; - meta = with stdenv.lib; { platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/fix_background_corruption.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/fix_background_corruption.patch deleted file mode 100644 index 9cb041bcce2..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/fix_background_corruption.patch +++ /dev/null @@ -1,147 +0,0 @@ -commit 831bd07b0d6b7055fea8317f2cdf8fd4a408c36d -Author: Jasper St. Pierre -Date: Thu Nov 7 17:14:47 2013 -0500 - - layout: Fix several issues with the background management code - - If monitor-changed fires at startup, it will destroy all of the - backgrounds, but since this._isStartup is true, won't recreate any - of them. Additionally, since _bgManagers is indexed by monitor index, - if the primary index is not 0, it could become a sparse array (e.g. - [undefined, undefined, primaryBackground]), and our for loop will - crash trying to access properties of undefined. - - Fix both of these issues by always creating background managers for - every monitor, hiding them on startup but only showing them after - the startup animation is complete. - - One thing we need to watch out for is that while LayoutManager is - constructing, Main.uiGroup / Main.layoutManager will be undefined, - so addBackgroundMenu will fail. Fix this by passing down the uiGroup - to the background menu code. - - https://bugzilla.gnome.org/show_bug.cgi?id=709313 - -diff --git a/js/ui/backgroundMenu.js b/js/ui/backgroundMenu.js -index 06e698c..dcbbb39 100644 ---- a/js/ui/backgroundMenu.js -+++ b/js/ui/backgroundMenu.js -@@ -13,7 +13,7 @@ const BackgroundMenu = new Lang.Class({ - Name: 'BackgroundMenu', - Extends: PopupMenu.PopupMenu, - -- _init: function(source) { -+ _init: function(source, layoutManager) { - this.parent(source, 0, St.Side.TOP); - - this.addSettingsAction(_("Settings"), 'gnome-control-center.desktop'); -@@ -22,17 +22,17 @@ const BackgroundMenu = new Lang.Class({ - - this.actor.add_style_class_name('background-menu'); - -- Main.uiGroup.add_actor(this.actor); -+ layoutManager.uiGroup.add_actor(this.actor); - this.actor.hide(); - } - }); - --function addBackgroundMenu(actor) { -+function addBackgroundMenu(actor, layoutManager) { - let cursor = new St.Bin({ opacity: 0 }); -- Main.uiGroup.add_actor(cursor); -+ layoutManager.uiGroup.add_actor(cursor); - - actor.reactive = true; -- actor._backgroundMenu = new BackgroundMenu(cursor); -+ actor._backgroundMenu = new BackgroundMenu(cursor, layoutManager); - actor._backgroundManager = new PopupMenu.PopupMenuManager({ actor: actor }); - actor._backgroundManager.addMenu(actor._backgroundMenu); - -diff --git a/js/ui/layout.js b/js/ui/layout.js -index 17073a6..80bae9d 100644 ---- a/js/ui/layout.js -+++ b/js/ui/layout.js -@@ -352,26 +352,26 @@ const LayoutManager = new Lang.Class({ - this.emit('hot-corners-changed'); - }, - -- _createBackground: function(monitorIndex) { -+ _addBackgroundMenu: function(bgManager) { -+ BackgroundMenu.addBackgroundMenu(bgManager.background.actor, this); -+ }, -+ -+ _createBackgroundManager: function(monitorIndex) { - let bgManager = new Background.BackgroundManager({ container: this._backgroundGroup, - layoutManager: this, - monitorIndex: monitorIndex }); -- BackgroundMenu.addBackgroundMenu(bgManager.background.actor); -- -- bgManager.connect('changed', Lang.bind(this, function() { -- BackgroundMenu.addBackgroundMenu(bgManager.background.actor); -- })); - -- this._bgManagers[monitorIndex] = bgManager; -+ bgManager.connect('changed', Lang.bind(this, this._addBackgroundMenu)); -+ this._addBackgroundMenu(bgManager); - -- return bgManager.background; -+ return bgManager; - }, - -- _createSecondaryBackgrounds: function() { -+ _showSecondaryBackgrounds: function() { - for (let i = 0; i < this.monitors.length; i++) { - if (i != this.primaryIndex) { -- let background = this._createBackground(i); -- -+ let background = this._bgManagers[i].background; -+ background.actor.show(); - background.actor.opacity = 0; - Tweener.addTween(background.actor, - { opacity: 255, -@@ -381,10 +381,6 @@ const LayoutManager = new Lang.Class({ - } - }, - -- _createPrimaryBackground: function() { -- this._createBackground(this.primaryIndex); -- }, -- - _updateBackgrounds: function() { - let i; - for (i = 0; i < this._bgManagers.length; i++) -@@ -395,11 +391,12 @@ const LayoutManager = new Lang.Class({ - if (Main.sessionMode.isGreeter) - return; - -- if (this._startingUp) -- return; -- - for (let i = 0; i < this.monitors.length; i++) { -- this._createBackground(i); -+ let bgManager = this._createBackgroundManager(i); -+ this._bgManagers.push(bgManager); -+ -+ if (i != this.primaryIndex && this._startingUp) -+ bgManager.background.actor.hide(); - } - }, - -@@ -595,7 +592,7 @@ const LayoutManager = new Lang.Class({ - if (Main.sessionMode.isGreeter) { - this.panelBox.translation_y = -this.panelBox.height; - } else { -- this._createPrimaryBackground(); -+ this._updateBackgrounds(); - - // We need to force an update of the regions now before we scale - // the UI group to get the coorect allocation for the struts. -@@ -673,7 +670,7 @@ const LayoutManager = new Lang.Class({ - this.keyboardBox.show(); - - if (!Main.sessionMode.isGreeter) { -- this._createSecondaryBackgrounds(); -+ this._showSecondaryBackgrounds(); - global.window_group.remove_clip(); - } - From f160950ad24fe76639bc4f9a0befa0037ec3f302 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:25:15 +0200 Subject: [PATCH 11/73] gnome-common: add 3.12.0 version --- pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix index 12b2510dc43..b534d6922b7 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, which, autoconf, automake }: stdenv.mkDerivation rec { - name = "gnome-common-3.10.0"; + name = "gnome-common-3.12.0"; src = fetchurl { - url = "https://download.gnome.org/sources/gnome-common/3.10/${name}.tar.xz"; - sha256 = "aed69474a671e046523827f73ba5e936d57235b661db97900db7356e1e03b0a3"; + url = "https://download.gnome.org/sources/gnome-common/3.12/${name}.tar.xz"; + sha256 = "18712bc2df6b2dd88a11b9f7f874096d1c0c6e7ebc9cfc0686ef963bd590e1d8"; }; patches = [(fetchurl { From 4ed15531b2b09e5a31b734286bdb58da92940271 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:25:48 +0200 Subject: [PATCH 12/73] gnome-desktop: add 3.12.2 version --- pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix index 584705d658e..e8d4efc1c80 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { - majorVersion = "3.10"; - minorVersion = "1"; + majorVersion = "3.12"; + minorVersion = "2"; name = "gnome-desktop-${majorVersion}.${minorVersion}"; # this should probably be setuphook for glib @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${majorVersion}/${name}.tar.xz"; - sha256 = "0hdvm909lbpnixqv11qdx9iaycx4dpxys46fa128bqp8alisgb0h"; + sha256 = "b7d691363ccc90182caff1980efa7d99e4569bea968d39654102a0c4e824a44d"; }; buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 xkeyboard_config isocodes itstool wayland From 58309f68c1d67258a3a8ec3928db6fecabe04ab2 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:26:20 +0200 Subject: [PATCH 13/73] gnome-screenshot: add 3.12.0 version --- .../desktops/gnome-3/3.12/core/gnome-screenshot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix index 7b94d0f9027..349df0b103c 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix @@ -3,11 +3,11 @@ , itstool, gnome3, librsvg, gdk_pixbuf }: stdenv.mkDerivation rec { - name = "gnome-screenshot-3.10.0"; + name = "gnome-screenshot-3.12.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-screenshot/3.10/${name}.tar.xz"; - sha256 = "1nb56kzcj5z4hmrmxap5r53smi52ki3pc8qmhi4rymkgqswyk7bh"; + url = "mirror://gnome/sources/gnome-screenshot/3.12/${name}.tar.xz"; + sha256 = "ae4bf706652ae9b28c7930d22c2c37469a78d7f6656d312960b3c75ee5c36eb1"; }; doCheck = true; From 73fe63f13ef25b167d3b2c87f70e4d0400a87d75 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:27:52 +0200 Subject: [PATCH 14/73] gnome-system-monitor: add 3.12.2 version and cleanup expr --- .../3.12/core/gnome-system-monitor/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix index 91fbe67957f..622df1c5db2 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix @@ -3,33 +3,34 @@ , itstool, gnome3, librsvg, gdk_pixbuf, libgtop }: stdenv.mkDerivation rec { - name = "gnome-system-monitor-3.10.2"; + name = "gnome-system-monitor-3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-system-monitor/3.10/${name}.tar.xz"; - sha256 = "bd009e15672afe4ad3ebd7ed286cce79b9f76420fd39bc77a5826b29134b9db0"; + url = "mirror://gnome/sources/gnome-system-monitor/3.12/${name}.tar.xz"; + sha256 = "ba074e2157302d91d73b68e13207bf85452b84234e429b1ec9b9a7b1c70736d8"; }; doCheck = true; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; + propagatedBuildInputs = [ ]; buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 gtkmm3 libgtop makeWrapper + gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.gsettings_desktop_schemas ]; preFixup = '' wrapProgram "$out/bin/gnome-system-monitor" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-system-monitor/3.10/; + homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/; description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used"; maintainers = with maintainers; [ lethalman ]; license = licenses.gpl2; From d558e5c090366f177f0eb59ab58a4353aad8c593 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:29:03 +0200 Subject: [PATCH 15/73] gnome-calculator: add 3.12.1 version and cleanup expr --- .../gnome-3/3.12/core/gnome-calculator/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix index 205961a9171..666032f56a7 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix @@ -3,27 +3,27 @@ , itstool, gnome3, librsvg, gdk_pixbuf }: stdenv.mkDerivation rec { - name = "gnome-calculator-3.10.2"; + name = "gnome-calculator-3.12.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-calculator/3.10/${name}.tar.xz"; - sha256 = "0gkddnk9x76895xrz0ps4yny36w62fhi459gwmxqqb9kx5934n1f"; + url = "mirror://gnome/sources/gnome-calculator/3.12/${name}.tar.xz"; + sha256 = "15a75bbe19f6d2280d864f0504f6fc5b1f148fea9738b5548b64b7b8c0c64740"; }; NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 gnome3.gtksourceview + gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.gsettings_desktop_schemas makeWrapper ]; preFixup = '' wrapProgram "$out/bin/gnome-calculator" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { From 24fdbd0c78cba6101d60624773d144aff29d3dab Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:29:50 +0200 Subject: [PATCH 16/73] gnome-icon-theme-symbolic: add 3.12.0 version --- .../gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix index feb3d84b994..6a30362f593 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gnome3, iconnamingutils, gtk }: stdenv.mkDerivation rec { - name = "gnome-icon-theme-symbolic-3.10.1"; + name = "gnome-icon-theme-symbolic-3.12.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-icon-theme-symbolic/3.10/${name}.tar.xz"; - sha256 = "344e88e5f9dac3184bf012d9bac972110df2133b93d76f2ad128d4c9cbf41412"; + url = "mirror://gnome/sources/gnome-icon-theme-symbolic/3.12/${name}.tar.xz"; + sha256 = "851a4c9d8e8cb0000c9e5e78259ab8b8e67c5334e4250ebcc8dfdaa33520068b"; }; configureFlags = "--enable-icon-mapping"; From a7a457e78a7330713e976cd3da8be7cc1c6dff22 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:30:45 +0200 Subject: [PATCH 17/73] gnome-backgrounds: add 3.12.2 version --- .../gnome-3/3.12/core/gnome-backgrounds/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix index 3879b81859a..46db008787f 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool }: stdenv.mkDerivation rec { - name = "gnome-backgrounds-3.10.1"; + name = "gnome-backgrounds-3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-backgrounds/3.10/${name}.tar.xz"; - sha256 = "11rv03m4hznpx0brf47hil04199z3jjvl1aq7q0lnill3yrffiyc"; + url = "mirror://gnome/sources/gnome-backgrounds/3.12/${name}.tar.xz"; + sha256 = "ac4d3e0fffc5991865ca748e728a1ab87f167400105250ce2195b03502427180"; }; nativeBuildInputs = [ pkgconfig intltool ]; From 4b32659c0bb8f6f904a8f350f3f6e2c01dba93d0 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:31:59 +0200 Subject: [PATCH 18/73] gnome-contacts: add 3.12.0 version and cleanup expr --- .../gnome-3/3.12/core/gnome-contacts/default.nix | 14 +++++++------- .../core/gnome-contacts/fix_row_selected.patch | 11 ----------- 2 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-contacts/fix_row_selected.patch diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix index f8059f952e6..5b4ca5c3418 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix @@ -5,18 +5,16 @@ , libsoup, vala, dbus_glib, automake114x, autoconf }: stdenv.mkDerivation rec { - name = "gnome-contacts-3.10.1"; + name = "gnome-contacts-3.12.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-contacts/3.10/${name}.tar.xz"; - sha256 = "e119c32bb10136e7190f11f79334fa82ed56468cff5bb7836da0ebf7b572779b"; + url = "mirror://gnome/sources/gnome-contacts/3.12/${name}.tar.xz"; + sha256 = "fb3f25d409032b24fb67241e67d4da10cf6f77a48c088709455cea5f6f33e87d"; }; doCheck = true; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; # force build from vala preBuild = '' @@ -27,17 +25,19 @@ stdenv.mkDerivation rec { gnome3.gsettings_desktop_schemas makeWrapper file libnotify folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib libxml2 libsoup gnome3.gnome_online_accounts nspr nss + gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic vala automake114x autoconf db ]; preFixup = '' for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do wrapProgram $f \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" done ''; - patches = [ ./configure_dbus_glib.patch ./fix_row_selected.patch ]; + patches = [ ./configure_dbus_glib.patch ]; patchFlags = "-p0"; diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/fix_row_selected.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/fix_row_selected.patch deleted file mode 100644 index b379b4b8ee9..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/fix_row_selected.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/contacts-view.vala.orig 2014-04-08 11:35:36.302252460 +0200 -+++ src/contacts-view.vala 2014-04-08 11:37:37.045343221 +0200 -@@ -265,7 +265,7 @@ - data.destroy (); - } - -- public override void row_selected (ListBoxRow row) { -+ public override void row_selected (ListBoxRow? row) { - var data = row as ContactDataRow; - var contact = data != null ? data.contact : null; - selection_changed (contact); From 5eb739fb1e6943dffe8950c50a2e0999b7448311 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:32:44 +0200 Subject: [PATCH 19/73] gnome-user-docs: add 3.12.1 version --- .../gnome-3/3.12/core/gnome-user-docs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix index d66863a2218..7377c839d1c 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }: stdenv.mkDerivation rec { - name = "gnome-user-docs-3.10.3"; + name = "gnome-user-docs-3.12.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-user-docs/3.10/${name}.tar.xz"; - sha256 = "960b6373ea52e41e3deb3501930e024005b29d2cc958bfadc87450a291d2a905"; + url = "mirror://gnome/sources/gnome-user-docs/3.12/${name}.tar.xz"; + sha256 = "bfd084d72c688d6efb0c34bb572a704cc2ce093c97a33390eaffb5e42158d418"; }; buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ]; meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-help/3.10; + homepage = https://help.gnome.org/users/gnome-help/3.12; description = "User and system administration help for the Gnome desktop"; maintainers = with maintainers; [ lethalman ]; license = licenses.cc-by-30; From 18f39ac66077dcae11db26541666bafa8bd1eed5 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:33:25 +0200 Subject: [PATCH 20/73] gnome-terminal: add 3.12.2 version --- .../gnome-3/3.12/core/gnome-terminal/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix index 541db5720db..2c4b838ad8b 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix @@ -1,24 +1,27 @@ { stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango , gnome_doc_utils, intltool, libX11, which, gconf, libuuid -, desktop_file_utils, itstool, ncurses, makeWrapper }: +, desktop_file_utils, itstool, ncurses, makeWrapper, appdata-tools }: stdenv.mkDerivation rec { - versionMajor = "3.10"; + versionMajor = "3.12"; versionMinor = "2"; name = "gnome-terminal-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${versionMajor}/${name}.tar.xz"; - sha256 = "04yrk9531f373nl64jx3pczsnq7a56mj3n436jbhjp74kp12fa70"; + sha256 = "ea19ce610af2873d26e1e75491415e17af6a5080366db966f9220fdeea5ebecd"; }; - buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte + buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools gnome3.dconf gnome3.gconf itstool ncurses makeWrapper ]; nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ]; + # FIXME: enable for gnome3 + configureFlags = [ "--disable-search-provider" "--without-nautilus-extension" ]; + preFixup = '' for f in "$out/libexec/gnome-terminal-migration" "$out/libexec/gnome-terminal-server"; do wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" From a1abb9a52599b74bb8158b0c4aec4cb9c3c9f64f Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:34:21 +0200 Subject: [PATCH 21/73] gnome-disk-utility: add 3.12.1 version and cleanup expr --- .../3.12/core/gnome-disk-utility/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix index 334471c2943..56bde211105 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix @@ -4,11 +4,11 @@ , libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }: stdenv.mkDerivation rec { - name = "gnome-disk-utility-3.10.0"; + name = "gnome-disk-utility-3.12.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-disk-utility/3.10/${name}.tar.xz"; - sha256 = "1amqi2bribxn8r8k8mvxh3710rmdll9963smf0v59v0iwxi3mqil"; + url = "mirror://gnome/sources/gnome-disk-utility/3.12/${name}.tar.xz"; + sha256 = "5994bfae57063d74be45736050cf166cda5b1600a599703240b641b39375718e"; }; doCheck = true; @@ -16,19 +16,19 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme - librsvg udisks2 gnome3.gnome_settings_daemon - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxslt libtool libsecret libpwquality cracklib libnotify libdvdread libcanberra_gtk3 docbook_xsl + gdk_pixbuf gnome3.gnome_icon_theme + librsvg udisks2 gnome3.gnome_settings_daemon + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; preFixup = '' wrapProgram "$out/bin/gnome-disks" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" rm $out/share/icons/hicolor/icon-theme.cache ''; From a321e5bbba576d15606d109862d123da3e715645 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:35:01 +0200 Subject: [PATCH 22/73] gnome-shell-extensions: add 3.12.2 version --- .../gnome-3/3.12/core/gnome-shell-extensions/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix index 00974edb1db..8503af44613 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix @@ -4,11 +4,11 @@ , gnome3, file }: stdenv.mkDerivation rec { - name = "gnome-shell-extensions-3.10.1"; + name = "gnome-shell-extensions-3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell-extensions/3.10/${name}.tar.xz"; - sha256 = "9baa9ddaf4e14cab6d4d7944d8dc009378b25f995acfd0fd72843f599cb5ae43"; + url = "mirror://gnome/sources/gnome-shell-extensions/3.12/${name}.tar.xz"; + sha256 = "30ba6e4792062e5a5cdd18e4a12230e68bfed1ded7de433ad241dd75e7ae2fc6"; }; doCheck = true; From 8f708a13b18a5f146d968ee957a52038be4d467d Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:35:42 +0200 Subject: [PATCH 23/73] gnome-themes-standard: add 3.12.0 version --- .../gnome-3/3.12/core/gnome-themes-standard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix index 08d82b7ae91..5128a195141 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, intltool, gtk3, librsvg, pkgconfig, pango, atk, gtk2, gdk_pixbuf }: stdenv.mkDerivation rec { - name = "gnome-themes-standard-3.10.0"; + name = "gnome-themes-standard-3.12.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-themes-standard/3.10/${name}.tar.xz"; - sha256 = "0f2b3ypkfvrdsxcvp14ja9wqj382f1p46yrjvhhxkkjgagy6qb41"; + url = "mirror://gnome/sources/gnome-themes-standard/3.12/${name}.tar.xz"; + sha256 = "a05d1b7ca872b944a69d0c0cc2369408ece32ff4355e37f8594a1b70d13c3217"; }; buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ]; From b5b3c8551593813cf97d106ccb691289873a1776 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:37:03 +0200 Subject: [PATCH 24/73] gnome-control-center: add 3.12.1 version and cleanup expr --- .../3.12/core/gnome-control-center/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix index 1222f03d66e..967c19af540 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix @@ -4,22 +4,20 @@ , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk , cracklib, python, krb5, networkmanagerapplet, networkmanager , libwacom, samba, shared_mime_info, tzdata, icu, libtool -, docbook_xsl, docbook_xsl_ns, modemmanager }: +, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk }: # http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules # TODO: bluetooth, wacom, smbclient, printers stdenv.mkDerivation rec { - name = "gnome-control-center-3.10.2"; + name = "gnome-control-center-3.12.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-control-center/3.10/${name}.tar.xz"; - sha256 = "1ac34kqkf174w0qc12p927dfhcm69xnv7fqzmbhjab56rn49wypn"; + url = "mirror://gnome/sources/gnome-control-center/3.12/${name}.tar.xz"; + sha256 = "5297d448eff0ec58f6c0ad9fbd1b94bed0a850496df0ee65571c0622b49c1582"; }; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.libgnomekbd ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; enableParallelBuilding = true; @@ -28,7 +26,9 @@ stdenv.mkDerivation rec { libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality accountservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile - shared_mime_info icu libtool docbook_xsl docbook_xsl_ns + shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo + gdk_pixbuf gnome3.gnome_icon_theme librsvg clutter clutter_gtk + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic networkmanager modemmanager makeWrapper ]; preBuild = '' @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { preFixup = with gnome3; '' wrapProgram $out/bin/gnome-control-center \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${gnome_settings_daemon}/share:${glib}/share:${gtk}/share:${colord}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" for i in $out/share/applications/*; do substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" done From 9ed0b65528db714203ba146287f073090f292b7a Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:37:34 +0200 Subject: [PATCH 25/73] gnome-online-accounts: add 3.12.2 version --- .../gnome-3/3.12/core/gnome-online-accounts/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix index 8c459435733..e113a854a8b 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gnome-online-accounts-3.10.2"; + name = "gnome-online-accounts-3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-online-accounts/3.10/${name}.tar.xz"; - sha256 = "15qvw40dmi886491s3abpidsm2lx65fhglhj99bvcdskhk0ih90b"; + url = "mirror://gnome/sources/gnome-online-accounts/3.12/${name}.tar.xz"; + sha256 = "cac7758e09d32eb54af50ab6b23d65da0c8d48c555c8db011a0cf5b977d542ec"; }; NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0"; From 14b4eecc8fac6789fc69ee9406aafce587f41603 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:38:07 +0200 Subject: [PATCH 26/73] gnome-online-miners: add 3.12.0 version --- .../gnome-3/3.12/core/gnome-online-miners/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix index 4c904bf40f6..394a3ee447c 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix @@ -2,18 +2,18 @@ , libsoup, json_glib, gmp, openssl, makeWrapper }: stdenv.mkDerivation rec { - name = "gnome-online-miners-3.10.3"; + name = "gnome-online-miners-3.12.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-online-miners/3.10/${name}.tar.xz"; - sha256 = "129807d398e7744870110e6875629b6858d289021271550569ce5afa10fe9ea8"; + url = "mirror://gnome/sources/gnome-online-miners/3.12/${name}.tar.xz"; + sha256 = "734db67bb158a046bc8bbbe418f0fdaf6d8652ac86406907a8d17d069fa48f23"; }; doCheck = true; buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins - gnome3.gnome_online_accounts makeWrapper + gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ]; enableParallelBuilding = true; From 820da31448c8faa1986772471e11c4a033e5bde1 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:38:54 +0200 Subject: [PATCH 27/73] gnome-settings-daemon: add 3.12.2 and cleanup expr --- .../3.12/core/gnome-settings-daemon/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix index 7a50b8db56f..81b49e6bc64 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix @@ -1,22 +1,23 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst , libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit , geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool -, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus }: +, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }: stdenv.mkDerivation rec { - name = "gnome-settings-daemon-3.10.2"; + name = "gnome-settings-daemon-3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/3.10/${name}.tar.xz"; - sha256 = "0r42lzlgk0w40ws4d3s7yayn6n8zqlnh5b6k88gvgv1lwk39k240"; + url = "mirror://gnome/sources/gnome-settings-daemon/3.12/${name}.tar.xz"; + sha256 = "e887bd63c733febccb7f2c1453c075016342e223214fa9cfc60d90f1e16e080f"; }; # fatal error: gio/gunixfdlist.h: No such file or directory NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; buildInputs = with gnome3; - [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas libnotify gnome_desktop - lcms2 libXtst libxkbfile pulseaudio libcanberra_gtk3 upower colord libgweather + [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas + libnotify gnome_desktop lcms2 libXtst libxkbfile pulseaudio + libcanberra_gtk3 upower colord libgweather xkeyboard_config polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ]; @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix PATH : "${glib}/bin" \ - --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { From f7d8afcf2b22af6a65386ae5d3fedf42c832e515 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:39:49 +0200 Subject: [PATCH 28/73] gnome-font-viewer: add 3.12.0 version and cleanup expr --- .../gnome-3/3.12/core/gnome-font-viewer/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix index cba651ca36a..a74c5722ba2 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix @@ -4,11 +4,11 @@ , gnome3, librsvg, gdk_pixbuf }: stdenv.mkDerivation rec { - name = "gnome-font-viewer-3.10.0"; + name = "gnome-font-viewer-3.12.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-font-viewer/3.10/${name}.tar.xz"; - sha256 = "3928350f58ac6c95f44b64cba1a5f03437b19d9b2645a7b01176067504fdd652"; + url = "mirror://gnome/sources/gnome-font-viewer/3.12/${name}.tar.xz"; + sha256 = "fca50711b7bd4edd1213dd4f05a309911cd1e832974142944c06d52ae07cbe45"; }; doCheck = true; @@ -16,16 +16,16 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop + gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.gsettings_desktop_schemas makeWrapper ]; preFixup = '' wrapProgram "$out/bin/gnome-font-viewer" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { From 8ca85043156cbef81558453ce1132dfee6a3a0cd Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:40:53 +0200 Subject: [PATCH 29/73] caribou: add 0.4.13 version --- pkgs/desktops/gnome-3/3.12/core/caribou/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix index 41a997c1f71..4d2f390c042 100644 --- a/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { - name = "caribou-0.4.12"; + name = "caribou-0.4.13"; src = fetchurl { url = "mirror://gnome/sources/caribou/0.4/${name}.tar.xz"; - sha256 = "0235sws58rg0kadxbp2nq5ha76zmhd4mr10n9qlbryf8p78qsvii"; + sha256 = "953ba618621fda8a828d0d797fc916dbe35990dc01d7aa99d15e5e2241ee2782"; }; buildInputs = with gnome3; From 00e2746e9b3de1f24357d0f6b93ab7c4d71be22d Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:41:27 +0200 Subject: [PATCH 30/73] mutter: add 3.12.2 version --- pkgs/desktops/gnome-3/3.12/core/mutter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix index 0acfa9f36ae..aa1af1ebd55 100644 --- a/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { - name = "mutter-3.10.2"; + name = "mutter-3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/mutter/3.10/${name}.tar.xz"; - sha256 = "000iclb96mgc4rp2q0cy72nfwyfzl6avijl9nmk87f5sgyy670a3"; + url = "mirror://gnome/sources/mutter/3.12/${name}.tar.xz"; + sha256 = "e653cf3e8c29af8d8c086bebcaa06781c48695be949417b72278fee37fe9e173"; }; # fatal error: gio/gunixfdlist.h: No such file or directory From 39478f037ab8c4c8600539ec3f2c5499c285544e Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:42:20 +0200 Subject: [PATCH 31/73] empathy: add 3.12.2 version --- pkgs/desktops/gnome-3/3.12/core/empathy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix index 051bc9b7fb2..458bd33240e 100644 --- a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix @@ -11,11 +11,11 @@ # TODO: enable more features stdenv.mkDerivation rec { - name = "empathy-3.10.3"; + name = "empathy-3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/empathy/3.10/${name}.tar.xz"; - sha256 = "49366acdd3c3ef9a74f63eb09920803c4c9df83056acbf8a7899e7890a9fb196"; + url = "mirror://gnome/sources/empathy/3.12/${name}.tar.xz"; + sha256 = "414d0c6b1a30b1afbf35ad04b0b9ff3ada3e06fab797a50a7147cdfe0905e7cd"; }; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { for f in $out/bin/* $out/libexec/*; do wrapProgram $f \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${hicolor_icon_theme}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${hicolor_icon_theme}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" done rm $out/share/icons/hicolor/icon-theme.cache ''; From 45a5e8113844ffdaa0e93334e602a6c92b4c3a09 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:43:44 +0200 Subject: [PATCH 32/73] rest: add 0.7.91 version and use mirror --- pkgs/desktops/gnome-3/3.12/core/rest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/rest/default.nix b/pkgs/desktops/gnome-3/3.12/core/rest/default.nix index f543f8e13b8..9e19d4f9005 100644 --- a/pkgs/desktops/gnome-3/3.12/core/rest/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/rest/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection }: stdenv.mkDerivation rec { - name = "rest-0.7.90"; + name = "rest-0.7.91"; src = fetchurl { - url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz"; - sha256 = "08n0cvz44l4b1gkmjryap3ysd0wcbbbdjbcar73nr52dmk52ls0x"; + url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz"; + sha256 = "838814d935143f2dc99eb79f1ac69c615e7b547339f6cd226dd0ed4d7c16b67a"; }; buildInputs = [ pkgconfig glib libsoup gobjectIntrospection]; From 155f4b9ebd5e37602c6ae4460f0c400893d0d120 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:44:27 +0200 Subject: [PATCH 33/73] tracker: add 1.0.1 version --- pkgs/desktops/gnome-3/3.12/core/tracker/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix index dbae108d2e9..79155fe9b56 100644 --- a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix @@ -8,11 +8,11 @@ , libpng, libexif, libgsf, libuuid, bzip2 }: stdenv.mkDerivation rec { - name = "tracker-0.16.4"; + name = "tracker-1.0.1"; src = fetchurl { - url = "mirror://gnome/sources/tracker/0.16/${name}.tar.xz"; - sha256 = "9c2f50839c2b8b352ab9a022597ef985c1900e6286c0c3bcb7a64da39dbb3580"; + url = "mirror://gnome/sources/tracker/1.0/${name}.tar.xz"; + sha256 = "76e7918e62526a8209f9c9226f82abe592a6332826ac7c12e6e405063181e889"; }; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { for f in $out/bin/* $out/libexec/*; do wrapProgram $f \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" done ''; From 519790975aaae07f7650ef9ab75b41970322f94f Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:45:04 +0200 Subject: [PATCH 34/73] evolution-data-server: add 3.12.2 version --- .../3.12/core/evolution-data-server/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix index 685f8c24e7c..d7f65ca6741 100644 --- a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix @@ -1,18 +1,19 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, python, intltool, libsoup, libxml2, libsecret +{ fetchurl, stdenv, pkgconfig, gnome3, python +, intltool, libsoup, libxml2, libsecret, icu , p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }: stdenv.mkDerivation rec { - name = "evolution-data-server-3.10.4"; + name = "evolution-data-server-3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/evolution-data-server/3.10/${name}.tar.xz"; - sha256 = "5c2d5e19af19ecfa81f31306411ab6155c3c62cf407d5a5aaa675a8ce940fa2d"; + url = "mirror://gnome/sources/evolution-data-server/3.12/${name}.tar.xz"; + sha256 = "91c95e17a8c1cd1086dafcd99a40bdf8f5993770f251f8b0a10e5395e3f5a3b6"; }; buildInputs = with gnome3; [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret - gcr p11_kit db nspr nss libgweather libical libgdata gperf makeWrapper ] + gcr p11_kit db nspr nss libgweather libical libgdata gperf makeWrapper icu ] ++ stdenv.lib.optional valaSupport vala; # uoa irrelevant for now From 7b33973ea5d690135f8d121f0abc74338fc15d02 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:45:57 +0200 Subject: [PATCH 35/73] gtksourceview: add 3.12.2 version and use mirror --- pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix index 900bb2c922b..a0669957af6 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gtksourceview-${version}"; - version = "3.10.1"; + version = "3.12.2"; src = fetchurl { - url = "https://download.gnome.org/sources/gtksourceview/3.10/gtksourceview-${version}.tar.xz"; - sha256 = "008bzfr1s6ywpj8c8qx7495lz9g0ziccwbxg88s0l4dl6bw49piq"; + url = "mirror://gnome/sources/gtksourceview/3.12/gtksourceview-${version}.tar.xz"; + sha256 = "62a31eee00f633d7959efb7eec44049ebd0345d670265853dcd21c057f3f30ad"; }; buildInputs = [ pkgconfig atk cairo glib gtk3 pango From 8afd771056345babb51b941d97938421f54acd6b Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:47:23 +0200 Subject: [PATCH 36/73] gsettings-desktop-schemas: add 3.12.2 version and remove unused passthru --- .../core/gsettings-desktop-schemas/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix index 13f357db29a..917bcd99c95 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix @@ -4,27 +4,18 @@ stdenv.mkDerivation rec { - versionMajor = "3.10"; - versionMinor = "1"; + versionMajor = "3.12"; + versionMinor = "2"; moduleName = "gsettings-desktop-schemas"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "04b8wy10l6pzs5928gnzaia73dz5fjlcdy39xi3mf50ajv27h8s5"; + sha256 = "da75021e9c45a60d0a97ea3486f93444275d0ace86dbd1b97e5d09000d8c4ad1"; }; buildInputs = [ glib gobjectIntrospection ]; nativeBuildInputs = [ pkgconfig intltool ]; - - passthru = { - doCompileSchemas = '' - for pkg in "${gsettings_desktop_schemas}" "${gtk3}"; do - cp -s $pkg/share/glib-2.0/schemas/*.gschema.xml $out/share/glib-2.0/schemas/ - done - ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ - ''; - }; } From 81b375fa5e37ee7c1975e3c8acff6de1d4e9db99 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:47:51 +0200 Subject: [PATCH 37/73] gdm: add 3.12.2 version --- pkgs/desktops/gnome-3/3.12/core/gdm/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix index 3df5ab40eaf..070f39199d7 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountservice, libX11 -, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }: +, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, dconf }: stdenv.mkDerivation rec { - name = "gdm-3.10.0.1"; + name = "gdm-3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/gdm/3.10/${name}.tar.xz"; - sha256 = "1rva3djas48m8w1gyv3nds3jxfkirdfl0bk30x79mizrk80456jl"; + url = "mirror://gnome/sources/gdm/3.12/${name}.tar.xz"; + sha256 = "cc91fff5afd2a7c3e712c960a0b60744774167dcfc16f486372e1eb3c0aa1cc4"; }; - buildInputs = [ pkgconfig glib itstool libxml2 intltool accountservice + buildInputs = [ pkgconfig glib itstool libxml2 intltool accountservice dconf gobjectIntrospection libX11 gtk libcanberra_gtk3 pam libtool ]; meta = with stdenv.lib; { From aa56842577ae3135699ded25437836ffe81e5633 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:48:21 +0200 Subject: [PATCH 38/73] gcr: add 3.12.2 version --- pkgs/desktops/gnome-3/3.12/core/gcr/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix index a1fdd471282..74213a4efa0 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib , libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk -, gobjectIntrospection, makeWrapper }: +, gobjectIntrospection, makeWrapper, libxslt }: stdenv.mkDerivation rec { - name = "gcr-3.10.1"; + name = "gcr-3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/gcr/3.10/${name}.tar.xz"; - sha256 = "0nv470a8cvw4rw49hf5aqvll1rpkacmsr3pj8s1l205yaid4yvq0"; + url = "mirror://gnome/sources/gcr/3.12/${name}.tar.xz"; + sha256 = "456e20615ab178aa92eeabdea64dcce535c10d5af189171d9375291a2447d21c"; }; buildInputs = [ - pkgconfig intltool gnupg p11_kit glib gobjectIntrospection + pkgconfig intltool gnupg p11_kit glib gobjectIntrospection libxslt libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper ]; From 961a4aace6250cc4f0e5d01ec3cf15f7a77464bb Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:48:59 +0200 Subject: [PATCH 39/73] gucharmap: add 3.12.1 version and cleanup expr --- pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix index a6bf72b2fc7..590f8706fff 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix @@ -6,15 +6,13 @@ # use packaged gnome3.gnome_icon_theme_symbolic stdenv.mkDerivation rec { - name = "gucharmap-3.10.1"; + name = "gucharmap-3.12.1"; src = fetchurl { - url = "mirror://gnome/sources/gucharmap/3.10/${name}.tar.xz"; - sha256 = "04e8606c65adb14d267b50b1cf9eb4fee92bd9c5ab512a346bd4c9c686403f78"; + url = "mirror://gnome/sources/gucharmap/3.12/${name}.tar.xz"; + sha256 = "5e260767da43f6dc31a8be33ca363da56781349b367464fa9c478bca66aa18d9"; }; - configureFlags = [ "--disable-static" ]; - doCheck = true; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; @@ -27,7 +25,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/gucharmap" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { From bfae2a646b26209eb19e69522d9a0681dea79b02 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:49:57 +0200 Subject: [PATCH 40/73] libpeas: add 1.10.0 version --- pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix index 9cf8426104b..547a52ccf9a 100644 --- a/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libpeas-${version}"; - version = "1.9.0"; + version = "1.10.0"; buildInputs = [ intltool pkgconfig @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/libpeas/1.9/${name}.tar.xz"; - sha256 = "13fzyzv6c0cfdj83z1s16lv8k997wpnzyzr0wfwcfkcmvz64g1q0"; + url = "mirror://gnome/sources/libpeas/1.10/${name}.tar.xz"; + sha256 = "4695bc40e4885a903dbc5ce6a3704392feae63af51fd4da7a3888bb88ca78c47"; }; preFixup = '' From 790fd907ddac83d615bcc45880e9edf2a030a2a9 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:51:11 +0200 Subject: [PATCH 41/73] libgee: add 0.14.0 version --- pkgs/desktops/gnome-3/3.12/core/libgee/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix index c7ed541082d..b21c274ce51 100644 --- a/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }: let - ver_maj = "0.12"; + ver_maj = "0.14"; ver_min = "0"; in stdenv.mkDerivation rec { name = "libgee-${ver_maj}.${ver_min}"; src = fetchurl { - url = "https://download.gnome.org/sources/libgee/${ver_maj}/${name}.tar.xz"; - sha256 = "19bf94ia1h5z8h0hdhwcd2b2p6ngffirg0dai7pdb98dzriys1ni"; + url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz"; + sha256 = "08e466d3f214c9466860b5a82629de0de9eb89b1de7bd918fe154e569b5834cd"; }; doCheck = true; From 7a4c6d1fa6c691f351809766d117ceb065fe2525 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:52:13 +0200 Subject: [PATCH 42/73] libgweather: add 3.12.2 version --- pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix index c480a59e453..8246a2183b7 100644 --- a/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix @@ -2,11 +2,11 @@ , pango, gdk_pixbuf, atk, tzdata }: stdenv.mkDerivation rec { - name = "libgweather-3.10.1"; + name = "libgweather-3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/libgweather/3.10/${name}.tar.xz"; - sha256 = "1iyg0l90m14iw0ksjbmrrhb5fqn0y7x5f726y56gxd4qcxgpi3mf"; + url = "mirror://gnome/sources/libgweather/3.12/${name}.tar.xz"; + sha256 = "54ef096350d7774ab1b3f23ed768246301cdcedfaa762a2c46920bf87fcc1c37"; }; makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; From d29c41e692c678aefc2cdc80b21718a002ac704c Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:53:13 +0200 Subject: [PATCH 43/73] geocode-glib: add 3.12.2 version --- pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix index d3b21bef167..6a461e3bde6 100644 --- a/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { - name = "geocode-glib-3.10.0"; + name = "geocode-glib-3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/geocode-glib/3.10/${name}.tar.xz"; - sha256 = "0dx6v9n4dsskcy6630s77cyb32xlykdall0d555976warycc3v8a"; + url = "mirror://gnome/sources/geocode-glib/3.12/${name}.tar.xz"; + sha256 = "5ca581a927cac3025adc2afadfdaf9a493ca887537a548aa47296bc77bcfa49e"; }; buildInputs = with gnome3; From d1720a73dd487402579dbc5d4db7673dd618a804 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 01:03:42 +0200 Subject: [PATCH 44/73] Add spidermonkey_24 --- .../interpreters/spidermonkey/24.2.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/interpreters/spidermonkey/24.2.nix diff --git a/pkgs/development/interpreters/spidermonkey/24.2.nix b/pkgs/development/interpreters/spidermonkey/24.2.nix new file mode 100644 index 00000000000..44fe4f60d53 --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/24.2.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, pkgconfig, nspr, perl, python, zip }: + +stdenv.mkDerivation rec { + version = "24.2.0"; + name = "spidermonkey-${version}"; + + src = fetchurl { + url = "http://ftp.mozilla.org/pub/mozilla.org/js/mozjs-${version}.tar.bz2"; + sha256 = "1n1phk8r3l8icqrrap4czplnylawa0ddc2cc4cgdz46x3lrkybz6"; + }; + + propagatedBuildInputs = [ nspr ]; + + buildInputs = [ pkgconfig perl python zip ]; + + postUnpack = "sourceRoot=\${sourceRoot}/js/src"; + + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr" + export LIBXUL_DIST=$out + ''; + + configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ]; + + # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393 + preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}"; + + enableParallelBuilding = true; + + doCheck = true; + preCheck = "rm jit-test/tests/sunspider/check-date-format-tofte.js"; # https://bugzil.la/600522 + + meta = with stdenv.lib; { + description = "Mozilla's JavaScript engine written in C/C++"; + homepage = https://developer.mozilla.org/en/SpiderMonkey; + # TODO: MPL/GPL/LGPL tri-license. + maintainers = [ maintainers.goibhniu ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16930c82c8d..f4e0337c3b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3563,6 +3563,7 @@ let spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { }; spidermonkey_185 = callPackage ../development/interpreters/spidermonkey/185-1.0.0.nix { }; spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.0.nix { }; + spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.2.nix { }; supercollider = callPackage ../development/interpreters/supercollider { qt = qt4; From a343b9e380284b3e7adc3ecb6cf15199da3c1255 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:53:56 +0200 Subject: [PATCH 45/73] gjs: add 1.40.1 version --- pkgs/desktops/gnome-3/3.12/core/gjs/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix index 429d147e728..c1e5486d3a7 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix @@ -1,18 +1,18 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_17, pango }: +{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_24, pango }: stdenv.mkDerivation rec { - name = "gjs-1.38.1"; + name = "gjs-1.40.1"; src = fetchurl { - url = "mirror://gnome/sources/gjs/1.38/${name}.tar.xz"; - sha256 = "0xl1zc5ncaxqs5ww5j82rzqrg429l8pdapqclxiba7dxwyh6a83b"; + url = "mirror://gnome/sources/gjs/1.40/${name}.tar.xz"; + sha256 = "2f0d80ec96c6284785143abe51377d8a284977ea6c3cf0cef1020d92eae41793"; }; buildInputs = with gnome3; [ gobjectIntrospection pkgconfig glib pango ]; - propagatedBuildInputs = [ spidermonkey_17 ]; + propagatedBuildInputs = [ spidermonkey_24 ]; meta = with stdenv.lib; { platforms = platforms.linux; From 9157babb2edc9cc9c28001e40fda7f5424f83f5f Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:55:16 +0200 Subject: [PATCH 46/73] yelp-tools: add 3.12.1 version --- pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix index 39ff3838f4a..ba83380f86d 100644 --- a/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: stdenv.mkDerivation rec { - name = "yelp-tools-3.10.0"; + name = "yelp-tools-3.12.1"; src = fetchurl { - url = "https://download.gnome.org/sources/yelp-tools/3.10/${name}.tar.xz"; - sha256 = "0496xyx1657db22ks3k92al64fp6236y5bgh7s7b0j8hcc112ppz"; + url = "mirror://gnome/sources/yelp-tools/3.12/${name}.tar.xz"; + sha256 = "7a5370d7adbec3b6e6b7b5e7e5ed966cb99c797907a186b94b93c184e97f0172"; }; buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ]; From d38e915e2229051980b831f0be82e24a4a5ad13e Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:55:59 +0200 Subject: [PATCH 47/73] yelp-xsl: add 3.12.0 version --- pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix index c5060bdba75..0a5bc78af47 100644 --- a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix @@ -2,11 +2,11 @@ , itstool, libxml2, libxslt }: stdenv.mkDerivation rec { - name = "yelp-xsl-3.10.1"; + name = "yelp-xsl-3.12.0"; src = fetchurl { - url = "https://download.gnome.org/sources/yelp-xsl/3.10/${name}.tar.xz"; - sha256 = "59c6dee3999121f6ffd33a9c5228316b75bc22e3bd68fff310beb4eeff245887"; + url = "mirror://gnome/sources/yelp-xsl/3.12/${name}.tar.xz"; + sha256 = "dd0b8af338b1cdae50444273d7c761e3f511224421487311103edc95a4493656"; }; doCheck = true; From e2879bdc636ec55f917d9bce0f067913cf5e2854 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:57:11 +0200 Subject: [PATCH 48/73] epiphany: add 3.12.1 version and cleanup expr --- .../gnome-3/3.12/core/epiphany/default.nix | 23 +++++++++++-------- .../core/epiphany/libxml_missing_dep.patch | 10 ++++++++ 2 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch diff --git a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix index 9df3a7ed01e..e7c94d8003f 100644 --- a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix @@ -1,43 +1,46 @@ { stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu , bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool , webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit -, sqlite, gcr, avahi, nss, isocodes, itstool, file -, hicolor_icon_theme, gdk_pixbuf, librsvg }: +, sqlite, gcr, avahi, nss, isocodes, itstool, file, which +, hicolor_icon_theme, gdk_pixbuf, librsvg, gnome_common }: stdenv.mkDerivation rec { - name = "epiphany-3.10.3"; + name = "epiphany-3.12.1"; src = fetchurl { - url = "mirror://gnome/sources/epiphany/3.10/${name}.tar.xz"; - sha256 = "c18235ecceaa9c76e7d90d370861cb2bba45019e1e14391a00dac3d2e94a0db7"; + url = "mirror://gnome/sources/epiphany/3.12/${name}.tar.xz"; + sha256 = "16d9f8f10443328b2f226c2da545e75c8433f50f103af8aeb692b098d5fbbf93"; }; # Tests need an X display configureFlags = [ "--disable-static --disable-tests" ]; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; nativeBuildInputs = [ pkgconfig file ]; - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; + configureScript = "./autogen.sh"; buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file webkitgtk libsoup libsecret gnome_desktop libnotify libtool sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools + gdk_pixbuf gnome3.gnome_icon_theme librsvg which gnome_common + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ]; - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss"; + NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; enableParallelBuilding = true; preFixup = '' wrapProgram "$out/bin/epiphany" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; + patches = [ ./libxml_missing_dep.patch ]; + patchFlags = "-p0"; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Epiphany; description = "WebKit based web browser for GNOME"; diff --git a/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch b/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch new file mode 100644 index 00000000000..c4dc85cd97e --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch @@ -0,0 +1,10 @@ +--- configure.ac.orig 2014-05-19 13:28:28.493988695 +0200 ++++ configure.ac 2014-05-19 13:28:54.837159748 +0200 +@@ -115,6 +115,7 @@ + + PKG_CHECK_MODULES(WEB_EXTENSION, [ + $WEBKIT_GTK_PC_NAME >= $WEBKIT_GTK_REQUIRED ++ libxml-2.0 >= $LIBXML_REQUIRED + libsecret-1 >= $LIBSECRET_REQUIRED + ]) + AC_SUBST(WEB_EXTENSION_CFLAGS) From 2246827de15138da95f8a287eaa4cf041b5e0b7b Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:58:13 +0200 Subject: [PATCH 49/73] at-spi2-atk: add 2.12.1 version --- pkgs/desktops/gnome-3/3.12/core/at-spi2-atk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/at-spi2-atk/default.nix b/pkgs/desktops/gnome-3/3.12/core/at-spi2-atk/default.nix index fc0c4f2a6bc..416a33b09a2 100644 --- a/pkgs/desktops/gnome-3/3.12/core/at-spi2-atk/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/at-spi2-atk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { versionMajor = "2.12"; - versionMinor = "0"; + versionMinor = "1"; moduleName = "at-spi2-atk"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "0crn3k6qvn6fjvgm68dj5ska1ppfgmdkaia2db1jp0b9y74nfm1v"; + sha256 = "5fa9c527bdec028e06797563cd52d49bcf06f638549df983424d88db89bb1336"; }; buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi From 3de0ba8a3e6f62dfb9fe628f90810fc01cc52ead Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:59:04 +0200 Subject: [PATCH 50/73] vino: add 3.12.0 version --- pkgs/desktops/gnome-3/3.12/core/vino/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix b/pkgs/desktops/gnome-3/3.12/core/vino/default.nix index 65668dce6a2..2318e68930e 100644 --- a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/vino/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "vino-${versionMajor}.${versionMinor}"; - versionMajor = "3.10"; - versionMinor = "1"; + versionMajor = "3.12"; + versionMinor = "0"; src = fetchurl { url = "mirror://gnome/sources/vino/${versionMajor}/${name}.tar.xz"; - sha256 = "0imyvz96b7kikikwxn1r5sfxwmi40523nd66gp9hrl23gik0vwgs"; + sha256 = "86c9d8b60d79982e4488815db0d441c398e011ad8262659789afecc97a01ca5b"; }; doCheck = true; @@ -16,9 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify file makeWrapper ]; preFixup = '' - for f in "$out/bin/vino-passwd" "$out/libexec/vino-server"; do - wrapProgram $f --prefix XDG_DATA_DIRS : "${gtk3}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - done + wrapProgram "$out/libexec/vino-server" \ + --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { From c2d4a3ffc18af7a9a7565fbd202197612302e34c Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 00:00:13 +0200 Subject: [PATCH 51/73] nautilus: add 3.12.2 version and add tracker support --- .../gnome-3/3.12/core/nautilus/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix index 2041a71a82c..888f622ef33 100644 --- a/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix @@ -1,25 +1,24 @@ { stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif , gtk, gnome3, libunique, intltool, gobjectIntrospection -, libnotify, makeWrapper, exempi, librsvg }: +, libnotify, makeWrapper, exempi, librsvg, tracker }: stdenv.mkDerivation rec { - name = "nautilus-3.10.1"; + name = "nautilus-3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/nautilus/3.10/${name}.tar.xz"; - sha256 = "09y7dxaw4bjgan3q10azky0h6kndqv2lfn75iip12zchf2hk59gn"; + url = "mirror://gnome/sources/nautilus/3.12/${name}.tar.xz"; + sha256 = "969c2bedc324eab7b9399bdb3a7db61f819a2995c733349ded081b059a1cafb1"; }; - configureFlags = [ "--enable-tracker=no" ]; - buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg - gnome3.gnome_desktop gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.gsettings_desktop_schemas libnotify makeWrapper ]; + gnome3.gnome_desktop gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic + gnome3.gsettings_desktop_schemas libnotify makeWrapper tracker ]; preFixup = '' wrapProgram "$out/bin/nautilus" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk}/share:${gnome3.gnome_icon_theme}:${gnome3.gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { From 824a88d6d86fd090c629a942917eae5100f6518a Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 00:00:51 +0200 Subject: [PATCH 52/73] dconf: add 0.20.0 version --- pkgs/desktops/gnome-3/3.12/core/dconf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix index a6236f16744..a1d98449bee 100644 --- a/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "dconf-${version}"; - version = "0.18.0"; + version = "0.20.0"; src = fetchurl { - url = "mirror://gnome/sources/dconf/0.18/${name}.tar.xz"; - sha256 = "0mf921pnkhs8xn1dr2wxfq277vjsbkpl9cccv0gaz4460z31p6qh"; + url = "mirror://gnome/sources/dconf/0.20/${name}.tar.xz"; + sha256 = "22c046a247d05ea65ad181e3aef4009c898a5531f76c0181f8ec0dfef83447d9"; }; buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 From 18bfa30a30c718271827bbc1aa1c89a2414c676b Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 00:02:13 +0200 Subject: [PATCH 53/73] sushi: add 3.12.0 version --- pkgs/desktops/gnome-3/3.12/core/sushi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix index 089b5cd03c1..2830d5bac27 100644 --- a/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix @@ -4,11 +4,11 @@ , gdk_pixbuf, librsvg, hicolor_icon_theme }: stdenv.mkDerivation rec { - name = "sushi-3.10.0"; + name = "sushi-3.12.0"; src = fetchurl { - url = "mirror://gnome/sources/sushi/3.10/${name}.tar.xz"; - sha256 = "cffcf28b170f5825e84983a979972d4d901a453b61cbe3e560d362e8dd4b4bc8"; + url = "mirror://gnome/sources/sushi/3.12/${name}.tar.xz"; + sha256 = "78594a858371b671671205e7b2518e7eb82ed8c2540b62f45a657aaabdf1a9ff"; }; propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; From 28bc9ddfb07205112ed60051795cac706ad340c2 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 00:02:54 +0200 Subject: [PATCH 54/73] zenity: add 3.12.1 version --- pkgs/desktops/gnome-3/3.12/core/zenity/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix index 366088c6729..ca20bbc785d 100644 --- a/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { - versionMajor = "3.8"; - versionMinor = "0"; + versionMajor = "3.12"; + versionMinor = "1"; name = "zenity-${versionMajor}.${versionMinor}"; src = fetchurl { - url = "mirror://gnome/sources/zenity/${versionMajor}/zenity-${versionMajor}.${versionMinor}.tar.xz"; - sha256 = "0gsnwvhsqqba5i6d4jh86j29q4q18hmvhj9c1v76vwlj2nvz1ywl"; + url = "mirror://gnome/sources/zenity/${versionMajor}/${name}.tar.xz"; + sha256 = "a59705cdd1ea5318fdae3075c1cedcbead479230e9bead204391566d973dae11"; }; buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ]; From 5637f0fbcd8f922f3e7cd99e46b57adadc24cb0f Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 00:04:07 +0200 Subject: [PATCH 55/73] gnome-keyring: add 3.12.2 version --- pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix index dbb8da93c6c..59667fe3323 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix @@ -3,11 +3,11 @@ , docbook_xsl_ns, docbook_xsl, gnome3 }: stdenv.mkDerivation rec { - name = "gnome-keyring-3.10.1"; + name = "gnome-keyring-3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-keyring/3.10/${name}.tar.xz"; - sha256 = "1y6v2p14jx5h6yh14c53pd8r0r5zbmcgw8v4nxvf94kd9jliy00q"; + url = "mirror://gnome/sources/gnome-keyring/3.12/${name}.tar.xz"; + sha256 = "3bc39a42d445b82d24247a8c39eeb0eef7ecb1c8ebb8e6ec62671868be93fd4c"; }; buildInputs = with gnome3; [ From 02934df3ee7b7e75fdaf19b2d2874b350165756a Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 00:05:04 +0200 Subject: [PATCH 56/73] libzapojit: use gnome mirror --- pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix index e0e4c02c084..5e2559899b7 100644 --- a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libzapojit-0.0.3"; src = fetchurl { - url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz"; + url = "mirror://gnome/sources//3.10/${name}.tar.xz"; sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; }; From f07fd89111a0dd3da11ad764064df454399332e6 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 00:17:13 +0200 Subject: [PATCH 57/73] Allow specifying the gnome3 packages to use for the xserver service --- .../services/desktops/gnome3/at-spi2-core.nix | 7 +++++-- .../services/desktops/gnome3/gnome-documents.nix | 7 +++++-- .../services/desktops/gnome3/gnome-keyring.nix | 7 +++++-- .../desktops/gnome3/gnome-online-accounts.nix | 7 +++++-- .../services/desktops/gnome3/gnome-online-miners.nix | 7 +++++-- .../services/desktops/gnome3/gnome-user-share.nix | 7 +++++-- nixos/modules/services/desktops/gnome3/seahorse.nix | 7 +++++-- nixos/modules/services/desktops/gnome3/sushi.nix | 7 +++++-- nixos/modules/services/desktops/gnome3/tracker.nix | 7 +++++-- .../modules/services/x11/desktop-managers/gnome3.nix | 12 +++++++++--- 10 files changed, 54 insertions(+), 21 deletions(-) diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix index 22a54f511d1..615f272e7b9 100644 --- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix +++ b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix @@ -4,6 +4,9 @@ with lib; +let + gnome3 = config.environment.gnome3.packageSet; +in { ###### interface @@ -30,9 +33,9 @@ with lib; config = mkIf config.services.gnome3.at-spi2-core.enable { - environment.systemPackages = [ pkgs.gnome3.at_spi2_core ]; + environment.systemPackages = [ gnome3.at_spi2_core ]; - services.dbus.packages = [ pkgs.gnome3.at_spi2_core ]; + services.dbus.packages = [ gnome3.at_spi2_core ]; }; diff --git a/nixos/modules/services/desktops/gnome3/gnome-documents.nix b/nixos/modules/services/desktops/gnome3/gnome-documents.nix index 1f7592c0b41..2279ef48fb9 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-documents.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-documents.nix @@ -4,6 +4,9 @@ with pkgs.lib; +let + gnome3 = config.environment.gnome3.packageSet; +in { ###### interface @@ -30,9 +33,9 @@ with pkgs.lib; config = mkIf config.services.gnome3.gnome-documents.enable { - environment.systemPackages = [ pkgs.gnome3.gnome-documents ]; + environment.systemPackages = [ gnome3.gnome-documents ]; - services.dbus.packages = [ pkgs.gnome3.gnome-documents ]; + services.dbus.packages = [ gnome3.gnome-documents ]; services.gnome3.gnome-online-accounts.enable = true; diff --git a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix index 447fd783f14..be14f1fcbc0 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix @@ -4,6 +4,9 @@ with pkgs.lib; +let + gnome3 = config.environment.gnome3.packageSet; +in { ###### interface @@ -31,9 +34,9 @@ with pkgs.lib; config = mkIf config.services.gnome3.gnome-keyring.enable { - environment.systemPackages = [ pkgs.gnome3.gnome_keyring ]; + environment.systemPackages = [ gnome3.gnome_keyring ]; - services.dbus.packages = [ pkgs.gnome3.gnome_keyring ]; + services.dbus.packages = [ gnome3.gnome_keyring ]; }; diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix index 365e19c15bb..a41fb0101f0 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix @@ -4,6 +4,9 @@ with pkgs.lib; +let + gnome3 = config.environment.gnome3.packageSet; +in { ###### interface @@ -30,9 +33,9 @@ with pkgs.lib; config = mkIf config.services.gnome3.gnome-online-accounts.enable { - environment.systemPackages = [ pkgs.gnome3.gnome_online_accounts ]; + environment.systemPackages = [ gnome3.gnome_online_accounts ]; - services.dbus.packages = [ pkgs.gnome3.gnome_online_accounts ]; + services.dbus.packages = [ gnome3.gnome_online_accounts ]; }; diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix b/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix index c921327a74c..030d4bac6a7 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix @@ -4,6 +4,9 @@ with pkgs.lib; +let + gnome3 = config.environment.gnome3.packageSet; +in { ###### interface @@ -30,9 +33,9 @@ with pkgs.lib; config = mkIf config.services.gnome3.gnome-online-miners.enable { - environment.systemPackages = [ pkgs.gnome3.gnome-online-miners ]; + environment.systemPackages = [ gnome3.gnome-online-miners ]; - services.dbus.packages = [ pkgs.gnome3.gnome-online-miners ]; + services.dbus.packages = [ gnome3.gnome-online-miners ]; }; diff --git a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix index df796ed77ff..3b6c713f7be 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix @@ -4,6 +4,9 @@ with pkgs.lib; +let + gnome3 = config.environment.gnome3.packageSet; +in { ###### interface @@ -30,9 +33,9 @@ with pkgs.lib; config = mkIf config.services.gnome3.gnome-user-share.enable { - environment.systemPackages = [ pkgs.gnome3.gnome-user-share ]; + environment.systemPackages = [ gnome3.gnome-user-share ]; - services.xserver.displayManager.sessionCommands = with pkgs.gnome3; '' + services.xserver.displayManager.sessionCommands = with gnome3; '' # Don't let gnome-control-center depend upon gnome-user-share export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome-user-share}/share/gsettings-schemas/${gnome-user-share.name} ''; diff --git a/nixos/modules/services/desktops/gnome3/seahorse.nix b/nixos/modules/services/desktops/gnome3/seahorse.nix index cad22a6a598..01e4a24f267 100644 --- a/nixos/modules/services/desktops/gnome3/seahorse.nix +++ b/nixos/modules/services/desktops/gnome3/seahorse.nix @@ -4,6 +4,9 @@ with pkgs.lib; +let + gnome3 = config.environment.gnome3.packageSet; +in { ###### interface @@ -29,9 +32,9 @@ with pkgs.lib; config = mkIf config.services.gnome3.seahorse.enable { - environment.systemPackages = [ pkgs.gnome3.seahorse ]; + environment.systemPackages = [ gnome3.seahorse ]; - services.dbus.packages = [ pkgs.gnome3.seahorse ]; + services.dbus.packages = [ gnome3.seahorse ]; }; diff --git a/nixos/modules/services/desktops/gnome3/sushi.nix b/nixos/modules/services/desktops/gnome3/sushi.nix index 7a4389038b2..ff7f484602c 100644 --- a/nixos/modules/services/desktops/gnome3/sushi.nix +++ b/nixos/modules/services/desktops/gnome3/sushi.nix @@ -4,6 +4,9 @@ with lib; +let + gnome3 = config.environment.gnome3.packageSet; +in { ###### interface @@ -29,9 +32,9 @@ with lib; config = mkIf config.services.gnome3.sushi.enable { - environment.systemPackages = [ pkgs.gnome3.sushi ]; + environment.systemPackages = [ gnome3.sushi ]; - services.dbus.packages = [ pkgs.gnome3.sushi ]; + services.dbus.packages = [ gnome3.sushi ]; }; diff --git a/nixos/modules/services/desktops/gnome3/tracker.nix b/nixos/modules/services/desktops/gnome3/tracker.nix index 94a22d0c881..670e585c6f5 100644 --- a/nixos/modules/services/desktops/gnome3/tracker.nix +++ b/nixos/modules/services/desktops/gnome3/tracker.nix @@ -4,6 +4,9 @@ with pkgs.lib; +let + gnome3 = config.environment.gnome3.packageSet; +in { ###### interface @@ -30,9 +33,9 @@ with pkgs.lib; config = mkIf config.services.gnome3.tracker.enable { - environment.systemPackages = [ pkgs.gnome3.tracker ]; + environment.systemPackages = [ gnome3.tracker ]; - services.dbus.packages = [ pkgs.gnome3.tracker ]; + services.dbus.packages = [ gnome3.tracker ]; }; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 3f48035f6bb..63f39ec0d3a 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -4,13 +4,13 @@ with lib; let cfg = config.services.xserver.desktopManager.gnome3; - gnome3 = pkgs.gnome3; + gnome3 = config.environment.gnome3.packageSet; # Remove packages of ys from xs, based on their names removePackagesByName = xs: ys: let pkgName = drv: (builtins.parseDrvName drv.name).name; - ysNames = map pkgName ys; + ysNames = map pkgName ys; res = (filter (x: !(builtins.elem (pkgName x) ysNames)) xs); in filter (x: !(builtins.elem (pkgName x) ysNames)) xs; @@ -35,6 +35,12 @@ in { description = "Enable Gnome 3 desktop manager."; }; + environment.gnome3.packageSet = mkOption { + default = pkgs.gnome3; + example = literalExample "pkgs.gnome3_12"; + description = "Which Gnome 3 package set to use."; + }; + environment.gnome3.excludePackages = mkOption { default = []; example = "[ pkgs.gnome3.totem ]"; @@ -80,7 +86,7 @@ in { # Don't let epiphany depend upon gnome-shell # Override default mimeapps - export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${pkgs.gnome3.gnome_shell}/share/gsettings-schemas/${pkgs.gnome3.gnome_shell.name}:${mimeAppsList}/share + export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome3.gnome_shell}/share/gsettings-schemas/${gnome3.gnome_shell.name}:${mimeAppsList}/share # Let gnome-control-center find gnome-shell search providers export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/ From 4334d8be9f9abb5d0ff0ed2a8fa577de93687ba5 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 10:55:16 +0200 Subject: [PATCH 58/73] json-glib: 0.16.0 -> 1.0.0 --- pkgs/development/libraries/json-glib/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 255c5f1ccba..7a45ca0f227 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { src = fetchurlGnome { project = "json-glib"; - major = "0"; - minor = "16"; - patchlevel = "2"; + major = "1"; + minor = "0"; + patchlevel = "0"; extension = "xz"; - sha256 = "0b22yw0n87mg7a5lkqw1d7xqnm8qj1bwy0wklv9b2yn29qv7am59"; + sha256 = "dbf558d2da989ab84a27e4e13daa51ceaa97eb959c2c2f80976c9322a8f4cdde"; }; configureflags= "--with-introspection" ; @@ -17,8 +17,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gobjectIntrospection ]; nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = with stdenv.lib; { homepage = http://live.gnome.org/JsonGlib; description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format"; + license = licenses.lgpl2; + maintainers = with maintainers; [ lethalman ]; }; } From 5de85d27ab74b82ca789056a50fc1627d8ad2263 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 11:04:04 +0200 Subject: [PATCH 59/73] vte: 0.35.90 -> 0.36.2 --- pkgs/desktops/gnome-3/3.12/core/vte/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix index d98ddc716de..53ce47cca54 100644 --- a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { - versionMajor = "0.35"; - versionMinor = "90"; + versionMajor = "0.36"; + versionMinor = "2"; moduleName = "vte"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "c47182d1724db479095b918898ce62297ec71988f24cd575506151c59f7b98cf"; + sha256 = "f45eed3aed823068c7563345ea947be0e6ddb3dacd74646e6d7d26a921e04345"; }; buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ]; From 819b5841c6586662416df895502040d64377331f Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 11:46:42 +0200 Subject: [PATCH 60/73] gnome-music: add 3.12.2 version --- pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix index b8d2bbc79ef..c6a98bb3ef0 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix @@ -4,11 +4,11 @@ , makeWrapper, itstool, gnome3, librsvg, gst_all_1 }: stdenv.mkDerivation rec { - name = "gnome-music-3.10.4"; + name = "gnome-music-3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-music/3.10/${name}.tar.xz"; - sha256 = "64220d4c0f9115a6ed27ec99c7ec7afc065d12e5a32371936f303ef981f5325f"; + url = "mirror://gnome/sources/gnome-music/3.12/${name}.tar.xz"; + sha256 = "ec4807018166aabed0263cb3ffce672e1fc1a3e959f48a5ad48b8eb08ddb451a"; }; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; From df95a8cc2f922e41aab51d94e3faacc83ed0e80a Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 13:13:32 +0200 Subject: [PATCH 61/73] upower: add 0.99 version for gnome 3.12 --- nixos/modules/services/hardware/upower.nix | 22 ++++++-- .../services/x11/desktop-managers/gnome3.nix | 1 + pkgs/desktops/gnome-3/3.10/default.nix | 2 +- pkgs/desktops/gnome-3/3.12/default.nix | 1 + pkgs/os-specific/linux/upower/0.99.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 73 insertions(+), 6 deletions(-) create mode 100644 pkgs/os-specific/linux/upower/0.99.nix diff --git a/nixos/modules/services/hardware/upower.nix b/nixos/modules/services/hardware/upower.nix index a202d82f646..0b6a101efa0 100644 --- a/nixos/modules/services/hardware/upower.nix +++ b/nixos/modules/services/hardware/upower.nix @@ -4,6 +4,9 @@ with lib; +let + cfg = config.services.upower; +in { ###### interface @@ -21,6 +24,15 @@ with lib; ''; }; + package = mkOption { + type = types.package; + default = pkgs.upower; + example = lib.literalExample "pkgs.upower"; + description = '' + Which upower package to use. + ''; + }; + }; }; @@ -28,13 +40,13 @@ with lib; ###### implementation - config = mkIf config.services.upower.enable { + config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.upower ]; + environment.systemPackages = [ cfg.package ]; - services.dbus.packages = [ pkgs.upower ]; + services.dbus.packages = [ cfg.package ]; - services.udev.packages = [ pkgs.upower ]; + services.udev.packages = [ cfg.package ]; systemd.services.upower = { description = "Power Management Daemon"; @@ -42,7 +54,7 @@ with lib; serviceConfig = { Type = "dbus"; BusName = "org.freedesktop.UPower"; - ExecStart = "@${pkgs.upower}/libexec/upowerd upowerd"; + ExecStart = "@${cfg.package}/libexec/upowerd upowerd"; }; }; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 63f39ec0d3a..4398a97ff47 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -70,6 +70,7 @@ in { services.telepathy.enable = mkDefault true; networking.networkmanager.enable = true; services.upower.enable = config.powerManagement.enable; + services.upower.package = gnome3.upower; fonts.fonts = [ pkgs.dejavu_fonts ]; diff --git a/pkgs/desktops/gnome-3/3.10/default.nix b/pkgs/desktops/gnome-3/3.10/default.nix index 2cb28e0c307..b58bf7ef1d3 100644 --- a/pkgs/desktops/gnome-3/3.10/default.nix +++ b/pkgs/desktops/gnome-3/3.10/default.nix @@ -1,7 +1,7 @@ { callPackage, self, pkgs }: rec { - inherit (pkgs) glib gtk2 gtk3 gnome2; + inherit (pkgs) glib gtk2 gtk3 gnome2 upower; gtk = gtk3; # just to be sure libcanberra = pkgs.libcanberra_gtk3; # just to be sure inherit (pkgs.gnome2) ORBit2; diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index e5c57903da0..f1c876d3665 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -3,6 +3,7 @@ rec { inherit (pkgs) glib gtk2 gtk3 gnome2; gnome3 = pkgs.gnome3_12; + upower = pkgs.upower_99; gtk = gtk3; # just to be sure libcanberra = pkgs.libcanberra_gtk3; # just to be sure inherit (pkgs.gnome2) ORBit2; diff --git a/pkgs/os-specific/linux/upower/0.99.nix b/pkgs/os-specific/linux/upower/0.99.nix new file mode 100644 index 00000000000..c42fea16d35 --- /dev/null +++ b/pkgs/os-specific/linux/upower/0.99.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit +, intltool, libxslt, docbook_xsl, udev, libusb1, pmutils +, useSystemd ? true, systemd, gobjectIntrospection +}: + +assert stdenv.isLinux; + +stdenv.mkDerivation rec { + name = "upower-0.99.0"; + + src = fetchurl { + url = "http://upower.freedesktop.org/releases/${name}.tar.xz"; + sha256 = "189rd8j5czy4fs7imxvr38icjh9vlgdz6ki2h08v530h96clndaz"; + }; + + buildInputs = + [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 gobjectIntrospection ] + ++ stdenv.lib.optional useSystemd systemd; + + nativeBuildInputs = [ pkgconfig ]; + + preConfigure = + '' + substituteInPlace src/linux/up-backend.c \ + --replace /usr/bin/pm- ${pmutils}/bin/pm- \ + --replace /usr/sbin/pm- ${pmutils}/sbin/pm- + substituteInPlace src/notify-upower.sh \ + --replace /usr/bin/dbus-send ${dbus_tools}/bin/dbus-send + ''; + + configureFlags = + [ "--with-backend=linux" "--localstatedir=/var" + "--enable-deprecated" # needed for Xfce (Nov 2013) + ] + ++ stdenv.lib.optional useSystemd + [ "--enable-systemd" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-systemdutildir=$(out)/lib/systemd/system-sleep" + "--with-udevrulesdir=$(out)/lib/udev/rules.d" + ]; + + NIX_CFLAGS_LINK = "-lgcc_s"; + + installFlags = "historydir=$(TMPDIR)/foo"; + + meta = { + homepage = http://upower.freedesktop.org/; + description = "A D-Bus service for power management"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4e0337c3b3..9d88f1ff5eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7544,6 +7544,8 @@ let upower = callPackage ../os-specific/linux/upower { }; + upower_99 = callPackage ../os-specific/linux/upower/0.99.nix { }; + upstart = callPackage ../os-specific/linux/upstart { }; usbutils = callPackage ../os-specific/linux/usbutils { }; From 288076154f8fbee7c34c5b6d6fb7105f1b144b0b Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 13:26:28 +0200 Subject: [PATCH 62/73] appdata-tools: add new package --- pkgs/tools/misc/appdata-tools/default.nix | 25 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/appdata-tools/default.nix diff --git a/pkgs/tools/misc/appdata-tools/default.nix b/pkgs/tools/misc/appdata-tools/default.nix new file mode 100644 index 00000000000..acacc4db15f --- /dev/null +++ b/pkgs/tools/misc/appdata-tools/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, autoconf, automake, m4 +, intltool, glib, libsoup, gdk_pixbuf }: + +stdenv.mkDerivation rec { + version = "0_1_7"; + name = "appdata_tools-${version}"; + + src = fetchurl { + url = "https://github.com/hughsie/appdata-tools/archive/appdata_tools_${version}.tar.gz"; + sha256 = "1bzqg4gy8gqhbk2qjizsm0b78li9mv84fb3d8qwfpxh7c7p360x8"; + }; + + buildInputs = [ pkgconfig autoconf automake m4 intltool glib + libsoup gdk_pixbuf ]; + + configureScript = "./autogen.sh"; + + meta = with stdenv.lib; { + homepage = "http://people.freedesktop.org/~hughsient/appdata"; + description = "CLI designed to validate AppData descriptions for standards compliance and to the style guide"; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ lethalman ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d88f1ff5eb..809a2a6b6ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -642,6 +642,8 @@ let apparix = callPackage ../tools/misc/apparix { }; + appdata-tools = callPackage ../tools/misc/appdata-tools { }; + asciidoc = callPackage ../tools/typesetting/asciidoc { inherit (pythonPackages) matplotlib numpy aafigure recursivePthLoader; enableStandardFeatures = false; From 380af2be66a379b87683682713c92dc08c9b0855 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 14:42:38 +0200 Subject: [PATCH 63/73] geoclue2: 2.0.0 -> 2.1.8 --- pkgs/development/libraries/geoclue/2.0.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index d799dfb6027..3932fa945c8 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -1,18 +1,18 @@ { fetchurl, stdenv, intltool, pkgconfig, glib, json_glib, libsoup, geoip -, dbus, dbus_glib +, dbus, dbus_glib, networkmanager, modemmanager }: stdenv.mkDerivation rec { - name = "geoclue-2.0.0"; + name = "geoclue-2.1.8"; src = fetchurl { - url = "http://www.freedesktop.org/software/geoclue/releases/2.0/${name}.tar.xz"; - sha256 = "18b7ikdcw2rm04gzw82216shp5m9pghvnsddw233s5jswn2g30ja"; + url = "http://www.freedesktop.org/software/geoclue/releases/2.1/${name}.tar.xz"; + sha256 = "05h102110gsxxvmvllssfz7ldjpwrrb5sqg5rbpibys6iy4w1k6m"; }; buildInputs = [ intltool pkgconfig glib json_glib libsoup geoip - dbus dbus_glib + dbus dbus_glib networkmanager modemmanager ]; preConfigure = '' From 3b39718eba4885499b38e5bbbaf45df3ffe219ce Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 14:53:06 +0200 Subject: [PATCH 64/73] Add cogl 1.18 --- pkgs/desktops/gnome-3/3.12/default.nix | 1 + pkgs/development/libraries/cogl/1.18.nix | 59 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 62 insertions(+) create mode 100644 pkgs/development/libraries/cogl/1.18.nix diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index f1c876d3665..39f77a97b2a 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -4,6 +4,7 @@ rec { inherit (pkgs) glib gtk2 gtk3 gnome2; gnome3 = pkgs.gnome3_12; upower = pkgs.upower_99; + cogl = pkgs.cogl_1_18; gtk = gtk3; # just to be sure libcanberra = pkgs.libcanberra_gtk3; # just to be sure inherit (pkgs.gnome2) ORBit2; diff --git a/pkgs/development/libraries/cogl/1.18.nix b/pkgs/development/libraries/cogl/1.18.nix new file mode 100644 index 00000000000..7aad8ba1b43 --- /dev/null +++ b/pkgs/development/libraries/cogl/1.18.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty +, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland +, gstreamerSupport ? true, gst_all_1 }: + +let + ver_maj = "1.18"; + ver_min = "0"; +in +stdenv.mkDerivation rec { + name = "cogl-${ver_maj}.${ver_min}"; + + src = fetchurl { + url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz"; + sha256 = "0phg76jpkn0j948axavzr15gyrqipzmzzr66nlp3dfksgszixnd4"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + configureFlags = [ + "--enable-introspection" + "--enable-gles1" + "--enable-gles2" + "--enable-kms-egl-platform" + "--enable-wayland-egl-platform" + "--enable-wayland-egl-server" + ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"; + + propagatedBuildInputs = with xorg; [ + glib gdk_pixbuf gobjectIntrospection + mesa_noglu libXrandr libXfixes libXcomposite libXdamage wayland + ] + ++ libintlOrEmpty + ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer + gst_all_1.gst-plugins-base ]; + + buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; + + COGL_PANGO_DEP_CFLAGS + = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport) + "-I${pango}/include/pango-1.0 -I${cairo}/include/cairo"; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + + #doCheck = true; # all tests fail (no idea why) + + meta = with stdenv.lib; { + description = "A small open source library for using 3D graphics hardware for rendering"; + maintainers = with maintainers; [ lovek323 ]; + + longDescription = '' + Cogl is a small open source library for using 3D graphics hardware for + rendering. The API departs from the flat state machine style of OpenGL + and is designed to make it easy to write orthogonal components that can + render without stepping on each other's toes. + ''; + + platforms = stdenv.lib.platforms.mesaPlatforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 809a2a6b6ca..09279d2edfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4264,6 +4264,8 @@ let cogl = callPackage ../development/libraries/cogl { }; + cogl_1_18 = callPackage ../development/libraries/cogl/1.18.nix { }; + coin3d = callPackage ../development/libraries/coin3d { }; commoncpp2 = callPackage ../development/libraries/commoncpp2 { }; From 820462559890136883d98a30d80ccdd7d4aa4d7f Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 18:06:55 +0200 Subject: [PATCH 65/73] evolution: add 3.12.2 version --- .../gnome-3/3.12/apps/evolution/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix index ee62c951b4c..982256b15d8 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix @@ -1,15 +1,15 @@ { stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight -, pkgconfig, gtk3, glib, hicolor_icon_theme, libnotify -, makeWrapper, itstool, shared_mime_info, libical, db +, pkgconfig, gtk3, glib, hicolor_icon_theme, libnotify, gtkspell3 +, makeWrapper, itstool, shared_mime_info, libical, db, gcr , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu -, libcanberra_gtk3, bogofilter, gst_all_1, procps }: +, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }: stdenv.mkDerivation rec { - name = "evolution-3.10.4"; + name = "evolution-3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/evolution/3.10/${name}.tar.xz"; - sha256 = "ac60557f264f211e6a7bc0ced919041c154e4c7b9c79600516aee7acc1d03e40"; + url = "mirror://gnome/sources/evolution/3.12/${name}.tar.xz"; + sha256 = "60742334aaf1e3b9f044c2003c44a37be5905b166e24580e9e6e6c5ae1b9f948"; }; doCheck = true; @@ -18,17 +18,17 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gdk_pixbuf gnome3.gnome_icon_theme librsvg db icu - gnome3.evolution_data_server libsecret libical - webkitgtk shared_mime_info gnome3.gnome_desktop + gnome3.evolution_data_server libsecret libical gcr + webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3 libcanberra_gtk3 gnome3.gtkhtml bogofilter gnome3.libgdata - gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit hicolor_icon_theme gnome3.gnome_icon_theme_symbolic nss nspr libnotify procps highlight gnome3.libgweather gnome3.gsettings_desktop_schemas makeWrapper ]; configureFlags = [ "--disable-spamassassin" "--disable-pst-import" ]; - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss"; + NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; enableParallelBuilding = true; From c4ccc4afbc745e2ea6f6b22f21463830ef8efc7c Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 18:07:52 +0200 Subject: [PATCH 66/73] bijiben: add 3.12.2 version --- pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix index ef460112d21..c4d609790fa 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix @@ -1,14 +1,14 @@ { stdenv, intltool, fetchurl, pkgconfig, glib -, hicolor_icon_theme, makeWrapper, itstool +, hicolor_icon_theme, makeWrapper, itstool, desktop_file_utils , clutter_gtk, libuuid, webkitgtk, zeitgeist , gnome3, librsvg, gdk_pixbuf, libxml2 }: stdenv.mkDerivation rec { - name = "bijiben-3.10.2"; + name = "bijiben-3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/bijiben/3.10/${name}.tar.xz"; - sha256 = "81257f85218968b0ad386da6e1143586de478870ca74bb5387646a479999a7d4"; + url = "mirror://gnome/sources/bijiben/3.12/${name}.tar.xz"; + sha256 = "f319ef2a5b69ff9368e7488a28453da0f10eaa39a0f8e5d74623d0c07c824708"; }; doCheck = true; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib intltool itstool libxml2 clutter_gtk libuuid webkitgtk gnome3.tracker - gnome3.gnome_online_accounts zeitgeist + gnome3.gnome_online_accounts zeitgeist desktop_file_utils gnome3.gsettings_desktop_schemas makeWrapper gdk_pixbuf gnome3.gnome_icon_theme librsvg hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; From 9032bcd1dcb79324d4b916fb12f57c2c5155f5a1 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 18:09:15 +0200 Subject: [PATCH 67/73] gnome-documents: add 3.12.1 version --- pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix index b393bb43931..8e47382954a 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix @@ -6,11 +6,11 @@ , gmp, desktop_file_utils }: stdenv.mkDerivation rec { - name = "gnome-documents-3.10.2"; + name = "gnome-documents-3.12.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-documents/3.10/${name}.tar.xz"; - sha256 = "2b7267c9c4e5767039632cb31877ed2e57f994b657e8863dd79af5287db45745"; + url = "mirror://gnome/sources/gnome-documents/3.12/${name}.tar.xz"; + sha256 = "6d0df1d90781d56992ed5d5c2591833e89e3aa756ccab63f82dd935185ce5a53"; }; doCheck = true; From 6c0e43d2498527ee0c49854fb82ece0447ea80ae Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 18:20:02 +0200 Subject: [PATCH 68/73] Add clutter 1.18 --- pkgs/desktops/gnome-3/3.12/default.nix | 1 + pkgs/development/libraries/clutter/1.18.nix | 52 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 57 insertions(+) create mode 100644 pkgs/development/libraries/clutter/1.18.nix diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index 39f77a97b2a..ec18dbd0b79 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -3,6 +3,7 @@ rec { inherit (pkgs) glib gtk2 gtk3 gnome2; gnome3 = pkgs.gnome3_12; + clutter = pkgs.clutter_1_18; upower = pkgs.upower_99; cogl = pkgs.cogl_1_18; gtk = gtk3; # just to be sure diff --git a/pkgs/development/libraries/clutter/1.18.nix b/pkgs/development/libraries/clutter/1.18.nix new file mode 100644 index 00000000000..898c931f354 --- /dev/null +++ b/pkgs/development/libraries/clutter/1.18.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes +, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, +gobjectIntrospection +}: + +let + ver_maj = "1.18"; + ver_min = "2"; +in +stdenv.mkDerivation rec { + name = "clutter-${ver_maj}.${ver_min}"; + + src = fetchurl { + url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz"; + sha256 = "f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63"; + }; + + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = + [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango + atk json_glib gobjectIntrospection + ]; + + configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK + + #doCheck = true; # no tests possible without a display + + meta = { + description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; + + longDescription = + '' Clutter is free software library for creating fast, compelling, + portable, and dynamic graphical user interfaces. It is a core part + of MeeGo, and is supported by the open source community. Its + development is sponsored by Intel. + + Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use + on mobile and embedded platforms), but wraps an easy to use, + efficient, flexible API around GL's complexity. + + Clutter enforces no particular user interface style, but provides a + rich, generic foundation for higher-level toolkits tailored to + specific needs. + ''; + + license = "LGPLv2+"; + homepage = http://www.clutter-project.org/; + + maintainers = with stdenv.lib.maintainers; [ urkud ]; + platforms = stdenv.lib.platforms.mesaPlatforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09279d2edfa..955fb1f7a52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4255,6 +4255,10 @@ let clutter = callPackage ../development/libraries/clutter { }; + clutter_1_18 = callPackage ../development/libraries/clutter/1.18.nix { + cogl = cogl_1_18; + }; + clutter-gst = callPackage ../development/libraries/clutter-gst { }; clutter_gtk = callPackage ../development/libraries/clutter-gtk { }; From bf280dbbed1a3c5c13d5de95a226df5f4ea712e7 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 18:45:17 +0200 Subject: [PATCH 69/73] gnome 3.12: compile clutter-gtk and clutter-gst with clutter 1.18 --- pkgs/desktops/gnome-3/3.12/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index ec18dbd0b79..87fbfd437cc 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -4,6 +4,8 @@ rec { inherit (pkgs) glib gtk2 gtk3 gnome2; gnome3 = pkgs.gnome3_12; clutter = pkgs.clutter_1_18; + clutter_gtk = pkgs.clutter_gtk.override { inherit clutter; }; + clutter-gst = pkgs.clutter-gst.override { inherit clutter; }; upower = pkgs.upower_99; cogl = pkgs.cogl_1_18; gtk = gtk3; # just to be sure From c334a850731f8aee02284c02ef157a5ecc4a8d12 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 18:20:11 +0200 Subject: [PATCH 70/73] gfbgraph: 0.2 -> 0.2.2 --- pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix index ee8259af8d6..d36534f0d32 100644 --- a/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix +++ b/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix @@ -2,15 +2,15 @@ , gnome3, libsoup, json_glib }: stdenv.mkDerivation rec { - name = "gfbgraph-0.2"; + name = "gfbgraph-0.2.2"; src = fetchurl { url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz"; - sha256 = "534ca84920445b9d89e2480348eedde3ce950db3628ae0a79703e8f2d52fa724"; + sha256 = "66c7b1c951863565c179d0b4b5207f27b3b36f80afed9f6a9acfc5fc3ae775d4"; }; - buildInputs = [ pkgconfig glib libsoup gnome3.gnome_online_accounts - json_glib gnome3.rest ]; + buildInputs = [ pkgconfig glib gnome3.gnome_online_accounts ]; + propagatedBuildInputs = [ libsoup json_glib gnome3.rest ]; enableParallelBuilding = true; From 6a62b890b3877b7c556b9ffe3a8acca4a5ad4e15 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 18:24:27 +0200 Subject: [PATCH 71/73] gnome-photos: add 3.12.1 version --- pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix index 68d4e3690f9..17ed92da870 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix @@ -5,11 +5,11 @@ , gnome3, librsvg, gdk_pixbuf, libexif }: stdenv.mkDerivation rec { - name = "gnome-photos-3.10.2"; + name = "gnome-photos-3.12.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-photos/3.10/${name}.tar.xz"; - sha256 = "820503c26a0f829682dd46653e8f0850ac687aba42728ac74350ba8406e80975"; + url = "mirror://gnome/sources/gnome-photos/3.12/${name}.tar.xz"; + sha256 = "077cc6c2ae28680457fba435a22184e25f3a60a6fbe1901a75e42f6f6136538f"; }; doCheck = true; From af3d1ad06d16fe771655a33ca9d96c3068ca9dea Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 21:40:37 +0200 Subject: [PATCH 72/73] Add gnome 3.12 test --- nixos/tests/gnome3_12.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 nixos/tests/gnome3_12.nix diff --git a/nixos/tests/gnome3_12.nix b/nixos/tests/gnome3_12.nix new file mode 100644 index 00000000000..92a1919b8cb --- /dev/null +++ b/nixos/tests/gnome3_12.nix @@ -0,0 +1,30 @@ +import ./make-test.nix { + + machine = + { config, pkgs, ... }: + + { imports = [ ./common/user-account.nix ]; + + services.xserver.enable = true; + + services.xserver.displayManager.auto.enable = true; + services.xserver.displayManager.auto.user = "alice"; + services.xserver.desktopManager.gnome3.enable = true; + environment.gnome3.packageSet = pkgs.gnome3_12; + }; + + testScript = + '' + $machine->waitForX; + $machine->sleep(15); + + # Check that logging in has given the user ownership of devices. + $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); + + $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'"); + $machine->waitForWindow(qr/Terminal/); + $machine->sleep(10); + $machine->screenshot("screen"); + ''; + +} From 23ccdd979aafafc7443dc844d4a15e3392ef3bc9 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 22:06:18 +0200 Subject: [PATCH 73/73] gnome-terminal: disable migration from gconf to gsettings --- .../desktops/gnome-3/3.12/core/gnome-terminal/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix index 2c4b838ad8b..17731444f00 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, gconf, libuuid +, gnome_doc_utils, intltool, libX11, which, libuuid , desktop_file_utils, itstool, ncurses, makeWrapper, appdata-tools }: stdenv.mkDerivation rec { @@ -15,15 +15,15 @@ stdenv.mkDerivation rec { }; buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools - gnome3.dconf gnome3.gconf itstool ncurses makeWrapper ]; + gnome3.dconf itstool ncurses makeWrapper ]; nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ]; # FIXME: enable for gnome3 - configureFlags = [ "--disable-search-provider" "--without-nautilus-extension" ]; + configureFlags = [ "--disable-search-provider" "--without-nautilus-extension" "--disable-migration" ]; preFixup = '' - for f in "$out/libexec/gnome-terminal-migration" "$out/libexec/gnome-terminal-server"; do + for f in "$out/libexec/gnome-terminal-server"; do wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" done '';