diff options
Diffstat (limited to 'pkgs/desktops/gnome-3/3.18')
13 files changed, 57 insertions, 262 deletions
diff --git a/pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix b/pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix index 1dbbd390877..81bbd443e96 100644 --- a/pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix +++ b/pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "evolution-3.18.3"; + name = "evolution-3.18.4"; src = fetchurl { - url = mirror://gnome/sources/evolution/3.18/evolution-3.18.3.tar.xz; - sha256 = "f073b7cbef4ecc3dc4c3e0b80f98198eec577a20cae93e784659e8cf5af7c9b9"; + url = mirror://gnome/sources/evolution/3.18/evolution-3.18.4.tar.xz; + sha256 = "8161a0ebc77e61904dfaca9745595fefbf84d834a07ee1132d1f8d030dabfefb"; }; } diff --git a/pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix index e368fd2cdd9..167acabee91 100644 --- a/pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix +++ b/pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gedit-3.18.2"; + name = "gedit-3.18.3"; src = fetchurl { - url = mirror://gnome/sources/gedit/3.18/gedit-3.18.2.tar.xz; - sha256 = "856e451aec29ee45980011de57cadfe89c3cbc53968f6cc865f8efe0bd0d49b1"; + url = mirror://gnome/sources/gedit/3.18/gedit-3.18.3.tar.xz; + sha256 = "6762ac0d793b0f754a2da5f88739d04fa39daa7491c5c46401d24bcef76c32e7"; }; } diff --git a/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix index 33e724ce997..76e860f5680 100644 --- a/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu , bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool -, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit +, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit , sqlite, gcr, avahi, nss, isocodes, itstool, file, which , gdk_pixbuf, librsvg, gnome_common }: @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { for f in $out/bin/* $out/libexec/*; do wrapProgram "$f" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" done ''; diff --git a/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix index 9f899fb6e42..5b465be415b 100644 --- a/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix +++ b/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "evolution-data-server-3.18.3"; + name = "evolution-data-server-3.18.4"; src = fetchurl { - url = mirror://gnome/sources/evolution-data-server/3.18/evolution-data-server-3.18.3.tar.xz; - sha256 = "9de9d6392822bb4b89318a88f5db1fd2f0f09899b793a0dd5525a656ed0e8163"; + url = mirror://gnome/sources/evolution-data-server/3.18/evolution-data-server-3.18.4.tar.xz; + sha256 = "0b756f05feae538676832acc122407046a89d4dd32da725789229dc3c416433f"; }; } diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix index 2e0df487ee4..30edc3ab50e 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-bluetooth-3.18.1"; + name = "gnome-bluetooth-3.18.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-bluetooth/3.18/gnome-bluetooth-3.18.1.tar.xz; - sha256 = "c51d5b896d32845a2b5bb6ccd48926c88c8e9ef0915c32d3c56cb7e7974d4a49"; + url = mirror://gnome/sources/gnome-bluetooth/3.18/gnome-bluetooth-3.18.2.tar.xz; + sha256 = "d8df073c331df0f97261869fb77ffcdbf4e3e4eaf460d3c3ed2b16e03d9c5398"; }; } diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/src.nix index 501e4ed0b1e..41b03825303 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/src.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-calculator-3.18.2"; + name = "gnome-calculator-3.18.3"; src = fetchurl { - url = mirror://gnome/sources/gnome-calculator/3.18/gnome-calculator-3.18.2.tar.xz; - sha256 = "c86c5857409ce1d01896904e97ccf0a1a880f3dcf428a524e5c0fec27b274d64"; + url = mirror://gnome/sources/gnome-calculator/3.18/gnome-calculator-3.18.3.tar.xz; + sha256 = "c376a4a14a3f7946b799b8458ac4cf2694735fc7c20e90cfda29e209439e32ff"; }; } diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/src.nix index 9e3660f207b..07fe6eceb13 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/src.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-dictionary-3.18.0"; + name = "gnome-dictionary-3.18.1"; src = fetchurl { - url = mirror://gnome/sources/gnome-dictionary/3.18/gnome-dictionary-3.18.0.tar.xz; - sha256 = "5338962124f6d784920ed4968d98734a7589513b36e4f4a6ff00d1ed5afb4ead"; + url = mirror://gnome/sources/gnome-dictionary/3.18/gnome-dictionary-3.18.1.tar.xz; + sha256 = "92cf2d519335b125018468c22405499fdb320e4446201c7b0f55f1a441bf05cc"; }; } diff --git a/pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix index bb02f9c6f84..6448f9aa99d 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gtksourceview-3.18.1"; + name = "gtksourceview-3.18.2"; src = fetchurl { - url = mirror://gnome/sources/gtksourceview/3.18/gtksourceview-3.18.1.tar.xz; - sha256 = "7be95faf068b9f0ac7540cc1e8d607baa98a482850ef11a6471b53c9327aede6"; + url = mirror://gnome/sources/gtksourceview/3.18/gtksourceview-3.18.2.tar.xz; + sha256 = "60f75a9f0039e13a2281fc595b5ef7344afa06732cc53b57d13234bfb0a5b7b2"; }; } diff --git a/pkgs/desktops/gnome-3/3.18/core/nautilus/src.nix b/pkgs/desktops/gnome-3/3.18/core/nautilus/src.nix index 83809052efc..9314e202a88 100644 --- a/pkgs/desktops/gnome-3/3.18/core/nautilus/src.nix +++ b/pkgs/desktops/gnome-3/3.18/core/nautilus/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "nautilus-3.18.4"; + name = "nautilus-3.18.5"; src = fetchurl { - url = mirror://gnome/sources/nautilus/3.18/nautilus-3.18.4.tar.xz; - sha256 = "4ff2c78dba352b4666bb30e0c80ed786eed09199fd624f00810fce4d987fcd26"; + url = mirror://gnome/sources/nautilus/3.18/nautilus-3.18.5.tar.xz; + sha256 = "60a927c0522b4cced9d8f62baed2ee5e2fd4305be4523eb5bc44805971a6cc15"; }; } diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/default.nix b/pkgs/desktops/gnome-3/3.18/core/vte/default.nix index e1e260f1e02..078ec871135 100644 --- a/pkgs/desktops/gnome-3/3.18/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/vte/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection, vala, libxml2 -, gnutls, selectTextPatch ? false }: +{ stdenv, fetchurl, intltool, pkgconfig +, gnome3, ncurses, gobjectIntrospection, vala, libxml2, gnutls -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; +, selectTextPatch ? false +, fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf +}: - patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.0.40.0.patch; +let baseAttrs = rec { + inherit (import ./src.nix fetchurl) name src; - buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib + buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses vala libxml2 ]; propagatedBuildInputs = [ gnutls ]; @@ -36,4 +38,22 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ astsmtl antono lethalman ]; platforms = platforms.linux; }; -} +}; + +in stdenv.mkDerivation ( baseAttrs + // stdenv.lib.optionalAttrs selectTextPatch rec { + name = "vte-ng-${version}"; + version = "0.42.1.a"; + src = fetchFromGitHub { + owner = "thestinger"; + repo = "vte-ng"; + rev = version; + sha256 = "1296rvngixi6l31mhhaks6vr1xyqw8h6n5hwknadrlk95nknrpxm"; + }; + # slightly hacky; I couldn't make it work with autoreconfHook + configureScript = "./autogen.sh"; + nativeBuildInputs = (baseAttrs.nativeBuildInputs or []) + ++ [ gtk_doc autoconf automake libtool gperf ]; + } +) + diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/expose_select_text.0.40.0.patch b/pkgs/desktops/gnome-3/3.18/core/vte/expose_select_text.0.40.0.patch deleted file mode 100644 index c18f1b76b41..00000000000 --- a/pkgs/desktops/gnome-3/3.18/core/vte/expose_select_text.0.40.0.patch +++ /dev/null @@ -1,226 +0,0 @@ -Only in vte-0.40.0.new: .git -diff --unified -aur vte-0.40.0/src/vteaccess.c vte-0.40.0.new/src/vteaccess.c ---- vte-0.40.0/src/vteaccess.c 2015-03-16 06:34:37.000000000 -0400 -+++ vte-0.40.0.new/src/vteaccess.c 2015-04-10 00:08:53.146853382 -0400 -@@ -1444,7 +1444,7 @@ - *start_offset = offset_from_xy (priv, start_x, start_y); - _vte_terminal_get_end_selection (terminal, &end_x, &end_y); - *end_offset = offset_from_xy (priv, end_x, end_y); -- return _vte_terminal_get_selection (terminal); -+ return vte_terminal_get_selection (terminal); - } - - static gboolean -diff --unified -aur vte-0.40.0/src/vte.c vte-0.40.0.new/src/vte.c ---- vte-0.40.0/src/vte.c 2015-03-18 12:38:09.000000000 -0400 -+++ vte-0.40.0.new/src/vte.c 2015-04-10 00:08:53.150186722 -0400 -@@ -123,7 +123,6 @@ - gpointer data, - GArray *attributes, - gboolean include_trailing_spaces); --static void _vte_terminal_disconnect_pty_read(VteTerminal *terminal); - static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal); - static void vte_terminal_stop_processing (VteTerminal *terminal); - -@@ -3344,9 +3343,10 @@ - _vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n"); - terminal->pvt->pty_input_source = 0; - } --static void --_vte_terminal_connect_pty_read(VteTerminal *terminal) -+void -+vte_terminal_connect_pty_read(VteTerminal *terminal) - { -+ g_return_if_fail(VTE_IS_TERMINAL(terminal)); - if (terminal->pvt->pty_channel == NULL) { - return; - } -@@ -3398,9 +3398,10 @@ - } - } - --static void --_vte_terminal_disconnect_pty_read(VteTerminal *terminal) -+void -+vte_terminal_disconnect_pty_read(VteTerminal *terminal) - { -+ g_return_if_fail(VTE_IS_TERMINAL(terminal)); - if (terminal->pvt->pty_input_source != 0) { - _vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n"); - g_source_remove(terminal->pvt->pty_input_source); -@@ -6302,6 +6303,28 @@ - } - } - -+/** -+ * vte_terminal_set_cursor_position: -+ * @terminal: a #VteTerminal -+ * @column: the new cursor column -+ * @row: the new cursor row -+ * -+ * Set the location of the cursor. -+ */ -+void -+vte_terminal_set_cursor_position(VteTerminal *terminal, -+ long column, long row) -+{ -+ g_return_if_fail(VTE_IS_TERMINAL(terminal)); -+ -+ _vte_invalidate_cursor_once(terminal, FALSE); -+ terminal->pvt->cursor.col = column; -+ terminal->pvt->cursor.row = row; -+ _vte_invalidate_cursor_once(terminal, FALSE); -+ _vte_check_cursor_blink(terminal); -+ vte_terminal_queue_cursor_moved(terminal); -+} -+ - static GtkClipboard * - vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board) - { -@@ -6465,7 +6488,7 @@ - vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE); - - /* Temporarily stop caring about input from the child. */ -- _vte_terminal_disconnect_pty_read(terminal); -+ vte_terminal_disconnect_pty_read(terminal); - } - - static gboolean -@@ -6482,7 +6505,7 @@ - terminal->pvt->selecting = FALSE; - - /* Reconnect to input from the child if we paused it. */ -- _vte_terminal_connect_pty_read(terminal); -+ vte_terminal_connect_pty_read(terminal); - - return TRUE; - } -@@ -6982,6 +7005,50 @@ - vte_terminal_deselect_all (terminal); - } - -+/** -+ * vte_terminal_get_selection_block_mode: -+ * @terminal: a #VteTerminal -+ * -+ * Checks whether or not block selection is enabled. -+ * -+ * Returns: %TRUE if block selection is enabled, %FALSE if not -+ */ -+gboolean -+vte_terminal_get_selection_block_mode(VteTerminal *terminal) { -+ g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE); -+ return terminal->pvt->selection_block_mode; -+} -+ -+/** -+ * vte_terminal_set_selection_block_mode: -+ * @terminal: a #VteTerminal -+ * @block_mode: whether block selection is enabled -+ * -+ * Sets whether or not block selection is enabled. -+ */ -+void -+vte_terminal_set_selection_block_mode(VteTerminal *terminal, gboolean block_mode) { -+ g_return_if_fail(VTE_IS_TERMINAL(terminal)); -+ terminal->pvt->selection_block_mode = block_mode; -+} -+ -+/** -+ * vte_terminal_select_text: -+ * @terminal: a #VteTerminal -+ * @start_col: the starting column for the selection -+ * @start_row: the starting row for the selection -+ * @end_col: the end column for the selection -+ * @end_row: the end row for the selection -+ * -+ * Sets the current selection region. -+ */ -+void -+vte_terminal_select_text(VteTerminal *terminal, -+ long start_col, long start_row, -+ long end_col, long end_row) { -+ _vte_terminal_select_text(terminal, start_col, start_row, end_col, end_row, 0, 0); -+} -+ - /* Autoscroll a bit. */ - static gboolean - vte_terminal_autoscroll(VteTerminal *terminal) -@@ -8631,7 +8698,7 @@ - #endif - kill(terminal->pvt->pty_pid, SIGHUP); - } -- _vte_terminal_disconnect_pty_read(terminal); -+ vte_terminal_disconnect_pty_read(terminal); - _vte_terminal_disconnect_pty_write(terminal); - if (terminal->pvt->pty_channel != NULL) { - g_io_channel_unref (terminal->pvt->pty_channel); -@@ -12188,7 +12255,7 @@ - g_object_freeze_notify(object); - - if (pvt->pty != NULL) { -- _vte_terminal_disconnect_pty_read(terminal); -+ vte_terminal_disconnect_pty_read(terminal); - _vte_terminal_disconnect_pty_write(terminal); - - if (terminal->pvt->pty_channel != NULL) { -@@ -12243,7 +12310,7 @@ - _vte_terminal_setup_utf8 (terminal); - - /* Open channels to listen for input on. */ -- _vte_terminal_connect_pty_read (terminal); -+ vte_terminal_connect_pty_read (terminal); - - g_object_notify(object, "pty"); - -@@ -12276,7 +12343,7 @@ - } - - char * --_vte_terminal_get_selection(VteTerminal *terminal) -+vte_terminal_get_selection(VteTerminal *terminal) - { - g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL); - -diff --unified -aur vte-0.40.0/src/vteint.h vte-0.40.0.new/src/vteint.h ---- vte-0.40.0/src/vteint.h 2014-05-28 08:22:48.000000000 -0400 -+++ vte-0.40.0.new/src/vteint.h 2015-04-10 00:08:53.153520062 -0400 -@@ -25,7 +25,6 @@ - G_BEGIN_DECLS - - void _vte_terminal_accessible_ref(VteTerminal *terminal); --char* _vte_terminal_get_selection(VteTerminal *terminal); - void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y); - void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y); - void _vte_terminal_select_text(VteTerminal *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset); -diff --unified -aur vte-0.40.0/src/vteterminal.h vte-0.40.0.new/src/vteterminal.h ---- vte-0.40.0/src/vteterminal.h 2015-03-18 12:38:09.000000000 -0400 -+++ vte-0.40.0.new/src/vteterminal.h 2015-04-10 00:08:53.150186722 -0400 -@@ -169,6 +169,18 @@ - - void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); - void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); -+gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); -+void vte_terminal_set_selection_block_mode(VteTerminal *terminal, -+ gboolean block_mode) _VTE_GNUC_NONNULL(1); -+void vte_terminal_select_text(VteTerminal *terminal, -+ long start_col, long start_row, -+ long end_col, long end_row) _VTE_GNUC_NONNULL(1); -+char * -+vte_terminal_get_selection(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); -+ -+/* pause and unpause output */ -+void vte_terminal_disconnect_pty_read(VteTerminal *vte); -+void vte_terminal_connect_pty_read(VteTerminal *vte); - - /* By-word selection */ - void vte_terminal_set_word_char_exceptions(VteTerminal *terminal, -@@ -280,6 +292,8 @@ - void vte_terminal_get_cursor_position(VteTerminal *terminal, - glong *column, - glong *row) _VTE_GNUC_NONNULL(1); -+void vte_terminal_set_cursor_position(VteTerminal *terminal, -+ long column, long row) _VTE_GNUC_NONNULL(1); - - /* Add a matching expression, returning the tag the widget assigns to that - * expression. */ diff --git a/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix index c96e12eedde..fd7ecbea01f 100644 --- a/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix @@ -2,12 +2,12 @@ , pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper }: stdenv.mkDerivation rec { - version = "${gnome3.version}.2"; + version = "${gnome3.version}.3"; name = "gpaste-${version}"; src = fetchurl { url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "0w9d0vbqhvc78vqlsyaywmrpzibr7137398azpfh416bm6vh6d3h"; + sha256 = "1fyrdgsn4m3fh8450qcic243sl7llfs44cdbspwpn5zb4h2hk8rj"; }; buildInputs = [ intltool autoreconfHook pkgconfig vala glib diff --git a/pkgs/desktops/gnome-3/3.18/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.18/misc/pomodoro/default.nix index 0440af440fe..ec8b6c62228 100644 --- a/pkgs/desktops/gnome-3/3.18/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/3.18/misc/pomodoro/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - rev = "624945d"; + rev = "4844fada548ba4d30e1441e063565f9e46334ffd"; name = "gnome-shell-pomodoro-${gnome3.version}-${rev}"; src = fetchFromGitHub { owner = "codito"; repo = "gnome-pomodoro"; rev = "${rev}"; - sha256 = "0vjy95zvd309n8g13fa80qhqlv7k6wswhrjw7gddxrnmr662xdqq"; + sha256 = "11vqlz0gcvrvf87hwwxvpw3lv50ail16nlynlzkqfd2dac028mag"; }; configureScript = ''./autogen.sh''; |