diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-10 12:01:18 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-10 12:01:18 +0000 |
commit | 958e403a78f4cc4b11afbd41dc71e2cbd4ac7118 (patch) | |
tree | fc1f181a42c06468d21768e6d339f8efa42c7c85 /pkgs/desktops/gnome/core | |
parent | 39d4e1cb18bdb43229e53d4fd950c3ce77210a02 (diff) | |
parent | b2f4b4b97cc79dea83c9f6772ab1eff4470b9e4d (diff) | |
download | nixlib-958e403a78f4cc4b11afbd41dc71e2cbd4ac7118.tar nixlib-958e403a78f4cc4b11afbd41dc71e2cbd4ac7118.tar.gz nixlib-958e403a78f4cc4b11afbd41dc71e2cbd4ac7118.tar.bz2 nixlib-958e403a78f4cc4b11afbd41dc71e2cbd4ac7118.tar.lz nixlib-958e403a78f4cc4b11afbd41dc71e2cbd4ac7118.tar.xz nixlib-958e403a78f4cc4b11afbd41dc71e2cbd4ac7118.tar.zst nixlib-958e403a78f4cc4b11afbd41dc71e2cbd4ac7118.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops/gnome/core')
-rw-r--r-- | pkgs/desktops/gnome/core/gnome-control-center/default.nix | 14 | ||||
-rw-r--r-- | pkgs/desktops/gnome/core/gnome-control-center/paths.patch | 45 | ||||
-rw-r--r-- | pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix | 14 | ||||
-rw-r--r-- | pkgs/desktops/gnome/core/gnome-shell/default.nix | 10 | ||||
-rw-r--r-- | pkgs/desktops/gnome/core/mutter/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/gnome/core/nautilus/default.nix | 14 | ||||
-rw-r--r-- | pkgs/desktops/gnome/core/zenity/default.nix | 10 |
7 files changed, 54 insertions, 57 deletions
diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index d59b5a139065..69feddaaa84b 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -66,13 +66,13 @@ , xvfb-run }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-control-center"; - version = "45.1"; + version = "45.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-0obHYnFQ4RKqy7S3uRcX+tjokHYGFHnfxhCy3XRLV3o="; + url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; + sha256 = "sha256-DPo8My1u2stz0GxrJv/KEHjob/WerIGbKTHglndT33A="; }; patches = [ @@ -201,8 +201,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "gnome-control-center"; + attrPath = "gnome.gnome-control-center"; }; }; @@ -212,4 +212,4 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch index 165497f11e2a..be2ca4b5e09e 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch +++ b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch @@ -38,7 +38,7 @@ index f6c84e3d2..cd897f8f5 100644 else gtk_widget_set_sensitive (self->toolbutton_profile_view, FALSE); diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h -index a2376f8a4..98769e08f 100644 +index feef16580..4b88ef7b1 100644 --- a/panels/datetime/tz.h +++ b/panels/datetime/tz.h @@ -27,11 +27,7 @@ @@ -55,26 +55,23 @@ index a2376f8a4..98769e08f 100644 typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c -index 505b8ee25..62e94009f 100644 +index ec5a905a5..689fdbebe 100644 --- a/panels/network/connection-editor/net-connection-editor.c +++ b/panels/network/connection-editor/net-connection-editor.c -@@ -267,9 +267,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type) - g_autoptr(GError) error = NULL; +@@ -377,7 +377,7 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type) + GPid child_pid; - if (self->is_new_connection) { -- cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type); -+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --type='%s' --create", type); - } else { -- cmdline = g_strdup_printf ("nm-connection-editor --edit='%s'", -+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit='%s'", - nm_connection_get_uuid (self->connection)); - } + builder = g_strv_builder_new (); +- g_strv_builder_add (builder, "nm-connection-editor"); ++ g_strv_builder_add (builder, "@networkmanagerapplet@/bin/nm-connection-editor"); + 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 74dfb0e9a..5f53d1a20 100644 +index 303f4a8af..e5afc4dff 100644 --- a/panels/network/net-device-bluetooth.c +++ b/panels/network/net-device-bluetooth.c -@@ -90,7 +90,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self) +@@ -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 */ @@ -83,7 +80,7 @@ index 74dfb0e9a..5f53d1a20 100644 gtk_widget_set_visible (GTK_WIDGET (self->options_button), state != NM_DEVICE_STATE_UNMANAGED && path != NULL); } -@@ -141,7 +141,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self) +@@ -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); @@ -92,7 +89,7 @@ index 74dfb0e9a..5f53d1a20 100644 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); -@@ -185,7 +185,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self) +@@ -173,7 +173,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self) gtk_widget_init_template (GTK_WIDGET (self)); @@ -102,10 +99,10 @@ index 74dfb0e9a..5f53d1a20 100644 } diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c -index 34eb86241..50d0a2bed 100644 +index 166670224..36f720d36 100644 --- a/panels/network/net-device-mobile.c +++ b/panels/network/net-device-mobile.c -@@ -508,7 +508,7 @@ options_button_clicked_cb (NetDeviceMobile *self) +@@ -521,7 +521,7 @@ options_button_clicked_cb (NetDeviceMobile *self) connection = net_device_get_find_connection (self->client, self->device); uuid = nm_connection_get_uuid (connection); @@ -114,7 +111,7 @@ index 34eb86241..50d0a2bed 100644 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); -@@ -797,7 +797,7 @@ net_device_mobile_init (NetDeviceMobile *self) +@@ -810,7 +810,7 @@ net_device_mobile_init (NetDeviceMobile *self) self->cancellable = g_cancellable_new (); @@ -137,12 +134,12 @@ index a31a606e3..ed5133d29 100644 /* Use SNMP to get printer's informations */ diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c -index 86f53d4fc..0b052856f 100644 +index edbc99830..1e1d90141 100644 --- a/panels/user-accounts/run-passwd.c +++ b/panels/user-accounts/run-passwd.c -@@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) +@@ -152,7 +152,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) gchar **envp; - gint my_stdin, my_stdout, my_stderr; + gint my_stdin, my_stdout; - argv[0] = "/usr/bin/passwd"; /* Is it safe to rely on a hard-coded path? */ + argv[0] = "/run/wrappers/bin/passwd"; /* Is it safe to rely on a hard-coded path? */ @@ -150,10 +147,10 @@ index 86f53d4fc..0b052856f 100644 envp = g_get_environ (); diff --git a/panels/user-accounts/user-utils.c b/panels/user-accounts/user-utils.c -index 83d4cd091..e8784c722 100644 +index 5b7bc1f02..13ffe6ca8 100644 --- a/panels/user-accounts/user-utils.c +++ b/panels/user-accounts/user-utils.c -@@ -486,7 +486,7 @@ is_valid_username_async (const gchar *username, +@@ -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-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 493e0342333f..5c17a3eb5906 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -11,13 +11,13 @@ , substituteAll }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell-extensions"; - version = "45.1"; + version = "45.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "JC4VoMBuggw/2N1q6sGo74Zc5YiC5Zda8dZZNLtNQmE="; + url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz"; + sha256 = "7jL2OHotGK2/96lWaJvHR4ZrSocS1zeQwAKr6uTMqq8="; }; patches = [ @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "gnome-shell-extensions"; + attrPath = "gnome.gnome-shell-extensions"; }; }; @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 2471061ae4f0..85f5b5d42cb0 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -65,15 +65,15 @@ let pythonEnv = python3.withPackages (ps: with ps; [ pygobject3 ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell"; - version = "45.1"; + version = "45.2"; outputs = [ "out" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "FfykvWEpqLP5kBl/vR7ljXS2QVEK+q8Igqf6NmNPxfI="; + url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; + sha256 = "igz7+HKxp2JpbIbhPe/p82dekteVFOup0AC1thHCaiM="; }; patches = [ @@ -231,4 +231,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 03414346f643..119ee0efeb54 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -67,13 +67,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "45.1"; + version = "45.2"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - sha256 = "LNPF77Itt2x5MRyxiJoaqy/rNbSk3QPzgiqreZnaISw="; + sha256 = "rz+Ym/IqVg3CSS+44Z+do3zm1xRLPgUZgLDVUFiWANw="; }; mesonFlags = [ diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 395b4f41c76b..6c96c54f86b5 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -36,15 +36,15 @@ , gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nautilus"; - version = "45.1"; + version = "45.2.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "I72qmoVGbFk3qJ2t3QgO0DvMK0notkr2ByBjU73oL+M="; + url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz"; + sha256 = "ul1T3zmhVVYt+XHvXjHoJwdJBdDEjqseskIaEChLmQ0="; }; patches = [ @@ -119,8 +119,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "nautilus"; + attrPath = "gnome.nautilus"; }; }; @@ -131,4 +131,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = teams.gnome.members; }; -} +}) diff --git a/pkgs/desktops/gnome/core/zenity/default.nix b/pkgs/desktops/gnome/core/zenity/default.nix index e8be274a1f60..277d00f19d61 100644 --- a/pkgs/desktops/gnome/core/zenity/default.nix +++ b/pkgs/desktops/gnome/core/zenity/default.nix @@ -14,13 +14,13 @@ , wrapGAppsHook4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zenity"; - version = "3.99.2"; + version = "4.0.0"; src = fetchurl { - url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "oZR4kGuYi082fl6mOlkh5PmMuCVbugXrXK2LWhikFo8="; + url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor finalAttrs.version}/zenity-${finalAttrs.version}.tar.xz"; + sha256 = "C4yN7xjasFzEm9RkuQyn+UWuUv9eCSQtpwKhXZTT6N0="; }; nativeBuildInputs = [ @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = teams.gnome.members; }; -} +}) |