diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/gnome')
13 files changed, 138 insertions, 26 deletions
diff --git a/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix b/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix index 36aad3edaac3..d0d032b6ec3c 100644 --- a/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "ghex"; - version = "44.1"; + version = "44.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "QEvfZJ6qE5IqgK4y8Z/kDnHw7g9GHEXtrHKIigDq1sI="; + sha256 = "6+y0xoo30zk3uewmPIV23x2MaascHT4S1WaP0gB+kws="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome/apps/gnome-music/default.nix b/nixpkgs/pkgs/desktops/gnome/apps/gnome-music/default.nix index d66efad0728d..5c5aba52704d 100644 --- a/nixpkgs/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -58,7 +58,6 @@ python3.pkgs.buildPythonApplication rec { glib libmediaart gnome-online-accounts - gobject-introspection gdk-pixbuf python3 grilo diff --git a/nixpkgs/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/nixpkgs/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix index 6eddefc7c452..0e88bb20914e 100644 --- a/nixpkgs/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "gnome-bluetooth"; - version = "42.5"; + version = "42.6"; # 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 = "pPXxrC27e3uS99bStCwDD2Ku2bVCa53BFpRgQfPLqPc="; + sha256 = "WGT+bx5xhxXbJrYiAbdaWQIM9CR/7DdkWzVZzS26WdA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome/core/gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch b/nixpkgs/pkgs/desktops/gnome/core/gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch new file mode 100644 index 000000000000..96688c8d8086 --- /dev/null +++ b/nixpkgs/pkgs/desktops/gnome/core/gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch @@ -0,0 +1,73 @@ +From 0417f60c7e760e1ebc6acd3dc23818b38c3929e7 Mon Sep 17 00:00:00 2001 +From: Weijia Wang <contact@weijia.wang> +Date: Mon, 7 Aug 2023 21:51:30 +0200 +Subject: [PATCH] Fix build with Exiv2 0.28 + +--- + src/gcm-helper-exiv.cpp | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +diff --git a/src/gcm-helper-exiv.cpp b/src/gcm-helper-exiv.cpp +index 7ec69948..23c8b320 100644 +--- a/src/gcm-helper-exiv.cpp ++++ b/src/gcm-helper-exiv.cpp +@@ -22,6 +22,10 @@ + #include <exiv2/image.hpp> + #include <exiv2/exif.hpp> + ++#if EXIV2_MAJOR_VERSION >= 1 || (EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION >= 28) ++#define HAVE_EXIV2_0_28 ++#endif ++ + #if EXIV2_MAJOR_VERSION >= 1 || (EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION >= 27) + #define HAVE_EXIV2_ERROR_CODE + #include <exiv2/error.hpp> +@@ -33,7 +37,11 @@ + int + main (int argc, char* const argv[]) + { ++#ifdef HAVE_EXIV2_0_28 ++ Exiv2::Image::UniquePtr image; ++#else + Exiv2::Image::AutoPtr image; ++#endif + Exiv2::ExifData exifData; + std::string filename; + std::string make; +@@ -57,7 +65,9 @@ main (int argc, char* const argv[]) + if (argc == 2) + filename = argv[1]; + if (filename.empty()) +-#ifdef HAVE_EXIV2_ERROR_CODE ++#ifdef HAVE_EXIV2_0_28 ++ throw Exiv2::Error(Exiv2::ErrorCode::kerErrorMessage, "No filename specified"); ++#elif defined(HAVE_EXIV2_ERROR_CODE) + throw Exiv2::Error(Exiv2::kerErrorMessage, "No filename specified"); + #else + throw Exiv2::Error(1, "No filename specified"); +@@ -70,7 +80,9 @@ main (int argc, char* const argv[]) + if (exifData.empty()) { + std::string error(argv[1]); + error += ": No Exif data found in the file"; +-#ifdef HAVE_EXIV2_ERROR_CODE ++#ifdef HAVE_EXIV2_0_28 ++ throw Exiv2::Error(Exiv2::ErrorCode::kerErrorMessage, error); ++#elif defined(HAVE_EXIV2_ERROR_CODE) + throw Exiv2::Error(Exiv2::kerErrorMessage, error); + #else + throw Exiv2::Error(1, error); +@@ -89,7 +101,11 @@ main (int argc, char* const argv[]) + std::cout << model << "\n"; + std::cout << make << "\n"; + std::cout << serial << "\n"; ++#ifdef HAVE_EXIV2_0_28 ++ } catch (Exiv2::Error& e) { ++#else + } catch (Exiv2::AnyError& e) { ++#endif + std::cout << "Failed to load: " << e << "\n"; + retval = -1; + } +-- +2.39.2 (Apple Git-143) + diff --git a/nixpkgs/pkgs/desktops/gnome/core/gnome-color-manager/default.nix b/nixpkgs/pkgs/desktops/gnome/core/gnome-color-manager/default.nix index dae367f1d5ba..7c9d3df9f1c0 100644 --- a/nixpkgs/pkgs/desktops/gnome/core/gnome-color-manager/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/core/gnome-color-manager/default.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w"; }; + patches = [ + ./0001-Fix-build-with-Exiv2-0.28.patch + ]; + nativeBuildInputs = [ meson ninja diff --git a/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix b/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix index 7528f1bc3a5d..dfc986f06b6a 100644 --- a/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -80,8 +80,10 @@ stdenv.mkDerivation rec { # Hardcode paths to various dependencies so that they can be found at runtime. (substituteAll { src = ./fix-paths.patch; - inherit libgnomekbd unzip; + gkbd_keyboard_display = "${lib.getBin libgnomekbd}/bin/gkbd-keyboard-display"; + glib_compile_schemas = "${glib.dev}/bin/glib-compile-schemas"; gsettings = "${glib.bin}/bin/gsettings"; + unzip = "${lib.getBin unzip}/bin/unzip"; }) # Use absolute path for libshew installation to make our patched gobject-introspection @@ -120,6 +122,7 @@ stdenv.mkDerivation rec { desktop-file-utils libxslt.bin asciidoc + gobject-introspection ]; buildInputs = [ @@ -153,7 +156,6 @@ stdenv.mkDerivation rec { ibus gnome-desktop gnome-settings-daemon - gobject-introspection mesa # recording diff --git a/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch index 8b35736ecfcd..e70c4851e9d5 100644 --- a/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch +++ b/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch @@ -10,27 +10,62 @@ index de91167c5..1c9965678 100644 +ExecStart=@gsettings@ set org.gnome.shell disable-user-extensions true Restart=no diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js -index 8bf4646a6..59e88bb4c 100644 +index 197cc1c1c..dd74aa167 100644 --- a/js/ui/extensionDownloader.js +++ b/js/ui/extensionDownloader.js -@@ -114,7 +114,7 @@ async function extractExtensionArchive(bytes, dir) { +@@ -110,7 +110,7 @@ async function extractExtensionArchive(bytes, dir) { stream.close_async(GLib.PRIORITY_DEFAULT, null); const unzip = Gio.Subprocess.new( - ['unzip', '-uod', dir.get_path(), '--', file.get_path()], -+ ['@unzip@/bin/unzip', '-uod', dir.get_path(), '--', file.get_path()], ++ ['@unzip@', '-uod', dir.get_path(), '--', file.get_path()], Gio.SubprocessFlags.NONE); await unzip.wait_check_async(null); - } + +@@ -132,7 +132,7 @@ async function extractExtensionArchive(bytes, dir) { + } + + const compileSchema = Gio.Subprocess.new( +- ['glib-compile-schemas', '--strict', schemasPath.get_path()], ++ ['@glib_compile_schemas@', '--strict', schemasPath.get_path()], + Gio.SubprocessFlags.NONE); + + try { diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js -index bc50f3d37..868eb5abf 100644 +index fff4e73c2..92859b099 100644 --- a/js/ui/status/keyboard.js +++ b/js/ui/status/keyboard.js -@@ -1080,6 +1080,6 @@ class InputSourceIndicator extends PanelMenu.Button { +@@ -1092,6 +1092,6 @@ class InputSourceIndicator extends PanelMenu.Button { if (xkbVariant.length > 0) - description = '%s\t%s'.format(description, xkbVariant); + description = `${description}\t${xkbVariant}`; - Util.spawn(['gkbd-keyboard-display', '-l', description]); -+ Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]); ++ Util.spawn(['@gkbd_keyboard_display@', '-l', description]); } }); +diff --git a/subprojects/extensions-tool/src/command-install.c b/subprojects/extensions-tool/src/command-install.c +index 11fb4b6b7..e00e4807b 100644 +--- a/subprojects/extensions-tool/src/command-install.c ++++ b/subprojects/extensions-tool/src/command-install.c +@@ -158,7 +158,7 @@ install_extension (const char *bundle, + + schemapath = g_file_get_path (schemadir); + proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDERR_SILENCE, &error, +- "glib-compile-schemas", "--strict", schemapath, ++ "@glib_compile_schemas@", "--strict", schemapath, + 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/nixpkgs/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/nixpkgs/pkgs/desktops/gnome/core/gnome-terminal/default.nix index 11b9606908fc..0fa7a713ce0c 100644 --- a/nixpkgs/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -29,14 +29,14 @@ stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.48.1"; + version = "3.48.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gnome-terminal"; rev = version; - sha256 = "sha256-1t48JRESjAQubOmyK+QOhlp57iE5Ml0cqgy/2wjrLjE="; + sha256 = "sha256-WvFKFh5BK6AS+Lqyh27xIfH1rxs1+YTkywX4w9UashQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome/core/mutter/43/default.nix b/nixpkgs/pkgs/desktops/gnome/core/mutter/43/default.nix index 0f864c6f3497..2202e94881c1 100644 --- a/nixpkgs/pkgs/desktops/gnome/core/mutter/43/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/core/mutter/43/default.nix @@ -102,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook gi-docgen xorgserver + gobject-introspection ]; buildInputs = [ @@ -110,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: { glib gnome-desktop gnome-settings-daemon - gobject-introspection gsettings-desktop-schemas gtk3 libcanberra diff --git a/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix b/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix index 360095a8ad1d..4c0960eb25e3 100644 --- a/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix @@ -108,6 +108,7 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook4 gi-docgen xorgserver + gobject-introspection ]; buildInputs = [ @@ -116,7 +117,6 @@ stdenv.mkDerivation (finalAttrs: { glib gnome-desktop gnome-settings-daemon - gobject-introspection gsettings-desktop-schemas atk fribidi diff --git a/nixpkgs/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix b/nixpkgs/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix index 835fa31dd29b..1b09d4da0ef1 100644 --- a/nixpkgs/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix @@ -32,7 +32,6 @@ buildPythonApplication rec { buildInputs = [ gnome.gnome-shell - gobject-introspection # for Gio typelib ]; pythonPath = [ diff --git a/nixpkgs/pkgs/desktops/gnome/extensions/impatience/default.nix b/nixpkgs/pkgs/desktops/gnome/extensions/impatience/default.nix index 559b5edf0a3f..5d56d6756855 100644 --- a/nixpkgs/pkgs/desktops/gnome/extensions/impatience/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/extensions/impatience/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, glib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gnome-shell-extension-impatience"; - version = "unstable-2022-03-26"; + version = "unstable-2023-04-04"; src = fetchFromGitHub { owner = "timbertson"; repo = "gnome-shell-impatience"; - rev = "cf7c0bb8776af9a16e4ae114df0cc65869fb669d"; - sha256 = "sha256-z/pZxSEFELtg7kueS2i6gN1+VbN0m4mxc34pOCMak5g="; + rev = "0f961b860040ba0f7bbb51ebbaece7db29787313"; + hash = "sha256-c15zZC9xc0nq8NdnP0gjayMmnD8GyHFV8oZaD4LyR7w="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome/misc/geary/default.nix b/nixpkgs/pkgs/desktops/gnome/misc/geary/default.nix index 1a6189e6c3ef..3a89f83cb697 100644 --- a/nixpkgs/pkgs/desktops/gnome/misc/geary/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/misc/geary/default.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { pname = "geary"; - version = "44.0"; + version = "44.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "gBSsWorTxURMpWl32a0QBr1vTvXJLkNzXFEw3o7ckJ0="; + sha256 = "fRHLbhxQThCMLckaoiVqRATcq+fRyHPY1glOLfM1onc="; }; nativeBuildInputs = [ |