diff options
Diffstat (limited to 'pkgs/desktops/gnome/core')
49 files changed, 200 insertions, 250 deletions
diff --git a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix index 5d287f4e6fd9f..324d439d75897 100644 --- a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "JEK/sG9ObMlb9uJoL9/5j6Xt3GiHUbnWIVxiPLTkL/E="; + hash = "sha256-S8tTm9ddZNo4XW+gjLqp3erOtqyOgrhbpsQRF79bpk4="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/baobab/default.nix b/pkgs/desktops/gnome/core/baobab/default.nix index 120d69441a7f2..3978661baabb8 100644 --- a/pkgs/desktops/gnome/core/baobab/default.nix +++ b/pkgs/desktops/gnome/core/baobab/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "baobab"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "p9LPMIpsg57gsL8HT49f1g1iri8GSpSzxhDWVgt1joY="; + hash = "sha256-zk3vXILQVnGlAJ9768+FrJhnXZ2BYNKK2RgbJppy43w="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/caribou/default.nix b/pkgs/desktops/gnome/core/caribou/default.nix index 69afefbc94ca3..5f853efdab83b 100644 --- a/pkgs/desktops/gnome/core/caribou/default.nix +++ b/pkgs/desktops/gnome/core/caribou/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, pkg-config, gnome, glib, gtk3, clutter, dbus, python3, libxml2 , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook -, wrapGAppsHook, libgee, vala }: +, wrapGAppsHook3, libgee, vala }: let pname = "caribou"; @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook vala ]; + nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook3 vala ]; buildInputs = [ glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3 diff --git a/pkgs/desktops/gnome/core/dconf-editor/default.nix b/pkgs/desktops/gnome/core/dconf-editor/default.nix index f62cd9a74376c..2b1b747a74a2c 100644 --- a/pkgs/desktops/gnome/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome/core/dconf-editor/default.nix @@ -16,7 +16,7 @@ , libxml2 , gettext , docbook-xsl-nons -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection }: @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { vala libxslt pkg-config - wrapGAppsHook + wrapGAppsHook3 gettext docbook-xsl-nons libxml2 diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index 0867de3915d3a..b59eb108c0149 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -20,7 +20,7 @@ , gdk-pixbuf , exempi , shared-mime-info -, wrapGAppsHook +, wrapGAppsHook3 , libjxl , librsvg , webp-pixbuf-loader @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { pkg-config gettext itstool - wrapGAppsHook + wrapGAppsHook3 libxml2 # for xmllint for xml-stripblanks gobject-introspection gi-docgen diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index f28949d8a8b37..ab1c4d6b10516 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "45.3"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "bDAum91mKQyw4m9ihDzUxDWklVq9u08VHwfcgEldZzA="; + hash = "sha256-9DSPLPUcB8DBBtEwFy1NI/LNQGh3Hh3gB7dYyireVmA="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index ee21e8c6384d7..41db4063e9f60 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -23,7 +23,7 @@ , libarchive , libhandy , libsecret -, wrapGAppsHook +, wrapGAppsHook3 , librsvg , gobject-introspection , yelp-tools @@ -42,13 +42,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "45.0"; + version = "46.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0YZH1Cdcvd8NMoF7HQTjBzQqhb6RTsTa0tgIKq+KpKg="; + hash = "sha256-r/avaTksBJVr+tl23sXRWDtB1aM06TeZX3w8oHQN4iE="; }; depsBuildBuild = [ @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 yelp-tools ]; diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 1957025bf3b27..b5326c4e7f814 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -21,7 +21,7 @@ , nss , libical , gperf -, wrapGAppsHook +, wrapGAppsHook3 , glib-networking , gsettings-desktop-schemas , pcre @@ -50,13 +50,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.50.4"; + version = "3.52.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-1+3/vgOgu87L7mc5MhS4McexjNiVuExNv+E4d3biV8U="; + hash = "sha256-gls9fVRoRApn0R3SojkzlgwHue7MeXuxJYQ8sshwo0g="; }; patches = [ @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { gettext python3 gperf - wrapGAppsHook + wrapGAppsHook3 gobject-introspection vala ]; @@ -147,10 +147,6 @@ stdenv.mkDerivation rec { --replace "-Wl,--no-undefined" "" substituteInPlace src/services/evolution-alarm-notify/e-alarm-notify.c \ --replace "G_OS_WIN32" "__APPLE__" - '' + lib.optionalString stdenv.cc.isClang '' - # https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/513 - substituteInPlace src/addressbook/libebook-contacts/e-phone-number-private.cpp \ - --replace "std::auto_ptr" "std::unique_ptr" ''; postInstall = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch index 6fef728193913..de8186d01c5e4 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch @@ -1,8 +1,8 @@ diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c -index bd479d8..bd049b3 100644 +index 5e65ec8..8ca28c6 100644 --- a/src/addressbook/libebook/e-book-client.c +++ b/src/addressbook/libebook/e-book-client.c -@@ -1997,7 +1997,18 @@ e_book_client_get_self (ESourceRegistry *registry, +@@ -1924,7 +1924,18 @@ e_book_client_get_self (ESourceRegistry *registry, *out_client = book_client; @@ -22,7 +22,7 @@ index bd479d8..bd049b3 100644 uid = g_settings_get_string (settings, SELF_UID_KEY); g_object_unref (settings); -@@ -2065,7 +2076,18 @@ e_book_client_set_self (EBookClient *client, +@@ -1992,7 +2003,18 @@ e_book_client_set_self (EBookClient *client, g_return_val_if_fail ( e_contact_get_const (contact, E_CONTACT_UID) != NULL, FALSE); @@ -42,7 +42,7 @@ index bd479d8..bd049b3 100644 g_settings_set_string ( settings, SELF_UID_KEY, e_contact_get_const (contact, E_CONTACT_UID)); -@@ -2101,8 +2123,18 @@ e_book_client_is_self (EContact *contact) +@@ -2028,8 +2050,18 @@ e_book_client_is_self (EContact *contact) * unfortunately the API doesn't allow that. */ g_mutex_lock (&mutex); @@ -128,7 +128,7 @@ index e85a56b..59d3fe2 100644 g_object_unref (settings); diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c -index 63e1016..0492756 100644 +index 5b4debf..77c8d9c 100644 --- a/src/addressbook/libedata-book/e-book-meta-backend.c +++ b/src/addressbook/libedata-book/e-book-meta-backend.c @@ -144,7 +144,18 @@ ebmb_is_power_saver_enabled (void) @@ -152,10 +152,10 @@ index 63e1016..0492756 100644 if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c -index 42f3457..b4926af 100644 +index 43bd383..4dce824 100644 --- a/src/calendar/backends/contacts/e-cal-backend-contacts.c +++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c -@@ -1387,7 +1387,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) +@@ -1369,7 +1369,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) (GDestroyNotify) g_free, (GDestroyNotify) contact_record_free); @@ -202,10 +202,10 @@ index 2525856..7ecc1a8 100644 g_clear_object (&settings); } diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c -index ade0a73..d7c3e73 100644 +index 44ba49c..dfac2a2 100644 --- a/src/calendar/libecal/e-reminder-watcher.c +++ b/src/calendar/libecal/e-reminder-watcher.c -@@ -2626,8 +2626,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher) +@@ -2826,8 +2826,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher) watcher->priv = e_reminder_watcher_get_instance_private (watcher); watcher->priv->cancellable = g_cancellable_new (); @@ -242,7 +242,7 @@ index ade0a73..d7c3e73 100644 g_signal_connect_object ( watcher->priv->desktop_settings, diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c -index 27fa153..3679d72 100644 +index b9145af..350fcd3 100644 --- a/src/calendar/libedata-cal/e-cal-meta-backend.c +++ b/src/calendar/libedata-cal/e-cal-meta-backend.c @@ -156,7 +156,18 @@ ecmb_is_power_saver_enabled (void) @@ -265,7 +265,7 @@ index 27fa153..3679d72 100644 if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; -@@ -2633,7 +2644,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend, +@@ -2632,7 +2643,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend, if (is_declined) { GSettings *settings; @@ -288,7 +288,7 @@ index 27fa153..3679d72 100644 g_clear_object (&settings); } diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c -index bef9188..ce92f6c 100644 +index d5a0823..2ae03f8 100644 --- a/src/camel/camel-cipher-context.c +++ b/src/camel/camel-cipher-context.c @@ -1631,7 +1631,18 @@ camel_cipher_can_load_photos (void) @@ -312,7 +312,7 @@ index bef9188..ce92f6c 100644 g_clear_object (&settings); diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c -index 4deae76..ebe0a1b 100644 +index cecd740..9a15180 100644 --- a/src/camel/camel-gpg-context.c +++ b/src/camel/camel-gpg-context.c @@ -747,7 +747,18 @@ gpg_ctx_get_executable_name (void) @@ -361,10 +361,10 @@ index e61160c..b6553a4 100644 G_CALLBACK (mi_user_headers_settings_changed_cb), NULL); G_UNLOCK (mi_user_headers); diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c -index 8518c90..6a655a9 100644 +index bbf214b..bed39d2 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c -@@ -5627,7 +5627,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) +@@ -5661,7 +5661,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) if (do_old_flags_update) { GSettings *eds_settings; @@ -433,10 +433,10 @@ index 188f276..939f89b 100644 settings, "network-monitor-gio-name", object, "gio-name", diff --git a/src/libedataserver/e-oauth2-service-google.c b/src/libedataserver/e-oauth2-service-google.c -index ec08afe..7b31227 100644 +index 1453410..a3f06b0 100644 --- a/src/libedataserver/e-oauth2-service-google.c +++ b/src/libedataserver/e-oauth2-service-google.c -@@ -71,7 +71,18 @@ eos_google_read_settings (EOAuth2Service *service, +@@ -72,7 +72,18 @@ eos_google_read_settings (EOAuth2Service *service, if (!value) { GSettings *settings; @@ -529,10 +529,10 @@ index af59b0b..0c7e75e 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c -index 4a9b398..e7cb404 100644 +index 1539f8b..77cf123 100644 --- a/src/libedataserver/e-source-registry.c +++ b/src/libedataserver/e-source-registry.c -@@ -1773,7 +1773,19 @@ e_source_registry_init (ESourceRegistry *registry) +@@ -1754,7 +1754,19 @@ e_source_registry_init (ESourceRegistry *registry) g_mutex_init (®istry->priv->sources_lock); diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix index b136fa75a0398..bbbe4fbb25b31 100644 --- a/pkgs/desktops/gnome/core/gdm/default.nix +++ b/pkgs/desktops/gnome/core/gdm/default.nix @@ -7,6 +7,7 @@ , ninja , pkg-config , glib +, json-glib , itstool , xorg , accountsservice @@ -42,13 +43,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gdm"; - version = "45.0.1"; + version = "46.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - sha256 = "ZXJXjAXjxladbtJp994qrzoDVldlRYbYJDkHu3pv+oU="; + hash = "sha256-jWy1IXbspItrvxz+L9rgjZZ3taDyvKYA3uRgTeDdHvw="; }; mesonFlags = [ @@ -76,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { accountsservice audit glib + json-glib gtk3 keyutils libX11 @@ -94,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { # https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/92 (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gdm/-/commit/ccecd9c975d04da80db4cd547b67a1a94fa83292.patch"; - sha256 = "5hKS9wjjhuSAYwXct5vS0dPbmPRIINJoLC0Zm1naz6Q="; + hash = "sha256-5hKS9wjjhuSAYwXct5vS0dPbmPRIINJoLC0Zm1naz6Q="; revert = true; }) diff --git a/pkgs/desktops/gnome/core/gdm/fix-paths.patch b/pkgs/desktops/gnome/core/gdm/fix-paths.patch index 980627c78d460..4ad417285f275 100644 --- a/pkgs/desktops/gnome/core/gdm/fix-paths.patch +++ b/pkgs/desktops/gnome/core/gdm/fix-paths.patch @@ -1,8 +1,8 @@ diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c -index 5fbbad68..739718ec 100644 +index f2d8e155b..54b998826 100644 --- a/daemon/gdm-local-display-factory.c +++ b/daemon/gdm-local-display-factory.c -@@ -233,9 +233,9 @@ struct GdmDisplayServerConfiguration { +@@ -245,9 +245,9 @@ struct GdmDisplayServerConfiguration { const char *session_type; } display_server_configuration[] = { #ifdef ENABLE_WAYLAND_SUPPORT @@ -15,10 +15,10 @@ index 5fbbad68..739718ec 100644 }; diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c -index cc61efc9..4c9d15af 100644 +index fc5aef6ac..c61e0046b 100644 --- a/daemon/gdm-manager.c +++ b/daemon/gdm-manager.c -@@ -148,7 +148,7 @@ plymouth_is_running (void) +@@ -151,7 +151,7 @@ plymouth_is_running (void) GError *error; error = NULL; @@ -27,7 +27,7 @@ index cc61efc9..4c9d15af 100644 NULL, NULL, &status, &error); if (! res) { g_debug ("Could not ping plymouth: %s", error->message); -@@ -166,7 +166,7 @@ plymouth_prepare_for_transition (void) +@@ -169,7 +169,7 @@ plymouth_prepare_for_transition (void) GError *error; error = NULL; @@ -36,7 +36,7 @@ index cc61efc9..4c9d15af 100644 NULL, NULL, NULL, &error); if (! res) { g_warning ("Could not deactivate plymouth: %s", error->message); -@@ -181,7 +181,7 @@ plymouth_quit_with_transition (void) +@@ -184,7 +184,7 @@ plymouth_quit_with_transition (void) GError *error; error = NULL; @@ -45,7 +45,7 @@ index cc61efc9..4c9d15af 100644 if (! res) { g_warning ("Could not quit plymouth: %s", error->message); g_error_free (error); -@@ -197,7 +197,7 @@ plymouth_quit_without_transition (void) +@@ -200,7 +200,7 @@ plymouth_quit_without_transition (void) GError *error; error = NULL; @@ -55,10 +55,10 @@ index cc61efc9..4c9d15af 100644 g_warning ("Could not quit plymouth: %s", error->message); g_error_free (error); diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c -index 4b709731..245ac0cf 100644 +index a4c4b2dcf..67416b204 100644 --- a/daemon/gdm-session.c +++ b/daemon/gdm-session.c -@@ -2972,16 +2972,16 @@ gdm_session_start_session (GdmSession *self, +@@ -3193,16 +3193,16 @@ gdm_session_start_session (GdmSession *self, */ if (run_launcher) { if (is_x11) { @@ -79,7 +79,7 @@ index 4b709731..245ac0cf 100644 } } diff --git a/data/gdm.service.in b/data/gdm.service.in -index 17e8a8de..afc70977 100644 +index 17e8a8de8..afc709778 100644 --- a/data/gdm.service.in +++ b/data/gdm.service.in @@ -26,7 +26,7 @@ Restart=always diff --git a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix index 808ff7c0c293c..f60631ac2280a 100644 --- a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "gnome-backgrounds"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "zuDmiPuuXvenXzNa2i0Qd54I68qURfFYbeMsWptt7i0="; + hash = "sha256-Td06xDmkoGeHaAWSG7dfTTyLhaIY1Hwnbd3eiShEPC4="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix index 9389127e578c2..526363a613938 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix @@ -12,7 +12,7 @@ , udev , itstool , libxml2 -, wrapGAppsHook +, wrapGAppsHook3 , libnotify , libcanberra-gtk3 , gobject-introspection @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { itstool pkg-config libxml2 - wrapGAppsHook + wrapGAppsHook3 gobject-introspection gtk-doc docbook-xsl-nons diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix index b9701f3d5e11e..8b1fd59d3f8cc 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "gnome-bluetooth"; - version = "42.8"; + version = "46.0"; # TODO: split out "lib" outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "dsJB6MosmxA1NkU1yiYIT4n8XA4YKVEPiQlYMRX8wts="; + hash = "sha256-E/4edfMXrNvfXoDJAp0uBjLWCpzPcqQ64263VFAh++8="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix index 248282c50c748..059ca6522e835 100644 --- a/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, appstream , meson , ninja , vala @@ -24,14 +25,15 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "45.0.2"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "fcvzI4SJcXHL5Ug+xmTZlOXnVekSrh35EWJPA8kIZ8I="; + hash = "sha256-RGlP2mtiM5I/XBCkjQLSz1ck4BGoqFeJB0yVMQHzO/E="; }; nativeBuildInputs = [ + appstream meson ninja pkg-config diff --git a/pkgs/desktops/gnome/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome/core/gnome-color-manager/default.nix index 7c9d3df9f1c02..786e19277e8de 100644 --- a/pkgs/desktops/gnome/core/gnome-color-manager/default.nix +++ b/pkgs/desktops/gnome/core/gnome-color-manager/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; attrPath = "gnome.${pname}"; + freeze = true; }; }; diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix index 9b100ef7576a2..5dd008cc5c035 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -11,7 +11,6 @@ , gtk4 , glib , libportal-gtk4 -, gnome-desktop , gnome-online-accounts , qrencode , wrapGAppsHook4 @@ -27,11 +26,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "45.1"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "gj9WCe7NkMQk3T5khXKHvBMh+23+KJJKR0/w6azyG3U="; + hash = "sha256-cK606DWhx3+bzH5XotzCN22TvbYXVxYYJXRF9WxjcN8="; }; nativeBuildInputs = [ @@ -54,7 +53,6 @@ stdenv.mkDerivation rec { evolution-data-server-gtk4 gsettings-desktop-schemas folks - gnome-desktop libadwaita libxml2 gnome-online-accounts diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 48566ba66945c..b3b5d2594d219 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -7,13 +7,14 @@ , colord , colord-gtk4 , cups +, dbus , docbook-xsl-nons , fontconfig , gdk-pixbuf , gettext , glib , glib-networking -, gcr +, gcr_4 , glibc , gnome-bluetooth , gnome-color-manager @@ -37,7 +38,9 @@ , librsvg , webp-pixbuf-loader , libsecret +, libsoup_3 , libwacom +, libXi , libxml2 , libxslt , meson @@ -69,11 +72,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-control-center"; - version = "45.3"; + version = "46.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-selJxOhsBiTsam7Q3wnJ+uKyKYPB3KYO2GrsjvCyQAQ="; + hash = "sha256-gXkkIwGd7aHSoHTB7Pan5u8xcsCcvm9NeZWktd6igxI="; }; patches = [ @@ -102,12 +105,12 @@ stdenv.mkDerivation (finalAttrs: { adwaita-icon-theme colord colord-gtk4 - libepoxy + cups fontconfig gdk-pixbuf glib glib-networking - gcr + gcr_4 gnome-bluetooth gnome-desktop gnome-online-accounts @@ -119,6 +122,7 @@ stdenv.mkDerivation (finalAttrs: { gsound gtk4 ibus + libepoxy libgtop libgudev libadwaita @@ -128,7 +132,9 @@ stdenv.mkDerivation (finalAttrs: { libpwquality librsvg libsecret + libsoup_3 libwacom + libXi libxml2 modemmanager mutter # schemas for the keybindings @@ -146,6 +152,7 @@ stdenv.mkDerivation (finalAttrs: { ]); nativeCheckInputs = [ + dbus python3.pkgs.python-dbusmock setxkbmap xvfb-run diff --git a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch index be2ca4b5e09e6..41dd5979aa4bc 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch +++ b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch @@ -37,10 +37,10 @@ index f6c84e3d2..cd897f8f5 100644 gtk_widget_set_sensitive (self->toolbutton_profile_view, TRUE); else gtk_widget_set_sensitive (self->toolbutton_profile_view, FALSE); -diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h +diff --git a/panels/system/datetime/tz.h b/panels/system/datetime/tz.h index feef16580..4b88ef7b1 100644 ---- a/panels/datetime/tz.h -+++ b/panels/datetime/tz.h +--- a/panels/system/datetime/tz.h ++++ b/panels/system/datetime/tz.h @@ -27,11 +27,7 @@ G_BEGIN_DECLS @@ -67,37 +67,6 @@ index ec5a905a5..689fdbebe 100644 if (self->is_new_connection) { g_autofree gchar *type_str = NULL; -diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-bluetooth.c -index 303f4a8af..e5afc4dff 100644 ---- a/panels/network/net-device-bluetooth.c -+++ b/panels/network/net-device-bluetooth.c -@@ -80,7 +80,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self) - update_off_switch_from_device_state (self->device_off_switch, state, self); - - /* set up the Options button */ -- path = g_find_program_in_path ("nm-connection-editor"); -+ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); - gtk_widget_set_visible (GTK_WIDGET (self->options_button), state != NM_DEVICE_STATE_UNMANAGED && path != NULL); - } - -@@ -131,7 +131,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self) - - connection = net_device_get_find_connection (self->client, self->device); - uuid = nm_connection_get_uuid (connection); -- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid); -+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid); - g_debug ("Launching '%s'\n", cmdline); - if (!g_spawn_command_line_async (cmdline, &error)) - g_warning ("Failed to launch nm-connection-editor: %s", error->message); -@@ -173,7 +173,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self) - - gtk_widget_init_template (GTK_WIDGET (self)); - -- path = g_find_program_in_path ("nm-connection-editor"); -+ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); - gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL); - } - diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c index 166670224..36f720d36 100644 --- a/panels/network/net-device-mobile.c @@ -133,10 +102,10 @@ index a31a606e3..ed5133d29 100644 argv[1] = g_strdup (priv->hostname); /* Use SNMP to get printer's informations */ -diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c +diff --git a/panels/system/users/run-passwd.c b/panels/system/users/run-passwd.c index edbc99830..1e1d90141 100644 ---- a/panels/user-accounts/run-passwd.c -+++ b/panels/user-accounts/run-passwd.c +--- a/panels/system/users/run-passwd.c ++++ b/panels/system/users/run-passwd.c @@ -152,7 +152,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) gchar **envp; gint my_stdin, my_stdout; @@ -146,10 +115,10 @@ index edbc99830..1e1d90141 100644 argv[1] = NULL; envp = g_get_environ (); -diff --git a/panels/user-accounts/user-utils.c b/panels/user-accounts/user-utils.c +diff --git a/panels/system/users/user-utils.c b/panels/system/users/user-utils.c index 5b7bc1f02..13ffe6ca8 100644 ---- a/panels/user-accounts/user-utils.c -+++ b/panels/user-accounts/user-utils.c +--- a/panels/system/users/user-utils.c ++++ b/panels/system/users/user-utils.c @@ -215,7 +215,7 @@ is_valid_username_async (const gchar *username, * future, so it would be nice to have some official way for this * instead of relying on the current "--login" implementation. diff --git a/pkgs/desktops/gnome/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome/core/gnome-dictionary/default.nix index 3fec9e44abe1a..0fed6638f97e7 100644 --- a/pkgs/desktops/gnome/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome/core/gnome-dictionary/default.nix @@ -11,7 +11,7 @@ , libxml2 , gettext , itstool -, wrapGAppsHook +, wrapGAppsHook3 , docbook_xsl , docbook_xml_dtd_43 , gnome @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 libxml2 gettext itstool diff --git a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix index ad4efbb1d75e1..dcd376fda1856 100644 --- a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix @@ -11,7 +11,7 @@ , ninja , gtk3 , glib -, wrapGAppsHook +, wrapGAppsHook3 , libnotify , itstool , gnome @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "45.1"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-VA/07JprljAAP/TNYNYk85/nDyWpVZ5TMziWA8hblSk="; + hash = "sha256-RkZJFIxtZ3HxrC6/5DpOUZIFsRwtkUoJ8qABgh0GlX0="; }; nativeBuildInputs = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { libxslt docbook-xsl-nons desktop-file-utils - wrapGAppsHook + wrapGAppsHook3 libxml2 ]; diff --git a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix index 9e5003ae2f35d..5a0f8d82cb535 100644 --- a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gnome-font-viewer"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "l8traN2mDeCrMDg4NYbx5LwdpaSPRAJb1rvnTqBcKwg="; + hash = "sha256-WS9AHkhdAswETUh7tcjgTJYdpoViFnaKWfH/mL0tU3w="; }; doCheck = true; diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index d20700233aa76..055c811263dbe 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -16,14 +16,11 @@ , geocode-glib_2 , glib , gnome-desktop -, gnome-online-accounts -, gtk3 , gtk4 , libgweather , json-glib , krb5 , libpwquality -, librest_1_0 , libsecret , networkmanager , pango @@ -39,11 +36,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "45.4.1"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Nj4JqjMI5/QHTgZiU6AYKzIqtgN2dD3heLu0AOVLqO4="; + hash = "sha256-+O6dzqfjXnNeqjvI0QQdBrtk6/HhBG5ejkjx+0QVGEc="; }; patches = [ @@ -72,9 +69,7 @@ stdenv.mkDerivation rec { geocode-glib_2 glib gnome-desktop - gnome-online-accounts gsettings-desktop-schemas - gtk3 gtk4 json-glib krb5 @@ -82,7 +77,6 @@ stdenv.mkDerivation rec { libadwaita libnma-gtk4 libpwquality - librest_1_0 libsecret networkmanager pango diff --git a/pkgs/desktops/gnome/core/gnome-keyring/default.nix b/pkgs/desktops/gnome/core/gnome-keyring/default.nix index 61247a1dc75ca..472d9a413513c 100644 --- a/pkgs/desktops/gnome/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome/core/gnome-keyring/default.nix @@ -15,7 +15,7 @@ , libselinux , p11-kit , openssh -, wrapGAppsHook +, wrapGAppsHook3 , docbook-xsl-nons , docbook_xml_dtd_43 , gnome @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "gnome-keyring"; - version = "42.1"; + version = "46.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "x/TQQMx2prf+Z+CO+RBpEcPIDUD8iMv8jiaEpMlG4+Y="; + hash = "sha256-sdOukTL/L4s/JaGQeQiSlo49Cs+VKkh+QPZEqFUM4/Y="; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { autoreconfHook docbook-xsl-nons docbook_xml_dtd_43 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -60,6 +60,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-pkcs11-config=${placeholder "out"}/etc/pkcs11/" # installation directories "--with-pkcs11-modules=${placeholder "out"}/lib/pkcs11/" + # gnome-keyring doesn't build with ssh-agent by default anymore, we need to + # switch to using gcr https://github.com/NixOS/nixpkgs/issues/140824 + "--enable-ssh-agent" ]; # Tends to fail non-deterministically. diff --git a/pkgs/desktops/gnome/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome/core/gnome-online-miners/default.nix index 219d32284b825..8cc2689f29448 100644 --- a/pkgs/desktops/gnome/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome/core/gnome-online-miners/default.nix @@ -21,7 +21,7 @@ , gmp , openssl , dleyna-server -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { autoreconfHook pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index 4a46eab357618..abd6d2102679a 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , cairo , meson @@ -6,7 +7,7 @@ , pkg-config , python3 , asciidoc -, wrapGAppsHook +, wrapGAppsHook3 , glib , libei , libepoxy @@ -16,22 +17,24 @@ , systemd , libsecret , libnotify +, libopus , libxkbcommon , gdk-pixbuf -, freerdp +, freerdp3 , fdk_aac , tpm2-tss , fuse3 , gnome +, polkit }: stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "45.1"; + version = "46.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-3NnBisIwZpVjH88AqIZFw443DroFxp3zn1QCBNTq/Y0="; + hash = "sha256-fGKkKB/fqVIhEK/7910JlzA18q3H+kV3UR1zMYa+to8="; }; nativeBuildInputs = [ @@ -40,12 +43,12 @@ stdenv.mkDerivation rec { pkg-config python3 asciidoc - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ cairo - freerdp + freerdp3 fdk_aac tpm2-tss fuse3 @@ -56,15 +59,23 @@ stdenv.mkDerivation rec { libdrm nv-codec-headers-11 libnotify + libopus libsecret libxkbcommon pipewire systemd + polkit # For polkit-gobject ]; mesonFlags = [ + "-Dconf_dir=/etc/gnome-remote-desktop" "-Dsystemd_user_unit_dir=${placeholder "out"}/lib/systemd/user" + "-Dsystemd_system_unit_dir=${placeholder "out"}/lib/systemd/system" + "-Dsystemd_sysusers_dir=${placeholder "out"}/lib/sysusers.d" + "-Dsystemd_tmpfiles_dir=${placeholder "out"}/lib/tmpfiles.d" "-Dtests=false" # Too deep of a rabbit hole. + # TODO: investigate who should be fixed here. + "-Dc_args=-I${freerdp3}/include/winpr3" ]; passthru = { diff --git a/pkgs/desktops/gnome/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome/core/gnome-screenshot/default.nix index 0a345fe0d8c9a..b8fa9a9f0c29e 100644 --- a/pkgs/desktops/gnome/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome/core/gnome-screenshot/default.nix @@ -12,7 +12,7 @@ , meson , ninja , python3 -, wrapGAppsHook +, wrapGAppsHook3 , appstream-glib , desktop-file-utils , gnome @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { libxml2 desktop-file-utils python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-session/ctl.nix b/pkgs/desktops/gnome/core/gnome-session/ctl.nix index 09fc80bf9ef88..10b59d660bef1 100644 --- a/pkgs/desktops/gnome/core/gnome-session/ctl.nix +++ b/pkgs/desktops/gnome/core/gnome-session/ctl.nix @@ -6,7 +6,7 @@ , pkg-config , glib , systemd -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-session/default.nix b/pkgs/desktops/gnome/core/gnome-session/default.nix index 967fbc9478a6d..5d4504b908527 100644 --- a/pkgs/desktops/gnome/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome/core/gnome-session/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "gnome-session"; # Also bump ./ctl.nix when bumping major version. - version = "45.0"; + version = "46.0"; outputs = [ "out" "sessions" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-session/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "cG0v/KysOFU6PAGFeT9aK0qslAu154nZU8mAgWO+8vE="; + hash = "sha256-xuFiSvYJC8ThoZH+Imir+nqN4HgxynpX8hfmeb97mlQ="; }; patches = [ @@ -76,11 +76,6 @@ stdenv.mkDerivation rec { libepoxy ]; - mesonFlags = [ - "-Dsystemd=true" - "-Dsystemd_session=default" - ]; - postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix index 95eb6fe1d25e1..6e87a2ab6e3b5 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix @@ -33,7 +33,7 @@ , gnome-desktop , geocode-glib_2 , docbook_xsl -, wrapGAppsHook +, wrapGAppsHook3 , python3 , tzdata , nss @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { libxml2 libxslt docbook_xsl - wrapGAppsHook + wrapGAppsHook3 python3 ]; diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index 1719127a6cbcf..4284a68ee3e70 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -31,7 +31,7 @@ , gnome-desktop , geocode-glib_2 , docbook_xsl -, wrapGAppsHook +, wrapGAppsHook3 , python3 , tzdata , gcr_4 @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "45.1"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "xiv+yYF+7luD6+kBqShhiaZ+tf8DPF3UFQZXT4Ir8JA="; + hash = "sha256-C5oPZPoYqOfgm0yVo/dU+gM8LNvS3DVwHwYYVywcs9c="; }; patches = [ @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { libxml2 libxslt docbook_xsl - wrapGAppsHook + wrapGAppsHook3 python3 ]; diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 6f4fdc8f77ea0..2fd711266938b 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell-extensions"; - version = "45.2"; + version = "46.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz"; - sha256 = "7jL2OHotGK2/96lWaJvHR4ZrSocS1zeQwAKr6uTMqq8="; + hash = "sha256-xbpQcA2nephvAGC+7az8AX5+yCKD8qY4SEKggHvEVT8="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index d00c97a06b579..9fdffcfd8c920 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -12,8 +12,7 @@ , python3 , polkit , networkmanager -, gtk-doc -, docbook-xsl-nons +, gi-docgen , at-spi2-core , libstartup_notification , unzip @@ -24,7 +23,6 @@ , webp-pixbuf-loader , geoclue2 , perl -, docbook_xml_dtd_45 , desktop-file-utils , libpulseaudio , libical @@ -68,13 +66,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell"; - version = "45.5"; + version = "46.1"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-vVw9PQKNRyM+QgUiPwrAKsmpc7aZvCd0OQlNQaeNarA="; + hash = "sha256-ZPmZhEwQHmO/KU1FsTjeVjGa0vMmKCchqtD6hgZTs2k="; }; patches = [ @@ -101,8 +99,8 @@ stdenv.mkDerivation (finalAttrs: { # Work around failing fingerprint auth (fetchpatch { - url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/9a647c460b651aaec0b8a21f046cc289c1999416/f/0001-gdm-Work-around-failing-fingerprint-auth.patch"; - sha256 = "pFvZli3TilUt6YwdZztpB8Xq7O60XfuWUuPMMVSpqLw="; + url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/dcd112d9708954187e7490564c2229d82ba5326f/f/0001-gdm-Work-around-failing-fingerprint-auth.patch"; + hash = "sha256-mgXty5HhiwUO1UV3/eDgWtauQKM0cRFQ0U7uocST25s="; }) ]; @@ -111,9 +109,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config gettext - docbook-xsl-nons - docbook_xml_dtd_45 - gtk-doc + gi-docgen perl wrapGAppsHook4 sassc @@ -213,6 +209,9 @@ stdenv.mkDerivation (finalAttrs: { for svc in org.gnome.ScreenSaver org.gnome.Shell.Extensions org.gnome.Shell.Notifications org.gnome.Shell.Screencast; do wrapGApp $out/share/gnome-shell/$svc done + + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" ''; separateDebugInfo = true; diff --git a/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch index e27847378bb21..a87f5129152f1 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch +++ b/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch @@ -56,16 +56,3 @@ index 11fb4b6b7..e00e4807b 100644 NULL); if (!g_subprocess_wait_check (proc, NULL, &error)) -diff --git a/subprojects/extensions-tool/src/command-pack.c b/subprojects/extensions-tool/src/command-pack.c -index f2cfcd51a..2a9a7efdf 100644 ---- a/subprojects/extensions-tool/src/command-pack.c -+++ b/subprojects/extensions-tool/src/command-pack.c -@@ -168,7 +168,7 @@ extension_pack_add_schemas (ExtensionPack *pack, - #else - dstpath = g_file_get_path (dstdir); - proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDERR_SILENCE, error, -- "glib-compile-schemas", "--strict", dstpath, NULL); -+ "@glib_compile_schemas@", "--strict", dstpath, NULL); - - if (!g_subprocess_wait_check (proc, NULL, error)) - return FALSE; diff --git a/pkgs/desktops/gnome/core/gnome-shell/greeter-logo-size.patch b/pkgs/desktops/gnome/core/gnome-shell/greeter-logo-size.patch index e58610ddc2b29..93965a475216f 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/greeter-logo-size.patch +++ b/pkgs/desktops/gnome/core/gnome-shell/greeter-logo-size.patch @@ -1,16 +1,16 @@ diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js -index a3e4372b4..36f6c1f47 100644 +index 28db1a9de..805b686bf 100644 --- a/js/gdm/loginDialog.js +++ b/js/gdm/loginDialog.js -@@ -43,6 +43,7 @@ import * as UserWidget from '../ui/userWidget.js'; - const _FADE_ANIMATION_TIME = 250; +@@ -46,6 +46,7 @@ const _FADE_ANIMATION_TIME = 250; const _SCROLL_ANIMATION_TIME = 500; const _TIMED_LOGIN_IDLE_THRESHOLD = 5.0; + const _CONFLICTING_SESSION_DIALOG_TIMEOUT = 60; +const _LOGO_ICON_HEIGHT = 48; export const UserListItem = GObject.registerClass({ Signals: {'activate': {}}, -@@ -839,7 +840,7 @@ export const LoginDialog = GObject.registerClass({ +@@ -908,7 +909,7 @@ export const LoginDialog = GObject.registerClass({ const scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor; const texture = this._textureCache.load_file_async( this._logoFile, diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index c2f80e1931bac..c74dd74571dfd 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , substituteAll , pkg-config , meson @@ -46,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "45.3"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1rkkWyIjfae9FzndKMI8yPODX5n6EMEDfZ3XY1M1JRw="; + hash = "sha256-EYkwAru1QIKJZoNwe8OZGuVaLzBAgRp2DjqSyWVE+G4="; }; patches = [ @@ -58,17 +57,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit isocodes; }) - - # Add support for AppStream 1.0. - # https://gitlab.gnome.org/GNOME/gnome-software/-/issues/2393 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-software/-/commit/0655f358ed0e8455e12d9634f60bc4dbaee434e3.patch"; - hash = "sha256-8IXXUfNeha5yRlRLuxQV8whwQmyNw7Aoi/r5NNFS/zA="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-software/-/commit/e431ab003f3fabf616b6eb7dc93f8967bc9473e5.patch"; - hash = "sha256-Y5GcC1XMbb9Bl2/VKFnrV1B/ipLKxY4guse25LhxhKM="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix index 8a54c013b360a..bc7caa3ad27b5 100644 --- a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix @@ -3,13 +3,13 @@ , gettext , fetchurl , pkg-config -, gtkmm3 +, gtkmm4 , libxml2 , bash -, gtk3 -, libhandy +, gtk4 +, libadwaita , glib -, wrapGAppsHook +, wrapGAppsHook4 , meson , ninja , gsettings-desktop-schemas @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-system-monitor"; - version = "45.0.2"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "xeJy2Qv5mGo/hhPXbg0n+kLfrO5cAZLnOSG7lLGGii4="; + hash = "sha256-U3YkgVjGhsMIJVRy6MKp5MFyVWQsFJ/HGYxtA05UdZk="; }; patches = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { pkg-config gettext itstool - wrapGAppsHook + wrapGAppsHook4 meson ninja glib @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { buildInputs = [ bash - gtk3 - libhandy + gtk4 + libadwaita glib libxml2 - gtkmm3 + gtkmm4 libgtop gdk-pixbuf gnome.adwaita-icon-theme diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix index 93391a744748f..85067754f2903 100644 --- a/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -21,7 +21,7 @@ , vala , desktop-file-utils , itstool -, wrapGAppsHook +, wrapGAppsHook3 , pcre2 , libxslt , docbook-xsl-nons @@ -30,14 +30,14 @@ stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.50.1"; + version = "3.52.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gnome-terminal"; rev = version; - sha256 = "sha256-lJAzmz8tvEbr371VtYjlV4+z3cSy4QrmP0vmD5WiJD4="; + hash = "sha256-6+6/fgGlSM/57+n0SopuF0ZY9htma5usIgxy2BBAC+M="; }; nativeBuildInputs = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { docbook-xsl-nons vala desktop-file-utils - wrapGAppsHook + wrapGAppsHook3 pcre2 python3 ]; diff --git a/pkgs/desktops/gnome/core/gnome-tour/default.nix b/pkgs/desktops/gnome/core/gnome-tour/default.nix index c6d58c480581e..0cc5c596bb5c2 100644 --- a/pkgs/desktops/gnome/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome/core/gnome-tour/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-tour"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-W+S470uPTV7KzMMQSNtuCFqPe/+tqghDuOiniP8dre4="; + hash = "sha256-8yZSqp1+8GQ3YM5jkyCCz9NkHnczt2xCm3jQl4O3xGo="; }; cargoVendorDir = "vendor"; diff --git a/pkgs/desktops/gnome/core/gucharmap/default.nix b/pkgs/desktops/gnome/core/gucharmap/default.nix index 82ca07cf146aa..2d0dd7553965f 100644 --- a/pkgs/desktops/gnome/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome/core/gucharmap/default.nix @@ -12,7 +12,7 @@ , glib , desktop-file-utils , gtk-doc -, wrapGAppsHook +, wrapGAppsHook3 , itstool , libxml2 , yelp-tools @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 unzip intltool itstool diff --git a/pkgs/desktops/gnome/core/mutter/43/default.nix b/pkgs/desktops/gnome/core/mutter/43/default.nix index 63110d9d90d3e..9d40303fad2eb 100644 --- a/pkgs/desktops/gnome/core/mutter/43/default.nix +++ b/pkgs/desktops/gnome/core/mutter/43/default.nix @@ -37,7 +37,7 @@ , gnome-settings-daemon , xorgserver , python3 -, wrapGAppsHook +, wrapGAppsHook3 , gi-docgen , sysprof , libsysprof-capture @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { xvfb-run pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 gi-docgen xorgserver gobject-introspection diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 570d954766a08..0efd14124a371 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -36,6 +36,7 @@ , libinput , libdrm , libei +, libdisplay-info , gsettings-desktop-schemas , glib , atk @@ -67,13 +68,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "45.5"; + version = "46.1"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-UcMyS4qXX5luWsaTqzhWPElubxQubNM1e0lQ0lAzSHQ="; + hash = "sha256-Y7JmDdD6GT+mYsgO4S64sW8rjDvDiWNmIAx5lDgk1R0="; }; mesonFlags = [ @@ -125,6 +126,7 @@ stdenv.mkDerivation (finalAttrs: { libcanberra libdrm libei + libdisplay-info libgudev libinput libstartup_notification @@ -172,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. # TODO: Move this into a directory devhelp can find. - moveToOutput "share/mutter-13/doc" "$devdoc" + moveToOutput "share/mutter-14/doc" "$devdoc" ''; # Install udev files into our own tree. @@ -181,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: { separateDebugInfo = true; passthru = { - libdir = "${finalAttrs.finalPackage}/lib/mutter-13"; + libdir = "${finalAttrs.finalPackage}/lib/mutter-14"; tests = { libdirExists = runCommand "mutter-libdir-exists" {} '' diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 7b1c438c7a0e3..063914060dfee 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -7,7 +7,6 @@ , gi-docgen , docbook-xsl-nons , gettext -, libxml2 , desktop-file-utils , wrapGAppsHook4 , gtk4 @@ -39,13 +38,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nautilus"; - version = "45.2.1"; + version = "46.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz"; - sha256 = "ul1T3zmhVVYt+XHvXjHoJwdJBdDEjqseskIaEChLmQ0="; + hash = "sha256-zBpf3x3XL5Lp4/PHrSY3CaDeU5Golb6TRPamf0OIe9c="; }; patches = [ @@ -63,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: { desktop-file-utils gettext gobject-introspection - libxml2 meson ninja pkg-config diff --git a/pkgs/desktops/gnome/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome/core/nautilus/extension_dir.patch index a1bdd64f989b6..d7cd161a8dfc5 100644 --- a/pkgs/desktops/gnome/core/nautilus/extension_dir.patch +++ b/pkgs/desktops/gnome/core/nautilus/extension_dir.patch @@ -21,6 +21,4 @@ index cd889ff18..e2cd6468e 100644 + } + + load_module_dir (extensiondir); - - eel_debug_call_at_shutdown (free_module_objects); } diff --git a/pkgs/desktops/gnome/core/rygel/default.nix b/pkgs/desktops/gnome/core/rygel/default.nix index c7d59d76525d2..9cc4e1ee8d71a 100644 --- a/pkgs/desktops/gnome/core/rygel/default.nix +++ b/pkgs/desktops/gnome/core/rygel/default.nix @@ -7,7 +7,7 @@ , gettext , libxml2 , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , python3 , glib , gssdp_1_6 @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { gettext libxml2 gobject-introspection - wrapGAppsHook + wrapGAppsHook3 python3 ]; diff --git a/pkgs/desktops/gnome/core/simple-scan/default.nix b/pkgs/desktops/gnome/core/simple-scan/default.nix index 3aea02678a837..e7f2954ca39f4 100644 --- a/pkgs/desktops/gnome/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome/core/simple-scan/default.nix @@ -6,15 +6,15 @@ , gettext , itstool , python3 -, wrapGAppsHook +, wrapGAppsHook4 , cairo , gdk-pixbuf , colord , glib -, gtk3 +, libadwaita +, gtk4 , gusb , packagekit -, libhandy , libwebp , libxml2 , sane-backends @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "44.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Obhw/Ub0R/dH6uzC3yYEnvdzGFCZ8OE8Z1ZWJk3ZjpU="; + hash = "sha256-wW5lkBQv5WO+UUMSKzu7U/awCn2p2VL2HEf6Jve08Kk="; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { itstool pkg-config python3 - wrapGAppsHook + wrapGAppsHook4 libxml2 gobject-introspection # For setup hook vala @@ -51,8 +51,8 @@ stdenv.mkDerivation rec { colord glib gusb - gtk3 - libhandy + libadwaita + gtk4 libwebp packagekit sane-backends diff --git a/pkgs/desktops/gnome/core/sushi/default.nix b/pkgs/desktops/gnome/core/sushi/default.nix index 0765b7af0be72..c6165869a34e0 100644 --- a/pkgs/desktops/gnome/core/sushi/default.nix +++ b/pkgs/desktops/gnome/core/sushi/default.nix @@ -11,7 +11,7 @@ , libsoup_3 , webkitgtk_4_1 , icu -, wrapGAppsHook +, wrapGAppsHook3 , gst_all_1 , gdk-pixbuf , librsvg @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "sushi"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/sushi/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "al8UsFo0cf5DhTzCsOGuVITX+fhvfqN2F5gpub9Kwd0="; + hash = "sha256-lghbqqQwqyFCxgaqtcR+L7sv0+two1ITfmXFmlig8sY="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ninja gettext gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/desktops/gnome/core/totem/default.nix b/pkgs/desktops/gnome/core/totem/default.nix index b0b23cc9cd4fe..56da00923f949 100644 --- a/pkgs/desktops/gnome/core/totem/default.nix +++ b/pkgs/desktops/gnome/core/totem/default.nix @@ -13,7 +13,7 @@ , glib , gobject-introspection , totem-pl-parser -, wrapGAppsHook +, wrapGAppsHook3 , itstool , libxml2 , vala @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { python3Packages.python itstool gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/desktops/gnome/core/yelp/default.nix b/pkgs/desktops/gnome/core/yelp/default.nix index 7eeec1902de26..217c6afab05f3 100644 --- a/pkgs/desktops/gnome/core/yelp/default.nix +++ b/pkgs/desktops/gnome/core/yelp/default.nix @@ -13,7 +13,7 @@ , libxml2 , libxslt , gst_all_1 -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { pkg-config gettext itstool - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ |