gnome-shell: 48.beta → 48.rc

https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/48.beta...48.rc

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>

+14 -12
+9 -9
pkgs/by-name/gn/gnome-shell/fix-paths.patch
··· 10 +ExecStart=@gsettings@ set org.gnome.shell disable-user-extensions true 11 Restart=no 12 diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js 13 - index 197cc1c1c..dd74aa167 100644 14 --- a/js/ui/extensionDownloader.js 15 +++ b/js/ui/extensionDownloader.js 16 - @@ -110,7 +110,7 @@ async function extractExtensionArchive(bytes, dir) { 17 stream.close_async(GLib.PRIORITY_DEFAULT, null); 18 19 const unzip = Gio.Subprocess.new( ··· 22 Gio.SubprocessFlags.NONE); 23 await unzip.wait_check_async(null); 24 25 - @@ -132,7 +132,7 @@ async function extractExtensionArchive(bytes, dir) { 26 } 27 28 const compileSchema = Gio.Subprocess.new( ··· 32 33 try { 34 diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js 35 - index fff4e73c2..92859b099 100644 36 --- a/js/ui/status/keyboard.js 37 +++ b/js/ui/status/keyboard.js 38 - @@ -1092,6 +1092,6 @@ class InputSourceIndicator extends PanelMenu.Button { 39 - if (xkbVariant.length > 0) 40 - description = `${description}\t${xkbVariant}`; 41 42 - - Util.spawn(['tecla', description]); 43 - + Util.spawn(['@tecla@', description]); 44 } 45 }); 46 diff --git a/subprojects/extensions-tool/src/command-install.c b/subprojects/extensions-tool/src/command-install.c
··· 10 +ExecStart=@gsettings@ set org.gnome.shell disable-user-extensions true 11 Restart=no 12 diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js 13 + index 53fd92846..89533cedc 100644 14 --- a/js/ui/extensionDownloader.js 15 +++ b/js/ui/extensionDownloader.js 16 + @@ -124,7 +124,7 @@ async function extractExtensionArchive(bytes, dir) { 17 stream.close_async(GLib.PRIORITY_DEFAULT, null); 18 19 const unzip = Gio.Subprocess.new( ··· 22 Gio.SubprocessFlags.NONE); 23 await unzip.wait_check_async(null); 24 25 + @@ -146,7 +146,7 @@ async function extractExtensionArchive(bytes, dir) { 26 } 27 28 const compileSchema = Gio.Subprocess.new( ··· 32 33 try { 34 diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js 35 + index 1b43e1051..a31b0a304 100644 36 --- a/js/ui/status/keyboard.js 37 +++ b/js/ui/status/keyboard.js 38 + @@ -1104,6 +1104,6 @@ class InputSourceIndicator extends PanelMenu.Button { 39 + _showLayout() { 40 + Main.overview.hide(); 41 42 + - Util.spawn(['tecla']); 43 + + Util.spawn(['@tecla@']); 44 } 45 }); 46 diff --git a/subprojects/extensions-tool/src/command-install.c b/subprojects/extensions-tool/src/command-install.c
+5 -3
pkgs/by-name/gn/gnome-shell/package.nix
··· 69 in 70 stdenv.mkDerivation (finalAttrs: { 71 pname = "gnome-shell"; 72 - version = "48.beta"; 73 74 outputs = [ 75 "out" ··· 78 79 src = fetchurl { 80 url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; 81 - hash = "sha256-4MK+4aFnTGIoR/NTyuWew2v7Ei0sEXg0r/EgRF18Wys="; 82 }; 83 84 patches = [ ··· 183 ]; 184 185 postPatch = '' 186 - patchShebangs src/data-to-c.py 187 188 # We can generate it ourselves. 189 rm -f man/gnome-shell.1
··· 69 in 70 stdenv.mkDerivation (finalAttrs: { 71 pname = "gnome-shell"; 72 + version = "48.rc"; 73 74 outputs = [ 75 "out" ··· 78 79 src = fetchurl { 80 url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; 81 + hash = "sha256-3Vscc9RggZymg6quDK8fEmu9VfYavIctRMim/NW1m8c="; 82 }; 83 84 patches = [ ··· 183 ]; 184 185 postPatch = '' 186 + patchShebangs \ 187 + src/data-to-c.py \ 188 + meson/generate-app-list.py 189 190 # We can generate it ourselves. 191 rm -f man/gnome-shell.1