From 8e5ee715d12efa8fe3d1071d83c141a6a03d328a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:00:41 +0000 Subject: glib: 2.74.5 → 2.75.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib/-/compare/2.74.5...2.75.3 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/glib/default.nix | 32 +++++-------- .../glib/elementary-terminal-support.patch | 22 ++++----- .../libraries/glib/gnome-console-support.patch | 55 ---------------------- .../libraries/glib/split-dev-programs.patch | 48 +++++++++---------- 4 files changed, 45 insertions(+), 112 deletions(-) delete mode 100644 pkgs/development/libraries/glib/gnome-console-support.patch diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index cf14aa61075..2b97ddca0df 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -2,7 +2,7 @@ , lib , stdenv , fetchurl -, fetchpatch +, fetchpatch2 , gettext , meson , ninja @@ -56,11 +56,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.74.5"; + version = "2.75.3"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - sha256 = "zrqDpZmc6zGkxPyZISB8uf//0qsdbsA8Fi0/YIpcFMg="; + sha256 = "fFF9Cv9FbDWgObzoqN96CM6VqChbCdGEn4hl9jP3+HE="; }; patches = lib.optionals stdenv.isDarwin [ @@ -68,27 +68,11 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ./quark_init_on_demand.patch ./gobject_init_on_demand.patch - - # Fix error about missing sentinel in glib/tests/cxx.cpp - # These two commits are part of already merged glib MRs 3033 and 3031: - # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3033 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/glib/-/commit/0ca5254c5d92aec675b76b4bfa72a6885cde6066.patch"; - sha256 = "OfD5zO/7JIgOMLc0FAgHV9smWugFJuVPHCn9jTsMQJg="; - }) - # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3031 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/glib/-/commit/7dc19632f3115e3f517c6bc80436fe72c1dcdeb4.patch"; - sha256 = "v28Yk+R0kN9ssIcvJudRZ4vi30rzQEE8Lsd1kWp5hbM="; - }) ] ++ [ ./glib-appinfo-watch.patch ./schema-override-variable.patch - # Add support for the GNOME’s default terminal emulator. - # https://gitlab.gnome.org/GNOME/glib/-/issues/2618 - ./gnome-console-support.patch - # Do the same for Pantheon’s terminal emulator. + # Add support for Pantheon’s terminal emulator. ./elementary-terminal-support.patch # GLib contains many binaries used for different purposes; @@ -118,6 +102,13 @@ stdenv.mkDerivation (finalAttrs: { # Disable flaky test. # https://gitlab.gnome.org/GNOME/glib/-/issues/820 ./skip-timer-test.patch + + # Fix API break breaking C++ apps. + # https://gitlab.gnome.org/GNOME/glib/-/issues/2936 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch"; + hash = "sha256-8y+rl17buxazMK9Oj28CasC9AyRwt700knyCL1jDIJ0="; + }) ]; outputs = [ "bin" "out" "dev" "devdoc" ]; @@ -195,6 +186,7 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs glib/gen-unicode-tables.pl patchShebangs glib/tests/gen-casefold-txt.py patchShebangs glib/tests/gen-casemap-txt.py + patchShebangs tools/gen-visibility-macros.py # Needs machine-id, comment the test sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c diff --git a/pkgs/development/libraries/glib/elementary-terminal-support.patch b/pkgs/development/libraries/glib/elementary-terminal-support.patch index 0b8c8a70871..34a56c8487a 100644 --- a/pkgs/development/libraries/glib/elementary-terminal-support.patch +++ b/pkgs/development/libraries/glib/elementary-terminal-support.patch @@ -1,16 +1,12 @@ diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c -index a441bfec9..6bcd3e690 100644 +index 30fcb2937..a6a7163a7 100644 --- a/gio/gdesktopappinfo.c +++ b/gio/gdesktopappinfo.c -@@ -2678,6 +2678,11 @@ prepend_terminal_to_vector (int *argc, - if (check != NULL) - pass_cmd_as_single_arg = TRUE; - } -+ if (check == NULL) { -+ check = g_find_program_in_path ("io.elementary.terminal"); -+ if (check != NULL) -+ pass_cmd_as_single_arg = TRUE; -+ } - if (check == NULL) - check = g_find_program_in_path ("tilix"); - if (check == NULL) +@@ -2704,6 +2704,7 @@ prepend_terminal_to_vector (int *argc, + { "gnome-terminal", "--" }, + { "mate-terminal", "-x" }, + { "xfce4-terminal", "-x" }, ++ { "io.elementary.terminal", "-x" }, + { "tilix", "-e" }, + { "konsole", "-e" }, + { "nxterm", "-e" }, diff --git a/pkgs/development/libraries/glib/gnome-console-support.patch b/pkgs/development/libraries/glib/gnome-console-support.patch deleted file mode 100644 index 7f6894a5cec..00000000000 --- a/pkgs/development/libraries/glib/gnome-console-support.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c -index 60d6debb2..a441bfec9 100644 ---- a/gio/gdesktopappinfo.c -+++ b/gio/gdesktopappinfo.c -@@ -2627,6 +2627,7 @@ prepend_terminal_to_vector (int *argc, - int i, j; - char **term_argv = NULL; - int term_argc = 0; -+ gboolean pass_cmd_as_single_arg = FALSE; - char *check; - char **the_argv; - -@@ -2672,6 +2673,11 @@ prepend_terminal_to_vector (int *argc, - } - else - { -+ if (check == NULL) { -+ check = g_find_program_in_path ("kgx"); -+ if (check != NULL) -+ pass_cmd_as_single_arg = TRUE; -+ } - if (check == NULL) - check = g_find_program_in_path ("tilix"); - if (check == NULL) -@@ -2697,14 +2703,27 @@ prepend_terminal_to_vector (int *argc, - } - } - -- real_argc = term_argc + *argc; -+ real_argc = term_argc + (pass_cmd_as_single_arg ? 1 : *argc); - real_argv = g_new (char *, real_argc + 1); - - for (i = 0; i < term_argc; i++) - real_argv[i] = term_argv[i]; - -- for (j = 0; j < *argc; j++, i++) -- real_argv[i] = (char *)the_argv[j]; -+ if (pass_cmd_as_single_arg) { -+ char **quoted_argv = g_new (char *, *argc + 1); -+ -+ for (j = 0; j < *argc; j++) { -+ quoted_argv[j] = g_shell_quote (the_argv[j]); -+ g_free (the_argv[j]); -+ } -+ quoted_argv[j] = NULL; -+ -+ real_argv[i++] = g_strjoinv (" ", quoted_argv); -+ g_strfreev (quoted_argv); -+ } else { -+ for (j = 0; j < *argc; j++, i++) -+ real_argv[i] = (char *)the_argv[j]; -+ } - - real_argv[i] = NULL; - diff --git a/pkgs/development/libraries/glib/split-dev-programs.patch b/pkgs/development/libraries/glib/split-dev-programs.patch index 247db2150ed..f0a217f6570 100644 --- a/pkgs/development/libraries/glib/split-dev-programs.patch +++ b/pkgs/development/libraries/glib/split-dev-programs.patch @@ -1,8 +1,8 @@ diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build -index f0a256898..9c8497cd0 100644 +index 65faae9b2..4297513d4 100644 --- a/gio/gdbus-2.0/codegen/meson.build +++ b/gio/gdbus-2.0/codegen/meson.build -@@ -19,7 +19,7 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir) +@@ -20,7 +20,7 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir) # Install gdbus-codegen executable gdbus_codegen = configure_file(input : 'gdbus-codegen.in', output : 'gdbus-codegen', @@ -12,10 +12,10 @@ index f0a256898..9c8497cd0 100644 configuration : gdbus_codegen_conf ) diff --git a/gio/meson.build b/gio/meson.build -index fdd2528df..cf359c7d7 100644 +index 462606f3b..a3047fca1 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -859,14 +859,15 @@ pkg.generate(libgio, +@@ -880,14 +880,15 @@ pkg.generate(libgio, variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 'bindir=' + join_paths('${prefix}', get_option('bindir')), @@ -36,7 +36,7 @@ index fdd2528df..cf359c7d7 100644 'gsettings=' + join_paths('${bindir}', 'gsettings')], version : glib_version, install_dir : glib_pkgconfigreldir, -@@ -968,6 +969,7 @@ executable('gio', gio_tool_sources, +@@ -989,6 +990,7 @@ executable('gio', gio_tool_sources, executable('gresource', 'gresource-tool.c', install : true, @@ -44,7 +44,7 @@ index fdd2528df..cf359c7d7 100644 install_tag : 'bin', # intl.lib is not compatible with SAFESEH link_args : noseh_link_args, -@@ -975,7 +977,7 @@ executable('gresource', 'gresource-tool.c', +@@ -996,7 +998,7 @@ executable('gresource', 'gresource-tool.c', gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c', install : true, @@ -53,7 +53,7 @@ index fdd2528df..cf359c7d7 100644 install_tag : 'bin', c_args : gio_c_args, # intl.lib is not compatible with SAFESEH -@@ -985,7 +987,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu +@@ -1006,7 +1008,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu glib_compile_schemas = executable('glib-compile-schemas', ['glib-compile-schemas.c'], install : true, @@ -62,7 +62,7 @@ index fdd2528df..cf359c7d7 100644 install_tag : 'bin', # intl.lib is not compatible with SAFESEH link_args : noseh_link_args, -@@ -994,6 +996,7 @@ glib_compile_schemas = executable('glib-compile-schemas', +@@ -1015,6 +1017,7 @@ glib_compile_schemas = executable('glib-compile-schemas', glib_compile_resources = executable('glib-compile-resources', [gconstructor_as_data_h, 'glib-compile-resources.c'], install : true, @@ -71,10 +71,10 @@ index fdd2528df..cf359c7d7 100644 c_args : gio_c_args, # intl.lib is not compatible with SAFESEH diff --git a/glib/meson.build b/glib/meson.build -index 1e6dc36be..6b5de6c86 100644 +index da76fc005..8e2ef990c 100644 --- a/glib/meson.build +++ b/glib/meson.build -@@ -396,9 +396,10 @@ pkg.generate(libglib, +@@ -441,9 +441,10 @@ pkg.generate(libglib, subdirs : ['glib-2.0'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), @@ -88,7 +88,7 @@ index 1e6dc36be..6b5de6c86 100644 version : glib_version, install_dir : glib_pkgconfigreldir, filebase : 'glib-2.0', -@@ -435,6 +436,7 @@ if host_system == 'windows' +@@ -480,6 +481,7 @@ if host_system == 'windows' else gtester = executable('gtester', 'gtester.c', install : true, @@ -96,7 +96,7 @@ index 1e6dc36be..6b5de6c86 100644 install_tag : 'bin-devel', c_args : ['-UG_DISABLE_ASSERT'], include_directories : configinc, -@@ -447,7 +449,7 @@ report_conf.set('PYTHON', python_name) +@@ -492,7 +494,7 @@ report_conf.set('PYTHON', python_name) configure_file( input: 'gtester-report.in', output: 'gtester-report', @@ -106,10 +106,10 @@ index 1e6dc36be..6b5de6c86 100644 configuration: report_conf, install_mode: 'rwxr-xr-x' diff --git a/gobject/meson.build b/gobject/meson.build -index a994eb591..36b36b925 100644 +index 2129aaf8a..da8462428 100644 --- a/gobject/meson.build +++ b/gobject/meson.build -@@ -79,7 +79,7 @@ foreach tool: python_tools +@@ -94,7 +94,7 @@ foreach tool: python_tools input : tool + '.in', output : tool, configuration : python_tools_conf, @@ -118,32 +118,32 @@ index a994eb591..36b36b925 100644 install_tag : 'bin-devel', ) -@@ -155,6 +155,7 @@ meson.override_dependency('gobject-2.0', libgobject_dep) +@@ -172,6 +172,7 @@ meson.override_dependency('gobject-2.0', libgobject_dep) - executable('gobject-query', 'gobject-query.c', + gobject_query = executable('gobject-query', 'gobject-query.c', install : true, + install_dir : get_option('devbindir'), install_tag : 'bin-devel', dependencies : [libglib_dep, libgobject_dep]) diff --git a/meson_options.txt b/meson_options.txt -index f13cbfdd5..f218db581 100644 +index 517d5757c..198cc1b3c 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -3,6 +3,11 @@ option('runtime_libdir', - value : '', - description : 'install runtime libraries relative to libdir') +@@ -4,6 +4,11 @@ option('runtime_libdir', + description : 'install runtime libraries relative to libdir', + deprecated: true) +option('devbindir', + type : 'string', + value : '', + description : 'bindir for development tools') + - option('iconv', - type : 'combo', - choices : ['auto', 'libc', 'external'], + option('charsetalias_dir', + type : 'string', + value : '', diff --git a/tools/meson.build b/tools/meson.build -index 0542fb89b..bfb10cd80 100644 +index 2d4192e46..d7e710d6f 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -8,7 +8,7 @@ if have_sh -- cgit 1.4.1 From 589437f4461ae8e9c97ca3d6d8b3833551b3a2a0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:00:34 +0000 Subject: glib-networking: 2.74.0 → 2.76.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib-networking/-/compare/2.74.0...2.76.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/glib-networking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index a9a214c542c..d18d108e6bd 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.74.0"; + version = "2.76.beta"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HxharvCUEj+OJdj6VWYbP9cQIBY6AXSts1o3aFzaYTs="; + sha256 = "wKtbDzWDMlIQWOsH88mj/awOelIBxBMKVnvZ1s0/HaE="; }; patches = [ -- cgit 1.4.1 From 7e6f9d80f47176e2554c70d272b9a605b31018e8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:00:31 +0000 Subject: gjs: 1.74.2 → 1.75.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gjs/-/compare/1.74.2...1.75.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 3cac2db1702..8caafbcc7ea 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -31,13 +31,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.74.2"; + version = "1.75.2"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-pAb9ahZSz2bcqyKAYr0Wp19bM3gkjfu74BayEnRKMLY="; + sha256 = "sha256-+iv9G4v3W84PBaRckGFOGL1wgAUzhrIAwB3ve1LoI/M="; }; patches = [ -- cgit 1.4.1 From 5e5ae463edcaa00697cf77c859a5fc3d6aa0d26c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:00:48 +0000 Subject: glibmm_2_68: 2.74.0 → 2.75.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glibmm/-/compare/2.74.0...2.75.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/glibmm/2.68.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix index 531d487cb93..ae1c37e2a2d 100644 --- a/pkgs/development/libraries/glibmm/2.68.nix +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.74.0"; + version = "2.75.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-K0cmlsuseduOQFckEY7JRSGcW5sYr2PcjPt/HYmw8fo="; + sha256 = "sha256-YLsS5mSIqozkHw6y82EvifXdyIfj5NRUmFJL9gsmaz0="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 2a9d7ea3a938c4644c8913e993fada2f5f5c73a5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:00:00 +0000 Subject: at-spi2-core: 2.46.0 → 2.47.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/at-spi2-core/-/compare/AT_SPI2_CORE_2_46_0...AT_SPI2_CORE_2_47_1 Not adding API docs for now, requires Sphinx. Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/at-spi2-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index f34262b03f2..0beb31a3ce6 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.46.0"; + version = "2.47.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "qgyGx596jWe65JpbelqwhDDGCM/+bjO/R6cvQasDw9A="; + sha256 = "xrp8FgQ07evwnSk2kzVpyTb27JcjAXZvK9rFpNQYFTw="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 75723a05c555e42aa04aaa47afbd8418fb735321 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:03:23 +0000 Subject: gobject-introspection: 1.74.0 → 1.75.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gobject-introspection/-/compare/1.74.0...1.75.6 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gobject-introspection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 02d2dbb6a53..49fb038d4cc 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -36,7 +36,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gobject-introspection"; - version = "1.74.0"; + version = "1.75.6"; # outputs TODO: share/gobject-introspection-1.0/tests is needed during build # by pygobject3 (and maybe others), but it's only searched in $out @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gobject-introspection/${lib.versions.majorMinor finalAttrs.version}/gobject-introspection-${finalAttrs.version}.tar.xz"; - sha256 = "NHs6cZ5oukxp/y1X7iaJIz6owH/EkiBeVzOGd55C1lM="; + sha256 = "GhuXcXq8lJvXw8/mlpPaA7/bswxbSoXeT8oI4x8NJ/4="; }; patches = [ -- cgit 1.4.1 From 00bb94119d421dfc088df131f6e1657d5e2503fb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:03:28 +0000 Subject: gsettings-desktop-schemas: 43.0 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/compare/43.0...44.beta Changelog-Reviewed-By: Jan Tojnar --- .../libraries/gsettings-desktop-schemas/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index df677194dad..56d4c95d225 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -7,18 +7,17 @@ , withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages , meson , ninja -, python3 # just for passthru , gnome }: stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "43.0"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "XVVoKCqzi5V1nUJUAfdHblb4y/JimIVYdDn0O9C4S74="; + sha256 = "Fk7gdvQpMIM3CGeOsxgdBv4u/Mv5RNqRHMgIgcPxKtQ="; }; strictDeps = true; @@ -28,7 +27,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 ] ++ lib.optionals withIntrospection [ gobject-introspection ]; @@ -37,11 +35,6 @@ stdenv.mkDerivation rec { (lib.mesonBool "introspection" withIntrospection) ]; - postPatch = '' - chmod +x build-aux/meson/post-install.py - patchShebangs build-aux/meson/post-install.py - ''; - preInstall = '' # Meson installs the schemas to share/glib-2.0/schemas # We add the override file there too so it will be compiled and later moved by -- cgit 1.4.1 From 58e81cd39cc8763b0fae9decb9aa5e47822ab5fe Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:04:35 +0000 Subject: pango: 1.50.12 → 1.50.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/pango/-/compare/1.50.12...1.50.13 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/pango/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 50e2d5736ff..bedc4f5c747 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "pango"; - version = "1.50.12"; + version = "1.50.13"; outputs = [ "bin" "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "yu+W0nu+eSpr6ScnxzRo2DKxPaV8gHHvebnfae4Fj+M="; + sha256 = "XNz212HSaj65QStssGmzK9HZsHq/EWMhFn2UwhiSmf0="; }; depsBuildBuild = [ -- cgit 1.4.1 From 297dedf249649cdce5ca57cfa63c8e5f019a0976 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:04:38 +0000 Subject: python3.pkgs.pygobject3: 3.42.2 → 3.43.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/pygobject/-/compare/3.42.2...3.43.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/python-modules/pygobject/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 893fd1e6456..2d74b75dd18 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pygobject"; - version = "3.42.2"; + version = "3.43.1"; outputs = [ "out" "dev" ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "rehpXipwc4Sd0DFtMdhyjhXh4Lxx2f9tHAnoa+UryVc="; + sha256 = "55ImenkMC5kJkru8QUmIy5apXAotSBQ2Xn9WzfqN9hM="; }; depsBuildBuild = [ -- cgit 1.4.1 From 8695577e7d433d049e660d55e2e9ec05d0c79f49 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:03:39 +0000 Subject: gtksourceview5: 5.6.2 → 5.7.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtksourceview/-/compare/5.6.2...5.7.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gtksourceview/5.x.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index 100e3e44a88..ee57285d2a4 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch2 , meson , ninja , pkg-config @@ -25,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; - version = "5.6.2"; + version = "5.7.1"; outputs = [ "out" "dev" "devdoc" ]; @@ -33,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HxRsFW8TWmBJnZeeNXfJm24VoRFEV2er5iGbs0xUXHc="; + sha256 = "O0JUGWTbnC+lCpZY1Ihr33fQI/5OlsWxe85RyfWMSOY="; }; patches = [ @@ -41,13 +40,6 @@ stdenv.mkDerivation (finalAttrs: { # but not from its own datadr (it assumes it will be in XDG_DATA_DIRS). # Since this is not generally true with Nix, let’s add $out/share unconditionally. ./4.x-nix_share_path.patch - - # Add Nix syntax highlighting. - # https://gitlab.gnome.org/GNOME/gtksourceview/-/merge_requests/303 - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/gtksourceview/-/commit/2cc7fd079f9fc8b593c727c68a2c783c82299562.patch"; - sha256 = "bTYWjEDpdbnUxcYNKl2YtSLfYlMfcbQSSYQjhixOGS8="; - }) ]; nativeBuildInputs = [ @@ -85,13 +77,6 @@ stdenv.mkDerivation (finalAttrs: { "-Dgtk_doc=true" ]; - postPatch = '' - # https://gitlab.gnome.org/GNOME/gtksourceview/-/merge_requests/295 - # build: drop unnecessary vapigen check - substituteInPlace meson.build \ - --replace "if generate_vapi" "if false" - ''; - doCheck = stdenv.isLinux; checkPhase = '' -- cgit 1.4.1 From 2b4ca2d2836a2ba11187887f12b793ebaa316eeb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:03:53 +0000 Subject: gtk4: 4.8.3 → 4.9.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk/-/compare/4.8.3...4.9.4 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gtk/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 764dc36d7db..c01f2065e48 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.8.3"; + version = "4.9.4"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "s2L5aNCFtNPZNA1NOMcGN33tnVN05pSitrfmKS48unQ="; + sha256 = "kaOv1YQB1OXYHjCwjuPxE6R2j/EBQDNqcqMmx3JyvjA="; }; depsBuildBuild = [ -- cgit 1.4.1 From d7301106aab77ef4ef94a8fa22d182b7874f0159 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:03:54 +0000 Subject: gtkmm4: 4.8.0 → 4.9.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtkmm/-/compare/4.8.0...4.9.3 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gtkmm/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix index ffb2e123c87..423d27a437e 100644 --- a/pkgs/development/libraries/gtkmm/4.x.nix +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "4.8.0"; + version = "4.9.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "yCeG1G4rBzRrY5fKfxkp2VL0ki+lyds97ghJi5oTbPU="; + sha256 = "uGCyNIIqAwHDCQHHHx3/364fX5skBNDafdtd7WG19L4="; }; nativeBuildInputs = [ -- cgit 1.4.1 From f2832b96bad2725292b521b06fab98dd191c1af3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:04:00 +0000 Subject: libadwaita: 1.2.3 → 1.3.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.2.3...1.3.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libadwaita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 75e70ff1ddd..55f4a3ad3db 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.2.3"; + version = "1.3.beta"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-m69TpXCs6QpVrN+6auig71ik+HvVprHi0OnlyDwTL7U="; + hash = "sha256-SqJrWaGIfqxmd6OxiIWa3QfFUZgnoWKGsu6/+0QPlyI="; }; depsBuildBuild = [ -- cgit 1.4.1 From 4532de29b317af07d09b502a18f7179251df160c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:04:08 +0000 Subject: libgtop: 2.40.0 → 2.41.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libgtop/-/compare/2.40.0...2.41.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libgtop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index bfe0726c454..4fffa6740f8 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "libgtop"; - version = "2.40.0"; + version = "2.41.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1m6jbqk8maa52gxrf223442fr5bvvxgb7ham6v039i3r1i62gwvq"; + sha256 = "Q+qa0T98r5gwPmQXKxkb6blrqzQLAZ3u7HIlHuFA/js="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 6932fd0cca5863c05601af601a5511a733c485ff Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:04:13 +0000 Subject: libpanel: 1.0.2 → 1.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libpanel/-/compare/1.0.2...1.1.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libpanel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpanel/default.nix b/pkgs/development/libraries/libpanel/default.nix index d3ab5fc0be2..5d330d0ea3b 100644 --- a/pkgs/development/libraries/libpanel/default.nix +++ b/pkgs/development/libraries/libpanel/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "libpanel"; - version = "1.0.2"; + version = "1.1.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/libpanel/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "pnIEOkiuIAUAl8mp+dmPKnOh7IVHgirnu6VNPMiNf+I="; + sha256 = "qI+EEDhE1wLdzfl+vpshoGUvqwKf+CJ0LyJHHbZDCL4="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 602bf4d73d5fefc11fea644f388973b723c729c4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:04:14 +0000 Subject: libnotify: 0.8.1 → 0.8.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libnotify/-/compare/0.8.1...0.8.2 API docs were ported to gi-docgen, too lazy to enable them. Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libnotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index 1238b91920a..e94ce7e12b1 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libnotify"; - version = "0.8.1"; + version = "0.8.2"; outputs = [ "out" "man" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0DPm1NbMv0akNsMWKKS2YbNtyh9dQXT+AXPidPTmJVc="; + sha256 = "xfTtPR+G5bEYx2QVqsuGGHPtPm8MazGBuCjPWE/FxhY="; }; mesonFlags = [ -- cgit 1.4.1 From 5c22534bea5df2752a5edc7f72c0921a559b6244 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:04:20 +0000 Subject: libsoup_3: 3.2.2 → 3.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libsoup/-/compare/3.2.2...3.3.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libsoup/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix index 2ea9978ed48..6fded45313d 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "libsoup"; - version = "3.2.2"; + version = "3.3.1"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-g2c8aFuRD7fTnx8o7uWvvvtxwFeY/DUKw78biF4e+qE="; + sha256 = "sha256-oLH+RcHaVHpukifdrch+H+1YbVndB0/a6vA1s5hRkZ0="; }; depsBuildBuild = [ -- cgit 1.4.1 From a71df7fa5c537889699ae8cfca86aa8a8666ba68 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:04:47 +0000 Subject: tracker: 3.4.2 → 3.5.0.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tracker/-/compare/3.4.2...3.5.0.beta Vala API break! Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/tracker/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 2cf6cdf7ddb..b0d5022d5e1 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -9,6 +9,7 @@ , gobject-introspection , buildPackages , withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, vala , python3 , docbook-xsl-nons , docbook_xml_dtd_45 @@ -31,13 +32,13 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "3.4.2"; + version = "3.5.0.beta"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Tm3xQqT3BIePypjrtaIkdQ5epUaqKqq6pyanNUC9FzE="; + sha256 = "gMNtrSS6a0ATwKNy/mz7GrzprzLM5Xs1yV+lPq2LbY8="; }; postPatch = '' @@ -64,6 +65,7 @@ stdenv.mkDerivation rec { (python3.pythonForBuild.withPackages (p: [ p.pygobject3 ])) ] ++ lib.optionals withIntrospection [ gobject-introspection + vala ]; buildInputs = [ @@ -88,6 +90,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddocs=true" (lib.mesonEnable "introspection" withIntrospection) + (lib.mesonEnable "vapi" withIntrospection) (lib.mesonBool "test_utils" withIntrospection) ] ++ ( let -- cgit 1.4.1 From 362115f1496866d5cc69af5ab82e5017176e5030 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:04:54 +0000 Subject: tracker-miners: 3.4.3 → 3.5.0.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tracker-miners/-/compare/3.4.3...3.5.0.beta - Battery detector defaults to UPower. - Media extractor defaults to GStreamer. - Charset detection defaults to ICU. - libtracker-miner no longer a public library. Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/tracker-miners/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 59aa84b9518..3df13b3c332 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.4.3"; + version = "3.5.0.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "jk85dkcmQbZI0PjyDeuuGxYpyltWC4YW4RfSnXVvvus="; + sha256 = "R4gpdKN9C1w+gl/rMftv6ifOLsIik9SpEfc3IC60aSY="; }; nativeBuildInputs = [ @@ -116,6 +116,7 @@ stdenv.mkDerivation rec { # to be safe due to the general state of the project "-Dminer_rss=false" ] ++ lib.optionals (!stdenv.isLinux) [ + "-Dbattery_detection=none" "-Dnetwork_manager=disabled" "-Dsystemd_user_services=false" ]; -- cgit 1.4.1 From 36e22722f202492484258ab566ac9999f9242fd6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:04:54 +0000 Subject: vte: 0.70.3 → 0.71.92 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vte/-/compare/0.70.3...0.71.92 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/vte/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index d331391ce0e..b55ffa1a768 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.70.3"; + version = "0.71.92"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-lFcTSgLzFX/KBPfg05vbDzCZvgo86CtxOdDJioB0jyM="; + sha256 = "sha256-0psrckN+7cFylU+hNu0hUzQKyeF2FEqmO2HCRroBC+g="; }; patches = [ -- cgit 1.4.1 From 970970308a6d1cc6d7041e88a885cd565b381e80 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:03:11 +0000 Subject: gnome-desktop: 43.2 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-desktop/-/compare/43.2...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gnome-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnome-desktop/default.nix b/pkgs/development/libraries/gnome-desktop/default.nix index 0cf7afd41e8..f5b5cf19548 100644 --- a/pkgs/development/libraries/gnome-desktop/default.nix +++ b/pkgs/development/libraries/gnome-desktop/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "43.2"; + version = "44.beta"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-oLmrINKKY99s5+keq7Xjr4ZjC/UitaiZfASXG9VR1zA="; + sha256 = "sha256-Km93B82bnMdzW7ryxbTFz4BZbvn0WxS7Nddt5H0a3kU="; }; patches = lib.optionals stdenv.isLinux [ -- cgit 1.4.1 From 5d67de42cfd2ba35bc7dc3004b2c25df37062637 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:00:43 +0000 Subject: gnome.adwaita-icon-theme: 43 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/compare/43...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix index 069d1d6040c..ca1a08b7d74 100644 --- a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "43"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "LjrHfTKmqlVUFV3zfo8KDdVPxaZf1yHojVBflw2jLsY="; + sha256 = "dyoVbuViRNbVa3b3DPxubkpGZqtIwjS3w+laYmo5qNY="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 094ea8f534e9b0374c090463901314f30db4d059 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:04:57 +0000 Subject: xdg-desktop-portal-gnome: 43.1 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/compare/43.1...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix index 5f1b7f3f34d..a811245c9ec 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gnome"; - version = "43.1"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Ca22bG2RU+bwXfZtqirWKl3g42Zl6dIpUXO7DdxTtM0="; + sha256 = "g6GQnwPOHm+rByv38TahQVmxScc5mwkfkB8ND0Z4VeI="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 8fe5ceac2154ff1d45843f64fc60bfad761be501 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:00:05 +0000 Subject: d-spy: 1.4.0 → 1.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/d-spy/-/compare/1.4.0...1.5.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/tools/misc/d-spy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/d-spy/default.nix b/pkgs/development/tools/misc/d-spy/default.nix index 43be248244d..fa4292eee10 100644 --- a/pkgs/development/tools/misc/d-spy/default.nix +++ b/pkgs/development/tools/misc/d-spy/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "d-spy"; - version = "1.4.0"; + version = "1.5.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/d-spy/${lib.versions.majorMinor version}/d-spy-${version}.tar.xz"; - sha256 = "6uh0jOpiTFxMdeAhwt8dc3bk+fj76JrEQ0kR7PeIZ3I="; + sha256 = "qxOcIOMNYq1sguyTOmEvVcyWZ/Mv551FXPUHmIwjXL0="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 7943b76b91098ad67d8fa8dbd94287a7713cb901 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:00:00 +0000 Subject: baobab: 43.0 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/baobab/-/compare/43.0...44.beta Co-authored-by: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/baobab/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome/core/baobab/default.nix b/pkgs/desktops/gnome/core/baobab/default.nix index c7ff70d2607..400d8ed33bb 100644 --- a/pkgs/desktops/gnome/core/baobab/default.nix +++ b/pkgs/desktops/gnome/core/baobab/default.nix @@ -7,7 +7,6 @@ , meson , ninja , pkg-config -, python3 , gtk4 , libadwaita , glib @@ -19,11 +18,11 @@ stdenv.mkDerivation rec { pname = "baobab"; - version = "43.0"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "UsaGQRj1aX9aVzaILc2ifbIuciC8SSg43uzGmSRs2yY="; + sha256 = "p12ey7F5DTPoOsEhM00eORMoeySjZOh32QQYQKkHrpE="; }; nativeBuildInputs = [ @@ -35,7 +34,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 vala wrapGAppsHook4 # Prevents “error: Package `libadwaita-1' not found in specified Vala API @@ -52,12 +50,6 @@ stdenv.mkDerivation rec { doCheck = true; - postPatch = '' - # https://gitlab.gnome.org/GNOME/baobab/-/merge_requests/40 - substituteInPlace build-aux/post-install.py \ - --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" - ''; - passthru = { updateScript = gnome.updateScript { packageName = pname; -- cgit 1.4.1 From 53acb69b1c010ab942e22ee93d7e68e4a929717e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:00:23 +0000 Subject: epiphany: 43.1 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/epiphany/-/compare/43.1...44.beta Changelog-Reviewed-By: Jan Tojnar Co-authored-by: Bobby Rong --- pkgs/desktops/gnome/core/epiphany/default.nix | 50 +++++++++++---------------- 1 file changed, 21 insertions(+), 29 deletions(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 8b5f935f491..bd14b3c4a05 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -4,18 +4,16 @@ , ninja , gettext , fetchurl -, fetchpatch , pkg-config -, gtk3 +, gtk4 , glib , icu -, wrapGAppsHook +, wrapGAppsHook4 , gnome -, libportal-gtk3 +, libportal-gtk4 , libxml2 -, libxslt , itstool -, webkitgtk_4_1 +, webkitgtk_6_0 , libsoup_3 , glib-networking , libsecret @@ -23,37 +21,33 @@ , libarchive , p11-kit , sqlite -, gcr +, gcr_4 , isocodes , desktop-file-utils , nettle , gdk-pixbuf , gst_all_1 , json-glib -, libdazzle -, libhandy +, libadwaita , buildPackages , withPantheon ? false }: stdenv.mkDerivation rec { pname = "epiphany"; - version = "43.1"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "6G6tJ8uZgoFRUGZN478g+vN193uAZbArMRgMZba767Q="; + sha256 = "UccRkzgLjdoM7opWyLROzZLDi8fDStCGkP0rbXggApE="; }; - patches = lib.optionals withPantheon [ - # Pantheon specific patches for epiphany - # https://github.com/elementary/browser - # - # Patch to unlink nav buttons - # https://github.com/elementary/browser/pull/18 - (fetchpatch { - url = "https://raw.githubusercontent.com/elementary/browser/cc17559a7ac6effe593712b4f3d0bbefde6e3b62/navigation-buttons.patch"; - sha256 = "sha256-G1/JUjn/8DyO9sgL/5Kq205KbTOs4EMi4Vf3cJ8FHXU="; + patches = [ + # Fix compatibility with latest WebKitGTK + # https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1281 + (fetchurl { + url = "https://src.fedoraproject.org/rpms/epiphany/raw/a8965d48efad1cbd41f67f1468d6d10e4407cd57/f/webkitgtk-2.39.90.patch"; + hash = "sha256-07eoyWL/z5MgbU+tlq5CJ8CdR+90qHM8EJPJIQ/5Y0M="; }) ]; @@ -61,17 +55,16 @@ stdenv.mkDerivation rec { desktop-file-utils gettext itstool - libxslt meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook4 buildPackages.glib - buildPackages.gtk3 + buildPackages.gtk4 ]; buildInputs = [ - gcr + gcr_4 gdk-pixbuf glib glib-networking @@ -82,13 +75,12 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-good gst_all_1.gst-plugins-ugly gst_all_1.gstreamer - gtk3 + gtk4 icu isocodes json-glib - libdazzle - libhandy - libportal-gtk3 + libadwaita + libportal-gtk4 libarchive libsecret libsoup_3 @@ -96,7 +88,7 @@ stdenv.mkDerivation rec { nettle p11-kit sqlite - webkitgtk_4_1 + webkitgtk_6_0 ]; # Tests need an X display -- cgit 1.4.1 From a788a54676b73b2080acf7334728a6e855600260 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:00:28 +0000 Subject: evolution: 3.46.4 → 3.47.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution/-/compare/3.46.4...3.47.2 Changelog-Reviewed-By: Jan Tojnar --- .../networking/mailreaders/evolution/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 65bb334611a..e06e521e340 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.46.4"; + version = "3.47.2"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "eghCMc7SRaNLcT141Dp3Zgyso79S5qT1AwpqCAxpez0="; + sha256 = "7xSv13D5e1U0AVgxjccbgGwOPfIA/mvZhULSQ+FONdU="; }; nativeBuildInputs = [ -- cgit 1.4.1 From e6f150382b4196f2484addbe5a1a8677d2c0254d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:00:52 +0000 Subject: gnome.eog: 43.2 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/eog/-/compare/43.2...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/eog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index 2459c3535e9..1ca57916c61 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "43.2"; + version = "44.beta"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-nc/c5VhakOK7HPV+N3yx6xLUG9m8ubus31BrwbE1Tvk="; + sha256 = "sha256-W0YOBHadUFDua68kdc4sKJb09W5rdm+/LkrpcfN15Fk="; }; patches = [ -- cgit 1.4.1 From acbe0709821d1c857802f3f2f1be5c8cdc315c2a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:00:56 +0000 Subject: gnome.ghex: 43.1 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/ghex/-/compare/43.1...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/ghex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix index 4f036de24d7..c00687f2137 100644 --- a/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/pkgs/desktops/gnome/apps/ghex/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "ghex"; - version = "43.1"; + version = "44.beta"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "pUuUPv5CAQqcEuTc2ts3e/NslMOAB3i4Uww6g0QJ3Mc="; + sha256 = "kjcwo6SnIgjYK1hrjxmq3De7/9f/5mhMiF61AQZYEkw="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 33c52f8e3fcb570e68bec77353f2aee95fce77ae Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:01:03 +0000 Subject: gnome.gnome-boxes: 43.3 → 44.beta.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-boxes/-/compare/43.3...44.beta.1 - Drops tracker dependency https://github.com/GNOME/gnome-boxes/commit/2456b7bfddf876b79c2458c4173d65a33e797509 https://github.com/GNOME/gnome-boxes/commit/dbc5cc586348d576ae779c05ca7f25112da20497 Changelog-Reviewed-By: Jan Tojnar Co-authored-by: Bobby Rong --- pkgs/desktops/gnome/apps/gnome-boxes/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 8b7a94668f2..e01e4fa0979 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -20,8 +20,6 @@ , libsoup_3 , libosinfo , systemd -, tracker -, tracker-miners , vala , libcap , yajl @@ -38,7 +36,6 @@ , libarchive , acl , libgudev -, libsecret , libcap_ng , numactl , libapparmor @@ -51,11 +48,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "43.3"; + version = "44.beta.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "7tu69YDZuC20vmV7k7zuXzioe3hScPxJVcC/OGIs7ZM="; + sha256 = "vUCk0EoXGLWk26+RGZ9N0gKqysevegyJPisFUykg7ug="; }; patches = [ @@ -105,7 +102,6 @@ stdenv.mkDerivation rec { libhandy libosinfo librsvg - libsecret libsoup_3 libusb1 libvirt @@ -115,8 +111,6 @@ stdenv.mkDerivation rec { spice-gtk spice-protocol systemd - tracker - tracker-miners vte webkitgtk_4_1 yajl -- cgit 1.4.1 From e5e99f609afdd629965023314d956d07f83a7972 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:01:04 +0000 Subject: gnome.gnome-calendar: 43.1 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calendar/-/compare/43.1...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-calendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index 5782bb861da..e731af31dca 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "43.1"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "r6X8ZuL2kVU8x9UX2yNjz/LWLNG130VeX09xMxOdIfI="; + sha256 = "3ll5sxyoqVyJzUQaf01iJ7EVl6miJC2N9yCgYSv3xyI="; }; nativeBuildInputs = [ -- cgit 1.4.1 From d9a45ba4f3374b0fa34d04ffffd7c1ac0bbd4cd0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:01:08 +0000 Subject: gnome.gnome-calculator: 43.0.1 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calculator/-/compare/43.0.1...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-calculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix index f84c9ab65a8..70a338c64fb 100644 --- a/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "43.0.1"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "AsEt7Tz1BT0XU32V7GlYf0uRmJnXcm7O7NtLR/+xyQ8="; + sha256 = "XIS985nFY8DNQpjAf7hLfATrtW4ZZL+Zx6L90n2090A="; }; nativeBuildInputs = [ -- cgit 1.4.1 From ab892c8e6e196a068be76de8a054cda74ad66d50 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:01:10 +0000 Subject: gnome.gnome-characters: 43.1 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-characters/-/compare/43.1...44.beta - meson_post_install.py is removed Changelog-Reviewed-By: Jan Tojnar Co-authored-by: Bobby Rong --- pkgs/desktops/gnome/apps/gnome-characters/default.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/pkgs/desktops/gnome/apps/gnome-characters/default.nix index 5617272acc3..5afb0e1fbdd 100644 --- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -11,7 +10,6 @@ , gtk4 , pango , wrapGAppsHook4 -, python3 , desktop-file-utils , gobject-introspection , gjs @@ -23,27 +21,19 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "43.1"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sj4V2VCXizY8gaRyYe4aO0fbPGaX7haf8hPuplcqeEE="; + sha256 = "cUlibILXNw+nfUlHrNlAczguTn6lU6JIJXgZGJimFB8="; }; - patches = [ - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-characters/-/commit/3e28a6ad668e2239b14f2e05bc477ec1bfb210ba.patch"; - sha256 = "sha256-2N4eewknhOXBABs6BPA5/YuqZMT8dyXW857iamrrtuA="; - }) - ]; - nativeBuildInputs = [ gettext gobject-introspection meson ninja pkg-config - python3 desktop-file-utils wrapGAppsHook4 ]; @@ -60,11 +50,6 @@ stdenv.mkDerivation rec { pango ]; - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - dontWrapGApps = true; postFixup = '' -- cgit 1.4.1 From 25b67275d00c453b510bb8757b0dd476e209083f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:01:12 +0000 Subject: gnome.gnome-clocks: 43.0 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-clocks/-/compare/43.0...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-clocks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix index 98a623b9a06..cbc95537e6f 100644 --- a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "43.0"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sHQ7cNAIgKo7zcx/fzTIwihiV7XIFzfU+YG8jE9PmB0="; + sha256 = "aA90ZhpYDVGvOo6XY85SXg2NJckUid02r0gJP/trje8="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 3a7fed34bd09cd73e553fb6ab215c7896be6d2bd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:01:19 +0000 Subject: gnome.gnome-contacts: 43.1 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-contacts/-/compare/43.1...44.beta Changelog-Reviewed-By: Jan Tojnar Co-authored-by: Bobby Rong --- pkgs/desktops/gnome/core/gnome-contacts/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix index 560d40ddc11..6d029bafa88 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -13,6 +13,7 @@ , libportal-gtk4 , gnome-desktop , gnome-online-accounts +, qrencode , wrapGAppsHook4 , folks , libxml2 @@ -26,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "43.1"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Ug3IjJAce4/n4SoBOhQlz+2R8vhAhIWitJ+SxnWZACA="; + sha256 = "hinEkGeL2yJwYZbYAhyWV6zbuDLtmHe4EsAz3g7wv2s="; }; nativeBuildInputs = [ @@ -57,6 +58,7 @@ stdenv.mkDerivation rec { libadwaita libxml2 gnome-online-accounts + qrencode ]; doCheck = true; -- cgit 1.4.1 From 520d05be7c6693f6c5f20715d6cbcf29715ec037 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:01:28 +0000 Subject: gnome.gnome-disk-utility: 43.0 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-disk-utility/-/compare/43.0...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-disk-utility/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix index 4cf083ed564..7e378616457 100644 --- a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "43.0"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-evypgFprkttpM91+/OxK+DhsAbvB+HHi2uTe9+GSosU="; + sha256 = "sha256-kgHRXmsyvKjGS8clpXKHO9SdUebZH+iqUT2MZx9WyMY="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 4da0e953c370e7a220c2e2b615fbb7fe09b7ffc9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:01:30 +0000 Subject: gnome.gnome-control-center: 43.4.1 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/43.4.1...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 0b4d71adc5f..687c407273d 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -64,11 +64,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "43.4.1"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-AA+XBRroJHJJOSsB+/uiCv7lZiZxlscNVEChisBY2Z4="; + sha256 = "sha256-U/Sc2ykcH2h2FIN2bCEwFqN5UFGmGODdx33/TnKrqCI="; }; patches = [ -- cgit 1.4.1 From d0fd1d4f1f2152ab7d37e96c2b6230443d996c72 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:01:34 +0000 Subject: gnome.gnome-backgrounds: 43.1 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/compare/43.1...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-backgrounds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix index eeee846ad19..392ecb929d2 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 = "43.1"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "jkWcrTinV0aDpV5ed2kOZYxvn+ruycuCA5qyW6K8oF0="; + sha256 = "UBPTQ4gq+84r35GoiwewsNkG1m3jY8+UOG/oaLbg6cA="; }; patches = [ -- cgit 1.4.1 From 5279ddeccc160525c22144670a0c9efc7cd8b0ea Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:02:01 +0000 Subject: gnome.gnome-font-viewer: 43.0 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/compare/43.0...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-font-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix index 9a684cdaeaa..8b45aee0fd6 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 = "43.0"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "gca/+wbVMyNG4A6uyuwb3P1hfFHf2VvNBY1sdsdt0rk="; + sha256 = "0Dhb3qjH9AYWx8Fyp0SnbaaaKgUWs8lug6abc50Il+0="; }; doCheck = true; -- cgit 1.4.1 From d56dce12f3fa9f8cf57bf3be5dc0a143ff87e48f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:02:08 +0000 Subject: gnome.gnome-initial-setup: 43.2 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/compare/43.2...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-initial-setup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index 0bfa9226e0d..48a4ef4462d 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "43.2"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "I9eWOlTUlZRQTQ6s2FCWyvtfhvHnSljgQGdbbnmK5pg="; + sha256 = "V6wpMsnNzzXMpaXYui6rsu3E/SgGUQwRpxxNazx8d5w="; }; patches = [ -- cgit 1.4.1 From b566758d86700cbd8b40a19b41fb8a0bf3f31ba1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:02:10 +0000 Subject: gnome.gnome-maps: 43.4 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-maps/-/compare/v43.4...v44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-maps/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index ba83f42fce6..d5dd0d8b683 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , meson , ninja , gettext @@ -28,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "43.4"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-zlLVW6T2fYlu8tmZczc6iYZql7t0pLQCS23iZzx/8e8="; + sha256 = "sha256-nk/8mxzJx1JzZl3cLAgYobcuPkMe18ZCPz7KVde/cwI="; }; doCheck = true; @@ -66,14 +65,6 @@ stdenv.mkDerivation rec { libsoup_3 ]; - patches = [ - (fetchpatch { - name = "timeTest.patch"; - url = "https://gitlab.gnome.org/GNOME/gnome-maps/-/commit/bec3d2f26de1b3a8c8b7e603f6d6a46c853426fa.diff"; - sha256 = "sha256-7/ogIDG0piZOPaCPX4nUA3jHI7RGTd2KMZsp8z0XLcc="; - }) - ]; - postPatch = '' # The .service file isn't wrapped with the correct environment # so misses GIR files when started. By re-pointing from the gjs -- cgit 1.4.1 From 008a5ebb1d308bc9956b1e9b3f12d3ad32c6cc16 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:02:14 +0000 Subject: gnome.gnome-music: 42.1 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-music/-/compare/42.1...44.beta - Ported to soup 3.x Changelog-Reviewed-By: Jan Tojnar Co-authored-by: Bobby Rong --- pkgs/desktops/gnome/apps/gnome-music/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix index 445d667b838..30f5153c937 100644 --- a/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -23,20 +23,20 @@ , itstool , gnome , gst_all_1 -, libsoup +, libsoup_3 , libadwaita , gsettings-desktop-schemas }: python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "42.1"; + version = "44.beta"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "x3R/pqhrVrGK1v+VD/kB5Z7n+sEcaLKmcnr4bq7tgnA="; + sha256 = "tdbhsIlD/XP/EKHpAnU5gS0k88rOpB9nGlmRqWkLEag="; }; nativeBuildInputs = [ @@ -64,7 +64,7 @@ python3.pkgs.buildPythonApplication rec { grilo grilo-plugins libnotify - libsoup + libsoup_3 libadwaita gsettings-desktop-schemas tracker -- cgit 1.4.1 From e6c58074b3131d2c1da7ddc240c3669117524a92 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:02:19 +0000 Subject: gnome.gnome-panel: 3.46.0 → 3.47.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-panel/-/compare/3.46.0...3.47.1 grep -inr 'soup' returns nothing. Having both e-d-s and libsoup2 will be weird otherwise. Previously we have this because we init this package 5+ years ago but we only started propagating libsoup in e-d-s 4 years ago. Co-authored-by: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/misc/gnome-panel/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gnome-panel/default.nix b/pkgs/desktops/gnome/misc/gnome-panel/default.nix index 503fc34bae8..aedcfec4337 100644 --- a/pkgs/desktops/gnome/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-panel/default.nix @@ -14,7 +14,6 @@ , gtk3 , itstool , libgweather -, libsoup , libwnck , libxml2 , pkg-config @@ -25,13 +24,13 @@ stdenv.mkDerivation rec { pname = "gnome-panel"; - version = "3.46.0"; + version = "3.47.1"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-zsehG3DFJLXo121Nfk2DXuYHq9outC9N92GeYusGrrE="; + hash = "sha256-2PbixllmjHffgsPdlboE/O+MQMIo4sImBfmhepFh7IM="; }; patches = [ @@ -77,7 +76,6 @@ stdenv.mkDerivation rec { gnome-menus gtk3 libgweather - libsoup libwnck polkit systemd -- cgit 1.4.1 From c13589761e740f84143b8a03342c2682a9e57ade Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:02:21 +0000 Subject: gnome.gnome-remote-desktop: 43.3 → 44.alpha MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/compare/43.3...44.alpha Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index a853a2457d1..608108fc3ec 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "43.3"; + version = "44.alpha"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-EdRR0f3kTxgJ6/Ya/0vqX570/cAjWaiWR/bp59RUKaw="; + hash = "sha256-lbpYHPMRnDPhj323Vi8Yr8KxPdAQ+DG/rtHOHm6XdWo="; }; nativeBuildInputs = [ -- cgit 1.4.1 From d004cccbc82fc79c068035c8e5278f145d402d74 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:02:23 +0000 Subject: gnome.gnome-settings-daemon: 43.0 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The xsettings module will now always set `Gtk/IMModule` key in XSettings to `ibus` when GTK’s IM module is set to an empty value (the default). This will produce an incorrect value in GtkSettings for X11 apps but that does not really matter as GTK will fall back to `gtk-im-context-simple` as before, when the requested `ibus` module is not present. https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/compare/43.0...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index e494a46d16d..1b80b3b5ad5 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "43.0"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "NRO7JPxvgYFmciOmSgZ1NP3M879mMmqUA9OLDw1gE9A="; + sha256 = "nqXYLZ84eqBd0dBR7DS1OyT79k+cnNhCLt/sK+U27II="; }; patches = [ -- cgit 1.4.1 From 448e43729540f3fa9a29d3686080f5af9c5ecf6c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:02:48 +0000 Subject: gnome.mutter: 43.3 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mutter/-/compare/43.3...44.beta GTK 4 used for drawing window frames: https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2175 fribidi, and ATK still used by Clutter; GTK 3 and libICE still used by libmutter. Co-authored-by: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/mutter/default.nix | 39 ++++++++++++----------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index f07443cb249..d8434c3f0be 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -1,7 +1,6 @@ { fetchurl , runCommand , lib -, fetchpatch , stdenv , pkg-config , gnome @@ -19,6 +18,7 @@ , xkeyboard_config , libxcvt , libxkbfile +, libICE , libXdamage , libxkbcommon , libXtst @@ -26,7 +26,11 @@ , libdrm , gsettings-desktop-schemas , glib +, atk , gtk3 +, gtk4 +, fribidi +, harfbuzz , gnome-desktop , pipewire , libgudev @@ -37,7 +41,7 @@ , gnome-settings-daemon , xorgserver , python3 -, wrapGAppsHook +, wrapGAppsHook4 , gi-docgen , sysprof , libsysprof-capture @@ -50,31 +54,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "43.3"; + version = "44.beta"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - sha256 = "Z75IINmycMnDxl44lHvwUtLC/xiunnBCHUklnvrACn0="; + sha256 = "+Lgh89e9o9o5yzygwDg84sn/HCqzFNyJXoRyKBVxKkc="; }; - patches = [ - # Fix build with separate sysprof. - # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2572 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch"; - sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU="; - }) - - # Fix focus regression. - # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2848 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/12ce58dba4f96f6a948c1d166646d263253e3ee0.patch"; - sha256 = "CGu11aLFs8VEt8NiIkih+cXZzU82oxY6Ko9QRKOkM98="; - }) - ]; - mesonFlags = [ "-Degl_device=true" "-Dinstalled_tests=false" # TODO: enable these @@ -105,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { xvfb-run pkg-config python3 - wrapGAppsHook + wrapGAppsHook4 gi-docgen xorgserver ]; @@ -118,7 +106,11 @@ stdenv.mkDerivation (finalAttrs: { gnome-settings-daemon gobject-introspection gsettings-desktop-schemas + atk gtk3 + gtk4 + fribidi + harfbuzz libcanberra libdrm libgudev @@ -127,6 +119,7 @@ stdenv.mkDerivation (finalAttrs: { libwacom libxkbcommon libxkbfile + libICE libXdamage colord lcms2 @@ -150,7 +143,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-11/doc" "$devdoc" + moveToOutput "share/mutter-12/doc" "$devdoc" ''; # Install udev files into our own tree. @@ -159,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: { separateDebugInfo = true; passthru = { - libdir = "${finalAttrs.finalPackage}/lib/mutter-11"; + libdir = "${finalAttrs.finalPackage}/lib/mutter-12"; tests = { libdirExists = runCommand "mutter-libdir-exists" {} '' -- cgit 1.4.1 From 3cf1ccdca4baace2ac6953b0f27f5d8c6eb880f7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:02:25 +0000 Subject: gnome.gnome-shell: 43.3 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/43.3...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 86a63876c67..dd7b00b0414 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -67,13 +67,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "43.3"; + version = "44.beta"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Sf+NBfVfpPHCLwXQOFhSzrQpprY4DBuoRh5ipG1MBx4="; + sha256 = "JACs9fFjtpoHtWB7VieWYHWHOx9ITVVLpugBa9VfCEY="; }; patches = [ -- cgit 1.4.1 From f1e3ab20d9e4914f9b3e929aab664eccbc04a40d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:02:26 +0000 Subject: gnome.gnome-shell-extensions: 43.1 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/compare/43.1...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index b7f8a0ac83a..a443198667b 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 rec { pname = "gnome-shell-extensions"; - version = "43.1"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "rd4EvZRqExE1V+TDTIkLvpB3UFpqPwdV8XvqHG5KLRc="; + sha256 = "NsLCXgJsZCMGpYZdwwNHJ3m8OczQDwhx/m+HNEy5emU="; }; patches = [ -- cgit 1.4.1 From 17754118a95c869623d724201eccc31cb7a40758 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:02:28 +0000 Subject: gnome.gnome-software: 43.4 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-software/-/compare/43.4...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-software/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index 591bd397c0a..c97944faecf 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "43.4"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "6d8GDrq1n0lpfV7yYw7DbeYEVBadwZGvYNNINyCq2z4="; + sha256 = "BU/c1Oj6ikf3D81U2q3SZnDgqko7IzyFFMCyA7qdopc="; }; patches = [ -- cgit 1.4.1 From fdf5e4bc837e614d3f655e4d243fcd0a0df2e0ea Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:02:31 +0000 Subject: gnome.gnome-sudoku: 43.1 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-sudoku/-/compare/43.1...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/games/gnome-sudoku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index 9018df07e9c..a3222daf63d 100644 --- a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "43.1"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "we6/QJPzNrSJ+5HHMO2mcdpo7vZeYZehKYqVRseImZ8="; + sha256 = "0peQtr/tH8GQvSBfTRGN8hWeGs2Uz0l8lvv0Yd2XEZQ="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 3c9c083309f6f0a3770cfcf8ba45f362bb8721db Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:02:33 +0000 Subject: gnome.gnome-system-monitor: 42.0 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/compare/42.0...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-system-monitor/default.nix | 4 ++-- .../gnome/core/gnome-system-monitor/fix-paths.patch | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix index cbce4ad8b05..34998812363 100644 --- a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-system-monitor"; - version = "42.0"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "EyOdIgMiAaIr0pgzxXW2hIFnANLeFooVMCI1d8XAddw="; + sha256 = "Egfvkub0i3xayAddrZlqML0YW1Ub2EuIJy6jnUDWD/I="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-system-monitor/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-system-monitor/fix-paths.patch index ab6e845ae4b..967ef5e1554 100644 --- a/pkgs/desktops/gnome/core/gnome-system-monitor/fix-paths.patch +++ b/pkgs/desktops/gnome/core/gnome-system-monitor/fix-paths.patch @@ -1,13 +1,12 @@ diff --git a/src/gsm_pkexec.cpp b/src/gsm_pkexec.cpp -index 868969ba..51eb93b5 100644 +index 5e1edf2f..717d7bf1 100644 --- a/src/gsm_pkexec.cpp +++ b/src/gsm_pkexec.cpp -@@ -33,6 +33,7 @@ gboolean gsm_pkexec_create_root_password_dialog(const char *command) +@@ -36,5 +36,6 @@ gsm_pkexec_create_root_password_dialog (const char *command) gboolean - procman_has_pkexec(void) + procman_has_pkexec (void) { -- return g_file_test("/usr/bin/pkexec", G_FILE_TEST_EXISTS); -+ return g_file_test("/run/wrappers/bin/pkexec", G_FILE_TEST_EXISTS) -+ || g_file_test("/usr/bin/pkexec", G_FILE_TEST_EXISTS); +- return g_file_test ("/usr/bin/pkexec", G_FILE_TEST_EXISTS); ++ return g_file_test ("/run/wrappers/bin/pkexec", G_FILE_TEST_EXISTS) ++ || g_file_test ("/usr/bin/pkexec", G_FILE_TEST_EXISTS); } - -- cgit 1.4.1 From a47b88d7663e96c4a7af3713dd3d391210ca10f6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:02:40 +0000 Subject: gnome.gnome-weather: 43.0 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-weather/-/compare/43.0...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-weather/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/pkgs/desktops/gnome/apps/gnome-weather/default.nix index 1e7860a6978..61402884c22 100644 --- a/pkgs/desktops/gnome/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "43.0"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "LxERf3VVK/G7ngHwHPs8L82mo/aQcP/gUZoHYVMrjyY="; + sha256 = "6qX73OBhDPTXSBjd1j83yGcMhGR4rJuZVB2Xkw79S9Y="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 37412b864630a871dd374153ac5d1e5f6e648a6a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:02:47 +0000 Subject: gnome.nautilus: 43.2 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/nautilus/-/compare/43.2...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/nautilus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 5addc8311c9..68da9a822b7 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -38,13 +38,13 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "43.2"; + version = "44.beta"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "qGqap6RVURsCnOSaHYtGWcPDVbXYHXNgu00N5jev7eA="; + sha256 = "TEFVqfkyLjXuzUTPW1Ja/WSFlpmHb5VJELuW0bvKXlw="; }; patches = [ -- cgit 1.4.1 From 91847b3c94ea05d7d6d691066dc6ae549b2f17f5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:03:03 +0000 Subject: gnome-console: 43.0 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/console/-/compare/43.0...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/applications/terminal-emulators/gnome-console/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix index 95c4f0f7154..698cb3e225c 100644 --- a/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gnome-console"; - version = "43.0"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "uWQkhaN6cOgswQVTsOJoF1a6Nh/15MvzGC8VAjH+qZ4="; + sha256 = "kmM/Mfk2+kvBjib8JQd4MOEpYvty7dXB+nX1/oNLku4="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 7f0f298f4f48d0e0b0b0a69a1a6252c02e763360 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:03:04 +0000 Subject: gnome.zenity: 3.44.0 → 3.90.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/zenity/-/compare/3.44.0...3.90.0 Co-authored-by: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/zenity/default.nix | 20 ++++++++------------ .../gnome/core/zenity/fix-icon-install.patch | 12 ------------ 2 files changed, 8 insertions(+), 24 deletions(-) delete mode 100644 pkgs/desktops/gnome/core/zenity/fix-icon-install.patch diff --git a/pkgs/desktops/gnome/core/zenity/default.nix b/pkgs/desktops/gnome/core/zenity/default.nix index f5eb4c5e80d..8539b21b354 100644 --- a/pkgs/desktops/gnome/core/zenity/default.nix +++ b/pkgs/desktops/gnome/core/zenity/default.nix @@ -6,26 +6,22 @@ , pkg-config , libxml2 , gnome -, gtk3 +, gtk4 , gettext -, libX11 +, libadwaita , itstool -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "zenity"; - version = "3.44.0"; + version = "3.90.0"; src = fetchurl { url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "wVWCMB7ZC51CzlIdvM+ZqYnyLxIEG91SecZjbamev2U="; + sha256 = "XsvlcxBVqYfiDB+vBQdfECLd4wenLp0UUiRA1IHWhtA="; }; - patches = [ - ./fix-icon-install.patch - ]; - nativeBuildInputs = [ meson ninja @@ -33,12 +29,12 @@ stdenv.mkDerivation rec { gettext itstool libxml2 - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ - gtk3 - libX11 + gtk4 + libadwaita ]; passthru = { diff --git a/pkgs/desktops/gnome/core/zenity/fix-icon-install.patch b/pkgs/desktops/gnome/core/zenity/fix-icon-install.patch deleted file mode 100644 index d412cc4a5bf..00000000000 --- a/pkgs/desktops/gnome/core/zenity/fix-icon-install.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/data/meson.build b/data/meson.build -index 339b3cff..aca65efd 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -9,5 +9,6 @@ install_data( - 'zenity-text.png', - 'zenity-scale.png', - 'zenity-entry.png', -- 'zenity-notification.png'] -+ 'zenity-notification.png'], -+ install_dir: zenity_prefix / get_option('datadir') / 'icons/hicolor/48x48/apps', - ) -- cgit 1.4.1 From ffa5d0597f1f8b248629ac9c5bd5944dafbc552e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:03:08 +0000 Subject: gnome-connections: 43.0 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/connections/-/compare/43.0...44.beta Changelog-Reviewed-By: Jan Tojnar Co-authored-by: Bobby Rong --- pkgs/desktops/gnome/apps/gnome-connections/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-connections/default.nix b/pkgs/desktops/gnome/apps/gnome-connections/default.nix index 6fc3519e5e5..e95b99e66a2 100644 --- a/pkgs/desktops/gnome/apps/gnome-connections/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-connections/default.nix @@ -7,7 +7,6 @@ , vala , gettext , itstool -, python3 , appstream-glib , desktop-file-utils , wrapGAppsHook @@ -23,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-connections"; - version = "43.0"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-hdrYL5PAsvYJ/o7H7N7scGAKVWEq/A4/AndMJaC7MJ8="; + hash = "sha256-qK2JDgbg7PJclBcrsGr/1fX8bFPKr9GeJPh7wem02sw="; }; nativeBuildInputs = [ @@ -37,7 +36,6 @@ stdenv.mkDerivation rec { vala gettext itstool - python3 appstream-glib desktop-file-utils glib # glib-compile-resources @@ -54,11 +52,6 @@ stdenv.mkDerivation rec { gtk-frdp ]; - postPatch = '' - chmod +x build-aux/meson/postinstall.py - patchShebangs build-aux/meson/postinstall.py - ''; - passthru = { updateScript = gnome.updateScript { packageName = pname; -- cgit 1.4.1 From a67dd08a66d7c4fe18652c52048a1e621cb6f677 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:03:12 +0000 Subject: gnome-builder: 43.6 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-builder/-/compare/43.6...44.beta Co-authored-by: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- pkgs/applications/editors/gnome-builder/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index d04e2507c91..d77c41706f7 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -18,6 +18,7 @@ , json-glib , jsonrpc-glib , libadwaita +, libdex , libpanel , libpeas , libportal-gtk4 @@ -41,13 +42,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "43.6"; + version = "44.beta"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "m08hPdloyVL75CJoUPXJVk3f1XimoPiT06K2rhmjd6k="; + sha256 = "74fv2E600Arm015dKXQbgaZkeIENhH8U3z4SCaLg7rc="; }; patches = [ @@ -92,6 +93,7 @@ stdenv.mkDerivation rec { json-glib jsonrpc-glib libadwaita + libdex libpanel libxml2 ostree -- cgit 1.4.1 From a22bd5f0d4f09a7cbbc21a78f3e687905f4fd768 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:03:17 +0000 Subject: gnome-text-editor: 43.2 → 44.beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-text-editor/-/compare/43.2...44.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-text-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix index ff2141030fa..790bfbad278 100644 --- a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-text-editor"; - version = "43.2"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-MwRcehI/qife5+ubqabybxsXGMWg52M30Hmg1MkA4UY="; + sha256 = "sha256-wMU9+fR/cV5VPZgUyVo/9RyhMOcKjSgJInAtpjy7kGM="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 32bf3e9f99bac446cb64d3a0b7d993e24bfbd93d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 25 Feb 2023 12:25:44 +0800 Subject: gtk-frdp: unstable-2022-04-11 → unstable-2023-02-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk-frdp/-/compare/d7f408fb23adc01db14c708b35b74a317418de4b...f506b8a3e55a1bb4cab39c68c7c0c34629c78633 API version is bumped to 0.2, this is now needed by gnome-connections. Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gtk-frdp/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/development/libraries/gtk-frdp/default.nix index 450fdc6024d..6b6be945535 100644 --- a/pkgs/development/libraries/gtk-frdp/default.nix +++ b/pkgs/development/libraries/gtk-frdp/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "gtk-frdp"; - version = "unstable-2022-04-11"; + version = "unstable-2023-02-11"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = "d7f408fb23adc01db14c708b35b74a317418de4b"; - sha256 = "EyReJX3f7G5+EEB/gbLTnrxdltedbzm7Bg02hCb+XO0="; + rev = "f506b8a3e55a1bb4cab39c68c7c0c34629c78633"; + sha256 = "QHWhskJFbNkM+sLOE10NnBUhDRX9flz7aulJxGzSjWw="; }; nativeBuildInputs = [ @@ -39,9 +39,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = unstableGitUpdater { - branch = "gtk-frdp-0-1"; - }; + updateScript = unstableGitUpdater { }; }; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ -- cgit 1.4.1 From 971dd3a75265b617cf04d0789605ffb4c87a0db5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 25 Feb 2023 05:45:08 +0000 Subject: evolution-data-server: 3.46.4 → 3.47.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.46.4...3.47.2 Changelog-Reviewed-By: Jan Tojnar --- .../gnome/core/evolution-data-server/default.nix | 4 +-- .../evolution-data-server/hardcode-gsettings.patch | 30 +++++++++++----------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index f5ea57f1f80..dafbb4f6cd9 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -50,13 +50,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.46.4"; + version = "3.47.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "pZslQUXFn6zXx7U4LbeNxfDtH2pum4/n1edZWfk8DMg="; + sha256 = "VRRMHzPmUD5BMKAd3Ysot1uvmj6Xab4OJ1Yd/sy830Y="; }; patches = [ 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 c0cfade44b4..fd97a457cbd 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 7888e69..27215e4 100644 +index bd479d8..bd049b3 100644 --- a/src/addressbook/libebook/e-book-client.c +++ b/src/addressbook/libebook/e-book-client.c -@@ -1983,7 +1983,18 @@ e_book_client_get_self (ESourceRegistry *registry, +@@ -1997,7 +1997,18 @@ e_book_client_get_self (ESourceRegistry *registry, *out_client = book_client; @@ -22,7 +22,7 @@ index 7888e69..27215e4 100644 uid = g_settings_get_string (settings, SELF_UID_KEY); g_object_unref (settings); -@@ -2051,7 +2062,18 @@ e_book_client_set_self (EBookClient *client, +@@ -2065,7 +2076,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 7888e69..27215e4 100644 g_settings_set_string ( settings, SELF_UID_KEY, e_contact_get_const (contact, E_CONTACT_UID)); -@@ -2087,8 +2109,18 @@ e_book_client_is_self (EContact *contact) +@@ -2101,8 +2123,18 @@ e_book_client_is_self (EContact *contact) * unfortunately the API doesn't allow that. */ g_mutex_lock (&mutex); @@ -64,7 +64,7 @@ index 7888e69..27215e4 100644 g_mutex_unlock (&mutex); diff --git a/src/addressbook/libebook/e-book.c b/src/addressbook/libebook/e-book.c -index 8dfff6d..fb4434b 100644 +index e85a56b..59d3fe2 100644 --- a/src/addressbook/libebook/e-book.c +++ b/src/addressbook/libebook/e-book.c @@ -2587,7 +2587,18 @@ e_book_get_self (ESourceRegistry *registry, @@ -128,10 +128,10 @@ index 8dfff6d..fb4434b 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 d3f130e..bc820e9 100644 +index 127dcd1..5fa62f6 100644 --- a/src/addressbook/libedata-book/e-book-meta-backend.c +++ b/src/addressbook/libedata-book/e-book-meta-backend.c -@@ -135,7 +135,18 @@ ebmb_is_power_saver_enabled (void) +@@ -136,7 +136,18 @@ ebmb_is_power_saver_enabled (void) GSettings *settings; gboolean enabled = FALSE; @@ -298,10 +298,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 28755e2..da8c40c 100644 +index 95918a0..a7fc669 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c -@@ -5593,7 +5593,18 @@ camel_imapx_server_skip_old_flags_update (CamelStore *store) +@@ -5591,7 +5591,18 @@ camel_imapx_server_skip_old_flags_update (CamelStore *store) if (!skip_old_flags_update) { GSettings *eds_settings; @@ -322,10 +322,10 @@ index 28755e2..da8c40c 100644 if (g_settings_get_boolean (eds_settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; diff --git a/src/camel/providers/smtp/camel-smtp-transport.c b/src/camel/providers/smtp/camel-smtp-transport.c -index f535ad6..918975d 100644 +index effaf06..1b2a003 100644 --- a/src/camel/providers/smtp/camel-smtp-transport.c +++ b/src/camel/providers/smtp/camel-smtp-transport.c -@@ -1458,7 +1458,18 @@ smtp_helo (CamelSmtpTransport *transport, +@@ -1462,7 +1462,18 @@ smtp_helo (CamelSmtpTransport *transport, transport->authtypes = NULL; } @@ -370,7 +370,7 @@ 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 f215388..501222e 100644 +index ec08afe..7b31227 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, @@ -394,7 +394,7 @@ index f215388..501222e 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service-outlook.c b/src/libedataserver/e-oauth2-service-outlook.c -index 9cff0d0..4c9a203 100644 +index 7633e93..2328048 100644 --- a/src/libedataserver/e-oauth2-service-outlook.c +++ b/src/libedataserver/e-oauth2-service-outlook.c @@ -71,7 +71,18 @@ eos_outlook_read_settings (EOAuth2Service *service, @@ -418,7 +418,7 @@ index 9cff0d0..4c9a203 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service-yahoo.c b/src/libedataserver/e-oauth2-service-yahoo.c -index 8e4ee81..cc94026 100644 +index 3bb1071..199e822 100644 --- a/src/libedataserver/e-oauth2-service-yahoo.c +++ b/src/libedataserver/e-oauth2-service-yahoo.c @@ -67,7 +67,18 @@ eos_yahoo_read_settings (EOAuth2Service *service, @@ -442,7 +442,7 @@ index 8e4ee81..cc94026 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c -index b0c2410..ca915e0 100644 +index 7eca355..795d822 100644 --- a/src/libedataserver/e-oauth2-service.c +++ b/src/libedataserver/e-oauth2-service.c @@ -94,7 +94,18 @@ eos_default_guess_can_process (EOAuth2Service *service, -- cgit 1.4.1 From ee55ba505ddb82bb28a7e1c6ea17104bc3eeaabe Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 25 Feb 2023 19:40:03 +0800 Subject: webkitgtk: 2.38.5 → 2.39.90 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://webkitgtk.org/2022/11/11/webkitgtk2.39.1-released.html https://webkitgtk.org/2022/11/28/webkitgtk2.39.2-released.html https://webkitgtk.org/2022/12/14/webkitgtk2.39.3-released.html https://webkitgtk.org/2023/01/16/webkitgtk2.39.4-released.html https://webkitgtk.org/2023/01/19/webkitgtk2.39.5-released.html https://webkitgtk.org/2023/01/30/webkitgtk2.39.6-released.html https://webkitgtk.org/2023/01/31/webkitgtk2.39.7-released.html https://webkitgtk.org/2023/02/20/webkitgtk2.39.90-released.html Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/webkitgtk/default.nix | 28 ++++++++++++++++++---- .../libraries/webkitgtk/fdo-backend-path.patch | 6 ++--- .../libraries/webkitgtk/libglvnd-headers.patch | 12 ---------- 3 files changed, 26 insertions(+), 20 deletions(-) delete mode 100644 pkgs/development/libraries/webkitgtk/libglvnd-headers.patch diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 73073a6b711..4ab35fc9d4b 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -2,6 +2,7 @@ , stdenv , runCommand , fetchurl +, fetchpatch , perl , python3 , ruby @@ -25,6 +26,7 @@ , enchant2 , xorg , libxkbcommon +, libavif , libepoxy , at-spi2-core , libxml2 @@ -60,6 +62,7 @@ , xdg-dbus-proxy , substituteAll , glib +, unifdef , addOpenGLRunpath , enableGeoLocation ? true , withLibsecret ? true @@ -69,8 +72,8 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.38.5"; - name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "5.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; + version = "2.39.90"; + name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -80,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-QMIMQwIidN9Yk/IrEFT6iUw+6gVzibsIruCMWwuwwac="; + hash = "sha256-gnWGbDUppxXCPK442/Lt0xDYGIVGpHxaL3CdGT96X8A="; }; patches = lib.optionals stdenv.isLinux [ @@ -90,14 +93,27 @@ stdenv.mkDerivation (finalAttrs: { inherit (addOpenGLRunpath) driverLink; }) - ./libglvnd-headers.patch - # Hardcode path to WPE backend # https://github.com/NixOS/nixpkgs/issues/110468 (substituteAll { src = ./fdo-backend-path.patch; wpebackend_fdo = libwpe-fdo; }) + + # Various build fixes for 2.39.90, should be part of final release + # https://github.com/NixOS/nixpkgs/pull/218143#issuecomment-1445126808 + (fetchpatch { + url = "https://github.com/WebKit/WebKit/commit/5f8dc9d4cc01a31e53670acdcf7a9c4ea4626f58.patch"; + hash = "sha256-dTok1QK93Fp8RFED4wgbVdLErUnmIB4Xsm/VPutmQuw="; + }) + (fetchpatch { + url = "https://github.com/WebKit/WebKit/commit/f51987a0f316621a0ab324696c9a576bbaf1e686.patch"; + hash = "sha256-TZVrrH4+JS2I/ist7MdMLsuk9X/Nyx62AcODvzGkdx8="; + }) + (fetchpatch { + url = "https://github.com/WebKit/WebKit/commit/fe4fdc28cd214d36425d861791d05d1afaee60f5.patch"; + hash = "sha256-p1LNyvc6kGRhptov6AKVl2Rc+rrRnzHEtpF/AhqbA+E="; + }) ]; preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' @@ -122,6 +138,7 @@ stdenv.mkDerivation (finalAttrs: { ruby gi-docgen glib # for gdbus-codegen + unifdef ] ++ lib.optionals stdenv.isLinux [ wayland # for wayland-scanner ]; @@ -129,6 +146,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ at-spi2-core enchant2 + libavif libepoxy gnutls gst-plugins-bad diff --git a/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch b/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch index 9ddef67f1c1..f46c0fe8a15 100644 --- a/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch +++ b/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch @@ -1,11 +1,11 @@ --- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp +++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp -@@ -89,7 +89,7 @@ +@@ -84,7 +84,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process + #if PLATFORM(WAYLAND) if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::Wayland) { - #if USE(WPE_RENDERER) - wpe_loader_init("libWPEBackend-fdo-1.0.so.1"); + wpe_loader_init("@wpebackend_fdo@/lib/libWPEBackend-fdo-1.0.so.1"); if (AcceleratedBackingStoreWayland::checkRequirements()) { - parameters.hostClientFileDescriptor = IPC::Attachment(UnixFileDescriptor(wpe_renderer_host_create_client(), UnixFileDescriptor::Adopt)); + parameters.hostClientFileDescriptor = UnixFileDescriptor { wpe_renderer_host_create_client(), UnixFileDescriptor::Adopt }; parameters.implementationLibraryName = FileSystem::fileSystemRepresentation(String::fromLatin1(wpe_loader_get_loaded_implementation_library_name())); diff --git a/pkgs/development/libraries/webkitgtk/libglvnd-headers.patch b/pkgs/development/libraries/webkitgtk/libglvnd-headers.patch deleted file mode 100644 index 8d7f2477b55..00000000000 --- a/pkgs/development/libraries/webkitgtk/libglvnd-headers.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp b/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp -index 8d848ce4..46d42c11 100644 ---- a/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp -+++ b/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp -@@ -31,6 +31,7 @@ - #include "WebKitWaylandServerProtocol.h" - #include - #include -+#include - #include - #include - #include -- cgit 1.4.1 From 0f4129cc5a17989e84fc0af8c01091a4524df258 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 25 Feb 2023 20:08:54 +0800 Subject: webkitgtk_6_0: init, webkitgtk_5_0: drop GTK 4 API version is bumped to 6.0. i.e. we now only have webkitgtk-6.0, and no more webkit2gtk-5.0. --- pkgs/applications/editors/gnome-builder/default.nix | 4 ++-- pkgs/applications/graphics/komikku/default.nix | 4 ++-- pkgs/applications/networking/instant-messengers/tangram/default.nix | 4 ++-- pkgs/applications/office/iotas/default.nix | 4 ++-- pkgs/desktops/gnome/core/evolution-data-server/default.nix | 4 ++-- pkgs/desktops/gnome/core/gnome-initial-setup/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ++-- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index d77c41706f7..7579b486636 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -34,7 +34,7 @@ , template-glib , vala , vte-gtk4 -, webkitgtk_5_0 +, webkitgtk_6_0 , wrapGAppsHook4 , dbus , xvfb-run @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { sysprof template-glib vala - webkitgtk_5_0 + webkitgtk_6_0 ]; nativeCheckInputs = [ diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index 2e9847ca44f..474d43258c2 100644 --- a/pkgs/applications/graphics/komikku/default.nix +++ b/pkgs/applications/graphics/komikku/default.nix @@ -7,7 +7,7 @@ , gtk4 , libadwaita , libnotify -, webkitgtk_5_0 +, webkitgtk_6_0 , meson , ninja , pkg-config @@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec { gtk4 libadwaita libnotify - webkitgtk_5_0 + webkitgtk_6_0 gobject-introspection ]; diff --git a/pkgs/applications/networking/instant-messengers/tangram/default.nix b/pkgs/applications/networking/instant-messengers/tangram/default.nix index 6f9b7269bf9..30727553248 100644 --- a/pkgs/applications/networking/instant-messengers/tangram/default.nix +++ b/pkgs/applications/networking/instant-messengers/tangram/default.nix @@ -18,7 +18,7 @@ , ninja , pkg-config , python3 -, webkitgtk_5_0 +, webkitgtk_6_0 , blueprint-compiler , wrapGAppsHook }: @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk4 libadwaita - webkitgtk_5_0 + webkitgtk_6_0 ] ++ (with gst_all_1; [ gstreamer gst-libav diff --git a/pkgs/applications/office/iotas/default.nix b/pkgs/applications/office/iotas/default.nix index 0ec2939fa47..532880f9e7b 100644 --- a/pkgs/applications/office/iotas/default.nix +++ b/pkgs/applications/office/iotas/default.nix @@ -14,7 +14,7 @@ , libsecret , libadwaita , gtksourceview5 -, webkitgtk_5_0 +, webkitgtk_6_0 }: python3.pkgs.buildPythonApplication rec { @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec { libsecret libadwaita gtksourceview5 - webkitgtk_5_0 + webkitgtk_6_0 ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index dafbb4f6cd9..20c2256d012 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -31,7 +31,7 @@ , openldap , enableOAuth2 ? stdenv.isLinux , webkitgtk_4_1 -, webkitgtk_5_0 +, webkitgtk_6_0 , libaccounts-glib , json-glib , glib @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withGtk4 [ gtk4 ] ++ lib.optionals (withGtk4 && enableOAuth2) [ - webkitgtk_5_0 + webkitgtk_6_0 ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index 48a4ef4462d..3f831f1f9ef 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -27,7 +27,7 @@ , networkmanager , pango , polkit -, webkitgtk_5_0 +, webkitgtk_6_0 , systemd , libadwaita , libnma-gtk4 @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { networkmanager pango polkit - webkitgtk_5_0 + webkitgtk_6_0 ]; mesonFlags = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2f61cd10a6a..60f53a8edbe 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1685,6 +1685,7 @@ mapAliases ({ way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # Added 2020-01-13 webbrowser = throw "webbrowser was removed because it's unmaintained upstream and was marked as broken in nixpkgs for over a year"; # Added 2022-03-21 webkit = throw "'webkit' has been renamed to/replaced by 'webkitgtk'"; # Converted to throw 2022-02-22 + webkitgtk_5_0 = throw "'webkitgtk_5_0' has been superseded by 'webkitgtk_6_0'"; # Added 2023-02-25 weechat-matrix-bridge = throw "'weechat-matrix-bridge' has been renamed to/replaced by 'weechatScripts.weechat-matrix-bridge'"; # Converted to throw 2022-02-22 weighttp = throw "weighttp has been removed: abandoned by upstream"; # Added 2022-04-20 whirlpool-gui = throw "whirlpool-gui has been removed as it depended on an insecure version of Electron"; # added 2022-02-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94b0ae916ca..c6b2a1622c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24080,7 +24080,7 @@ with pkgs; libsoup = libsoup_3; }; - webkitgtk_5_0 = webkitgtk.override { + webkitgtk_6_0 = webkitgtk.override { libsoup = libsoup_3; gtk3 = gtk4; }; @@ -32232,7 +32232,7 @@ with pkgs; netmaker-full = callPackage ../applications/networking/netmaker { }; newsflash = callPackage ../applications/networking/feedreaders/newsflash { - webkitgtk = webkitgtk_5_0; + webkitgtk = webkitgtk_6_0; }; nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { }; -- cgit 1.4.1 From f1e4f33ad8a9df07b5870e9d4e07f46c4cd50ac0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 25 Feb 2023 20:52:58 +0800 Subject: libdex: init at 0.1.0 https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/17f35418d26d0b1a6077bd38fcbbd3961085cd43 https://gitlab.gnome.org/GNOME/libdex Co-authored-by: Jan Tojnar --- pkgs/development/libraries/libdex/default.nix | 63 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/development/libraries/libdex/default.nix diff --git a/pkgs/development/libraries/libdex/default.nix b/pkgs/development/libraries/libdex/default.nix new file mode 100644 index 00000000000..90597f4076c --- /dev/null +++ b/pkgs/development/libraries/libdex/default.nix @@ -0,0 +1,63 @@ +{ stdenv +, lib +, fetchFromGitLab +, gi-docgen +, gobject-introspection +, meson +, ninja +, pkg-config +, vala +, glib +, liburing +, gitUpdater +}: + +stdenv.mkDerivation rec { + pname = "libdex"; + version = "0.1.0"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "libdex"; + rev = version; + sha256 = "1SluktcmEf1CirYronhan8xmgY227hfnKE4VTPa9ICw="; + }; + + nativeBuildInputs = [ + gi-docgen + gobject-introspection + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + glib + liburing + ]; + + mesonFlags = [ + "-Ddocs=true" + ]; + + doCheck = true; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "Library supporting deferred execution for GNOME and GTK"; + homepage = "https://gitlab.gnome.org/GNOME/libdex"; + maintainers = teams.gnome.members; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6b2a1622c6..14c97e9c69e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21223,6 +21223,8 @@ with pkgs; libdecor = callPackage ../development/libraries/libdecor { }; + libdex = callPackage ../development/libraries/libdex { }; + libdigidocpp = callPackage ../development/libraries/libdigidocpp { }; libdiscid = callPackage ../development/libraries/libdiscid { }; -- cgit 1.4.1 From 4a8fff88fc0a5651f346762c2e1993f21d388572 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 1 Mar 2023 16:57:56 +0000 Subject: gnome-online-accounts: 3.46.0 → 3.47.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/compare/3.46.0...3.47.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gnome-online-accounts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 2028e3eaef6..4486182fb14 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { pname = "gnome-online-accounts"; - version = "3.46.0"; + version = "3.47.1"; outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "gnome-online-accounts"; rev = version; - sha256 = "sha256-qVd55fmhY05zJ871OWc3hd1eWjYbYJuxlE/T2i3VCUA="; + sha256 = "sha256-UKw6dV7pbck1zx4ChuFrL6yv1nh7bv1fJghyqdtDJIg="; }; mesonFlags = [ -- cgit 1.4.1 From 3b9d20a5116b7d37581c4baedc6b160863484b18 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Mar 2023 09:11:30 +0000 Subject: epiphany: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/epiphany/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/epiphany/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index bd14b3c4a05..3e77e77e67c 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -31,26 +31,18 @@ , libadwaita , buildPackages , withPantheon ? false +, pantheon }: stdenv.mkDerivation rec { pname = "epiphany"; - version = "44.beta"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "UccRkzgLjdoM7opWyLROzZLDi8fDStCGkP0rbXggApE="; + sha256 = "33X7U1yAQbzvhNZSWGfVEjw58MaIUDxGBhTNs3Tp+Sk="; }; - patches = [ - # Fix compatibility with latest WebKitGTK - # https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1281 - (fetchurl { - url = "https://src.fedoraproject.org/rpms/epiphany/raw/a8965d48efad1cbd41f67f1468d6d10e4407cd57/f/webkitgtk-2.39.90.patch"; - hash = "sha256-07eoyWL/z5MgbU+tlq5CJ8CdR+90qHM8EJPJIQ/5Y0M="; - }) - ]; - nativeBuildInputs = [ desktop-file-utils gettext @@ -89,11 +81,15 @@ stdenv.mkDerivation rec { p11-kit sqlite webkitgtk_6_0 + ] ++ lib.optionals withPantheon [ + pantheon.granite7 ]; # Tests need an X display mesonFlags = [ "-Dunit_tests=disabled" + ] ++ lib.optionals (!withPantheon) [ + "-Dgranite=disabled" ]; passthru = { -- cgit 1.4.1 From 48d92a5e9a47c1e392b4f6248944dbe95e0b6bea Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Mar 2023 09:11:36 +0000 Subject: evolution: 3.47.2 → 3.47.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution/-/compare/3.47.2...3.47.3 Changelog-Reviewed-By: Jan Tojnar --- .../networking/mailreaders/evolution/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index e06e521e340..e5c1f2b3992 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.47.2"; + version = "3.47.3"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "7xSv13D5e1U0AVgxjccbgGwOPfIA/mvZhULSQ+FONdU="; + sha256 = "71o5LATDDW6UwMlwx1QDd1ABbuNsefb+nGhpsGugqDM="; }; nativeBuildInputs = [ -- cgit 1.4.1 From ceeb9f39db4030a500a6855ba6c6e1395d4864c6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Mar 2023 09:11:40 +0000 Subject: glib: 2.75.3 → 2.75.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib/-/compare/2.75.3...2.75.4 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/glib/default.nix | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 2b97ddca0df..acd67bb136a 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -3,6 +3,7 @@ , stdenv , fetchurl , fetchpatch2 +, fetchpatch , gettext , meson , ninja @@ -56,11 +57,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.75.3"; + version = "2.75.4"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - sha256 = "fFF9Cv9FbDWgObzoqN96CM6VqChbCdGEn4hl9jP3+HE="; + sha256 = "Fs4ku488DqO9vak3wJC5O7i1rS1Bfl5eQsFKpM9ratE="; }; patches = lib.optionals stdenv.isDarwin [ @@ -109,6 +110,27 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.gnome.org/GNOME/glib/-/commit/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch"; hash = "sha256-8y+rl17buxazMK9Oj28CasC9AyRwt700knyCL1jDIJ0="; }) + + # Fix copying files on btrfs. + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3309 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/406143b072ec92c2810f93441f037793215b04d9.patch"; + hash = "sha256-s2OZZWNgf+gp9TwhLR2nOL9OgV9jUyBrJN8FR8zcE1I="; + }) + + # Fix GJS tests. + # https://gitlab.gnome.org/GNOME/glib/-/issues/2932 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/4e62e55d6d0109012869a589eae2371e836e9cb3.patch"; + hash = "sha256-BadhneyDTINPMkNZ+Z/sqUtuHXipHE5gbXLki7dFmmA="; + }) + + # Fix g_file_info_get_is_backup. + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3311 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/448a163bee9906ba3937ea8cdb4a08afeb6f9dc3.patch"; + hash = "sha256-YXMcmY4RnV9wUkM6Lrcu8o71ir+k2p385rb52wogHQc="; + }) ]; outputs = [ "bin" "out" "dev" "devdoc" ]; -- cgit 1.4.1 From 7cd1411f4eaa625dd416d6bbfc826226461a5699 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Mar 2023 09:11:55 +0000 Subject: gnome.gnome-calculator: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calculator/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-calculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix index 70a338c64fb..418619434c1 100644 --- a/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "44.beta"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "XIS985nFY8DNQpjAf7hLfATrtW4ZZL+Zx6L90n2090A="; + sha256 = "cBEhMt0EBTm1xNnp2bl/FQZimkXUEZ4KSS/QqFwiFhg="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 805156c76d9b88b4622950882075c9c38824a5ef Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Mar 2023 09:12:02 +0000 Subject: gnome.gnome-initial-setup: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-initial-setup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index 3f831f1f9ef..d3432365ee2 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "44.beta"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "V6wpMsnNzzXMpaXYui6rsu3E/SgGUQwRpxxNazx8d5w="; + sha256 = "nYEwjr9B8dLLDbQV40Mmj5uU8IE7/YBTRS3fTJXn+wI="; }; patches = [ -- cgit 1.4.1 From 50c1ec94b677d33ad8ef3d438803f5ada2593985 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Mar 2023 09:12:03 +0000 Subject: gnome.gnome-disk-utility: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-disk-utility/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-disk-utility/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix index 7e378616457..ef97d6c6276 100644 --- a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "44.beta"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-kgHRXmsyvKjGS8clpXKHO9SdUebZH+iqUT2MZx9WyMY="; + sha256 = "sha256-f+Nis3x+yJvk8Ct7i3GAOUlhLH+q2HtlnZSdQLlov88="; }; nativeBuildInputs = [ -- cgit 1.4.1 From efbb92a582e83b322ea11db92bec2498bff57cd9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Mar 2023 09:12:08 +0000 Subject: gnome.gnome-maps: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-maps/-/compare/v44.beta...v44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index d5dd0d8b683..32327e22a98 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "44.beta"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-nk/8mxzJx1JzZl3cLAgYobcuPkMe18ZCPz7KVde/cwI="; + sha256 = "sha256-x7jYEv06wyabjciVnYTXecRocogVao7AvZzBN+mj+KU="; }; doCheck = true; -- cgit 1.4.1 From 129f2ff5de0af99218e24ad245917376b73d9b17 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Mar 2023 09:12:17 +0000 Subject: gnome.gnome-software: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-software/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-software/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index c97944faecf..783d57733df 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "44.beta"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "BU/c1Oj6ikf3D81U2q3SZnDgqko7IzyFFMCyA7qdopc="; + sha256 = "ErgEYOCoAi7+/+EfU0gzO0MZQVNxNIqrmTRye8SQrIY="; }; patches = [ -- cgit 1.4.1 From 9aae7ce5d43a7de45b5416a91fcdcc9c889b4ea8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Mar 2023 09:12:18 +0000 Subject: gnome.gnome-system-monitor: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-system-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix index 34998812363..b8d8d3dc055 100644 --- a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-system-monitor"; - version = "44.beta"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Egfvkub0i3xayAddrZlqML0YW1Ub2EuIJy6jnUDWD/I="; + sha256 = "CnNLR1DrphUnVJF9bxdH90BmPotGi69OqegJtRKyOCY="; }; patches = [ -- cgit 1.4.1 From 75221eafd291ae668a95b1671a8caffcf457fe0d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 8 Mar 2023 21:11:51 +0000 Subject: gtk-frdp: unstable-2023-02-11 → unstable-2023-03-03 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk-frdp/-/compare/f506b8a3e55a1bb4cab39c68c7c0c34629c78633...3f991a22c025cad3016a7aa55988e51884964050 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gtk-frdp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/development/libraries/gtk-frdp/default.nix index 6b6be945535..24f768a678a 100644 --- a/pkgs/development/libraries/gtk-frdp/default.nix +++ b/pkgs/development/libraries/gtk-frdp/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "gtk-frdp"; - version = "unstable-2023-02-11"; + version = "unstable-2023-03-03"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = "f506b8a3e55a1bb4cab39c68c7c0c34629c78633"; - sha256 = "QHWhskJFbNkM+sLOE10NnBUhDRX9flz7aulJxGzSjWw="; + rev = "3f991a22c025cad3016a7aa55988e51884964050"; + sha256 = "jzum4/iU1oSr5t/IrSOLFyZcj38VIL7ooIbfoJZhk+g="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 6d4256f849ae41f0ca50590fc76a31cc4be50737 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Mar 2023 09:12:51 +0000 Subject: gnome-connections: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/connections/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-connections/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-connections/default.nix b/pkgs/desktops/gnome/apps/gnome-connections/default.nix index e95b99e66a2..5fbbf6a8556 100644 --- a/pkgs/desktops/gnome/apps/gnome-connections/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-connections/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-connections"; - version = "44.beta"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-qK2JDgbg7PJclBcrsGr/1fX8bFPKr9GeJPh7wem02sw="; + hash = "sha256-fnUP9gP5SEbo7RyPczemWOhix4epzUI3b0Bf2utQtPM="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 4f5e2fa3c86b5622c5f739216dd73c7936917784 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Mar 2023 09:12:55 +0000 Subject: gnome-builder: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-builder/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/applications/editors/gnome-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 7579b486636..298c819e4f3 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "44.beta"; + version = "44.rc"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "74fv2E600Arm015dKXQbgaZkeIENhH8U3z4SCaLg7rc="; + sha256 = "ly52FVZjM2822adhWEZY4Nor1CbgfwVyycwA638ojb8="; }; patches = [ -- cgit 1.4.1 From 99edcdf872e624f61b3cd1ba3a3ecfece81577cd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Mar 2023 09:12:55 +0000 Subject: gnome-text-editor: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-text-editor/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-text-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix index 790bfbad278..c5917ad12d5 100644 --- a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-text-editor"; - version = "44.beta"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-wMU9+fR/cV5VPZgUyVo/9RyhMOcKjSgJInAtpjy7kGM="; + sha256 = "sha256-n1tx0nqFC0c6sjzv+SHafeEIOqKyBwPZtM8bvE8dO3s="; }; nativeBuildInputs = [ -- cgit 1.4.1 From ce0edfa17c2bee600fce941fe5cfb04570aad9e9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Mar 2023 09:13:13 +0000 Subject: gtksourceview5: 5.7.1 → 5.7.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtksourceview/-/compare/5.7.1...5.7.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gtksourceview/5.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index ee57285d2a4..c27733064e0 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; - version = "5.7.1"; + version = "5.7.2"; outputs = [ "out" "dev" "devdoc" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "O0JUGWTbnC+lCpZY1Ihr33fQI/5OlsWxe85RyfWMSOY="; + sha256 = "v5JfEp3z+Kh9cfXh7194uOqdKMUzNum4OviYhFWO3o4="; }; patches = [ -- cgit 1.4.1 From 68683ecaea44f4123c1abef78d7a0fd916550913 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Mar 2023 09:13:13 +0000 Subject: gtk3: 3.24.36 → 3.24.37 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk/-/compare/3.24.36...3.24.37 - Removes legacy Wayland text input module. Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gtk/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 5a1cc8ca9c5..33e4c446410 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk+3"; - version = "3.24.36"; + version = "3.24.37"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; outputBin = "dev"; @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) version; in fetchurl { url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "sha256-J6bvFXdDNQyAf/6lm6odcCJtvt6CpelT/9WOpgWf5pE="; + sha256 = "sha256-Z0XwtMBTeUFR/Q8OJHSwd8zP9fg+ndG/PTn+n+X7f1c="; }; patches = [ -- cgit 1.4.1 From 6267cbe792d498e8ef4f96fe18fc2445cc16d0ad Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Mar 2023 09:13:21 +0000 Subject: jsonrpc-glib: 3.42.0 → 3.43.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/jsonrpc-glib/-/compare/3.42.0...3.43.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/jsonrpc-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index fb828e5b571..174433db91a 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "jsonrpc-glib"; - version = "3.42.0"; + version = "3.43.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "IhmJpXyoKhJGfcQngizXZRsMrQOBQMkxAnvxB0IIJ2s="; + sha256 = "DySHRkeO9g/fL7JV99u+1FuHFQvyhV7AqGYQeRjexBM="; }; nativeBuildInputs = [ -- cgit 1.4.1 From f19f5d0a2745db63ebd6629ec34b5dd958a5836d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Mar 2023 09:13:36 +0000 Subject: libpanel: 1.1.1 → 1.1.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libpanel/-/compare/1.1.1...1.1.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libpanel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpanel/default.nix b/pkgs/development/libraries/libpanel/default.nix index 5d330d0ea3b..642e199fec0 100644 --- a/pkgs/development/libraries/libpanel/default.nix +++ b/pkgs/development/libraries/libpanel/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "libpanel"; - version = "1.1.1"; + version = "1.1.2"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/libpanel/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "qI+EEDhE1wLdzfl+vpshoGUvqwKf+CJ0LyJHHbZDCL4="; + sha256 = "H21VQlPiyOBnx4pwQM84lwyAHLpTWhGWrlmEPSJHSrk="; }; nativeBuildInputs = [ -- cgit 1.4.1 From bb07a5bced64886877aa01ba71b843679cc71ea8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Mar 2023 09:13:50 +0000 Subject: pango: 1.50.13 → 1.50.14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/pango/-/compare/1.50.13...1.50.14 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/pango/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index bedc4f5c747..a92f5f6d165 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "pango"; - version = "1.50.13"; + version = "1.50.14"; outputs = [ "bin" "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "XNz212HSaj65QStssGmzK9HZsHq/EWMhFn2UwhiSmf0="; + sha256 = "HWfyBb/DGMJ6Kc/ftoKFaN9WZ5XfDLUdIYnN5/LVgeg="; }; depsBuildBuild = [ -- cgit 1.4.1 From a00aece4e47c0666765f22e48b0dd48dfd16ff54 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Mar 2023 09:13:55 +0000 Subject: template-glib: 3.36.0 → 3.36.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/template-glib/-/compare/3.36.0...3.36.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/template-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix index bbb5aef36f1..fae25d959d3 100644 --- a/pkgs/development/libraries/template-glib/default.nix +++ b/pkgs/development/libraries/template-glib/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "template-glib"; - version = "3.36.0"; + version = "3.36.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HBKVJa5kQDpmL3Zm9jWDhqgVZohyrPEctWirObuh9CE="; + sha256 = "OxZ6Fzha10WvviD634EGxm0wxb10bVqh2b236AP2pQM="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 83d3c54e7baf9b3a66667bb45f956839d5ca7c4c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Mar 2023 11:41:20 +0100 Subject: gnome.hitori: 3.38.4 → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/hitori/-/compare/3.38.4...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/games/hitori/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome/games/hitori/default.nix b/pkgs/desktops/gnome/games/hitori/default.nix index 092735d55a1..e416a7f0343 100644 --- a/pkgs/desktops/gnome/games/hitori/default.nix +++ b/pkgs/desktops/gnome/games/hitori/default.nix @@ -16,13 +16,13 @@ , desktop-file-utils }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hitori"; - version = "3.38.4"; + version = "44.0"; src = fetchurl { - url = "mirror://gnome/sources/hitori/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "iZPMkfuSN4jjieA+wqp4dtFcErrZIEz2Wy/6DtOSL30="; + url = "mirror://gnome/sources/hitori/${lib.versions.major finalAttrs.version}/hitori-${finalAttrs.version}.tar.xz"; + sha256 = "QicL1PlSXRgNMVG9ckUzXcXPJIqYTgL2j/kw2nmeWDs="; }; nativeBuildInputs = [ @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "hitori"; + attrPath = "gnome.hitori"; }; }; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Hitori"; description = "GTK application to generate and let you play games of Hitori"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl3Plus; platforms = platforms.unix; }; -} +}) -- cgit 1.4.1 From da6fc4476a62603ac7dd086a71880f7028195aaa Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Mar 2023 10:49:36 +0000 Subject: evolution-data-server: 3.47.2 → 3.47.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.47.2...3.47.3 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/evolution-data-server/default.nix | 4 ++-- .../gnome/core/evolution-data-server/hardcode-gsettings.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 20c2256d012..aaf4e77ec8c 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -50,13 +50,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.47.2"; + version = "3.47.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "VRRMHzPmUD5BMKAd3Ysot1uvmj6Xab4OJ1Yd/sy830Y="; + sha256 = "q40nSW/I/0E0kzZrWQvgE7aT4288iL9Ic18VTNDy6Lo="; }; patches = [ 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 fd97a457cbd..fb52897b39e 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch @@ -176,10 +176,10 @@ index 42f3457..b4926af 100644 cbc->priv->update_alarms_id = 0; cbc->priv->alarm_enabled = FALSE; diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c -index 52095a4..184b657 100644 +index 0ad47a9..161c316 100644 --- a/src/calendar/libecal/e-reminder-watcher.c +++ b/src/calendar/libecal/e-reminder-watcher.c -@@ -2555,7 +2555,19 @@ e_reminder_watcher_init (EReminderWatcher *watcher) +@@ -2576,7 +2576,19 @@ e_reminder_watcher_init (EReminderWatcher *watcher) watcher->priv = e_reminder_watcher_get_instance_private (watcher); watcher->priv->cancellable = g_cancellable_new (); -- cgit 1.4.1 From 1d846ea9e51997eb3c8e9a3045989848a3cbee5d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 4 Mar 2023 18:50:49 +0800 Subject: gnome.gnome-terminal: Fix updateScript See https://gitlab.gnome.org/GNOME/gnome-terminal/-/blob/3.47.0/src/terminal-util.cc#L226-L230 --- pkgs/desktops/gnome/core/gnome-terminal/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix index 7ce5c4a67b8..2fc891b28fd 100644 --- a/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -8,7 +8,7 @@ , python3 , libxml2 , gnome -, nix-update-script +, gitUpdater , nautilus , glib , gtk4 @@ -91,7 +91,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { }; + updateScript = gitUpdater { + odd-unstable = true; + }; tests = { test = nixosTests.terminal-emulators.gnome-terminal; -- cgit 1.4.1 From bf1fbb4026627aa00f2c1c40b5b0b64e9db94417 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 4 Mar 2023 16:20:02 +0000 Subject: libdex: 0.1.0 → 0.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libdex/-/compare/0.1.0...0.1.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libdex/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libdex/default.nix b/pkgs/development/libraries/libdex/default.nix index 90597f4076c..5a27c2b0e21 100644 --- a/pkgs/development/libraries/libdex/default.nix +++ b/pkgs/development/libraries/libdex/default.nix @@ -9,12 +9,12 @@ , vala , glib , liburing -, gitUpdater +, gnome }: stdenv.mkDerivation rec { pname = "libdex"; - version = "0.1.0"; + version = "0.1.1"; outputs = [ "out" "dev" "devdoc" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libdex"; rev = version; - sha256 = "1SluktcmEf1CirYronhan8xmgY227hfnKE4VTPa9ICw="; + sha256 = "wOGHbios95s2LSCN517/cF5MS9YQ+kNliMU4iHFYges="; }; nativeBuildInputs = [ @@ -51,7 +51,9 @@ stdenv.mkDerivation rec { moveToOutput "share/doc" "$devdoc" ''; - passthru.updateScript = gitUpdater { }; + passthru.updateScript = gnome.updateScript { + packageName = pname; + }; meta = with lib; { description = "Library supporting deferred execution for GNOME and GTK"; -- cgit 1.4.1 From 691a11e1b685ea02b27b4a1b669bf47aa8f4711b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:35:55 +0000 Subject: at-spi2-core: 2.47.1 → 2.47.90 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/at-spi2-core/-/compare/AT_SPI2_CORE_2_47_1...AT_SPI2_CORE_2_47_90 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/at-spi2-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 0beb31a3ce6..e692244e69a 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.47.1"; + version = "2.47.90"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "xrp8FgQ07evwnSk2kzVpyTb27JcjAXZvK9rFpNQYFTw="; + sha256 = "cRicIa970IShKrhbIpwteYk2RwsS+ww/F343GB+2wAw="; }; nativeBuildInputs = [ -- cgit 1.4.1 From d32f25d3eb0861bab8bdaec52f5f00d3a13b6f80 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:38:46 +0000 Subject: tracker: 3.5.0.beta → 3.5.0.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tracker/-/compare/3.5.0.beta...3.5.0.rc - Reworked docs - Unicode library loaded at runtime https://gitlab.gnome.org/GNOME/tracker/-/commit/a4f9885a15d845203f777c87e7109471d216c3d0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/tracker/default.nix | 33 ++++++++++++++++---------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index b0d5022d5e1..262bacf68f9 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -11,13 +11,12 @@ , withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages , vala , python3 -, docbook-xsl-nons -, docbook_xml_dtd_45 +, gi-docgen +, graphviz , libxml2 , glib , wrapGAppsNoGuiHook , sqlite -, libxslt , libstemmer , gnome , icu @@ -32,19 +31,15 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "3.5.0.beta"; + version = "3.5.0.rc"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "gMNtrSS6a0ATwKNy/mz7GrzprzLM5Xs1yV+lPq2LbY8="; + sha256 = "AgM6XOsTmc9H0CQugj9zNePC7qG+v1fpW7GslvrD7yM="; }; - postPatch = '' - patchShebangs utils/data-generators/cc/generate - ''; - strictDeps = true; depsBuildBuild = [ @@ -58,10 +53,9 @@ stdenv.mkDerivation rec { asciidoc gettext glib - libxslt wrapGAppsNoGuiHook - docbook-xsl-nons - docbook_xml_dtd_45 + gi-docgen + graphviz (python3.pythonForBuild.withPackages (p: [ p.pygobject3 ])) ] ++ lib.optionals withIntrospection [ gobject-introspection @@ -109,6 +103,16 @@ stdenv.mkDerivation rec { doCheck = true; + postPatch = '' + chmod +x \ + docs/reference/libtracker-sparql/embed-files.py \ + docs/reference/libtracker-sparql/generate-svgs.sh + patchShebangs \ + utils/data-generators/cc/generate \ + docs/reference/libtracker-sparql/embed-files.py \ + docs/reference/libtracker-sparql/generate-svgs.sh + ''; + preCheck = let linuxDot0 = lib.optionalString stdenv.isLinux ".0"; @@ -144,6 +148,11 @@ stdenv.mkDerivation rec { rm -r $out/lib ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; -- cgit 1.4.1 From 64142d12b0e2c224fdd5b21f85f8085c696920d5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:37:59 +0000 Subject: gtk4: 4.9.4 → 4.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk/-/compare/4.9.4...4.10.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gtk/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index c01f2065e48..d0285eb2b20 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.9.4"; + version = "4.10.0"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "kaOv1YQB1OXYHjCwjuPxE6R2j/EBQDNqcqMmx3JyvjA="; + sha256 = "jcHnw7OkZ3Lw+kFqjKP9IdDQs7A/swfS5zJ+vuaWJuQ="; }; depsBuildBuild = [ -- cgit 1.4.1 From ffb35e7cf522c4f5166da7a7efc0856152a32b1b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:38:08 +0000 Subject: libadwaita: 1.3.beta → 1.3.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.3.beta...1.3.rc These commits will be backported to 1.3.x when the freeze is over. https://gitlab.gnome.org/GNOME/libadwaita/-/merge_requests/786#note_1689002 Co-authored-by: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libadwaita/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 55f4a3ad3db..b03c4c3535f 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , gi-docgen , meson , ninja @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.3.beta"; + version = "1.3.rc"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -30,9 +31,23 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-SqJrWaGIfqxmd6OxiIWa3QfFUZgnoWKGsu6/+0QPlyI="; + hash = "sha256-Xb1sNT1KpWspRkjuPBcAaRMXtVpXnjhm+V2FkNthEKk="; }; + patches = [ + # Fixes for the broken carousel test + # https://github.com/NixOS/nixpkgs/pull/218143#issuecomment-1456610692 + # https://gitlab.gnome.org/GNOME/libadwaita/-/merge_requests/786 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libadwaita/-/commit/cbfd8e57d5ba684c8744f6955e0435e7a09b993e.patch"; + hash = "sha256-nVJD5Eu4gjyfIJf4/6e/ah10/dSxjLk5weWKxSP8byE="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libadwaita/-/commit/78dc3b1dc8527b29c8610a1ad3dee82c8b2b3771.patch"; + hash = "sha256-Nthf5crWjNlAPI+8SQ7YfUBCcmCJrHcfkpankqSm+Ic="; + }) + ]; + depsBuildBuild = [ pkg-config ]; -- cgit 1.4.1 From a4b8199787cefb5c7a50bb1c65b37022558871e0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:38:21 +0000 Subject: libhandy: 1.8.1 → 1.8.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libhandy/-/compare/1.8.1...1.8.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libhandy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index ced064e70f8..7507f40b604 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.8.1"; + version = "1.8.2"; outputs = [ "out" @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-N2a5qIH+BljMYIBFOiIZCGw/bb2CBp3kCbirP1mUinA="; + sha256 = "sha256-0RqizT5XCsbQ79ukbRcxR8EfRYJkV+kkwFmQuy4N+a0="; }; depsBuildBuild = [ -- cgit 1.4.1 From 90008d6167555ef67a485ee5f7c13d0999fd2a8a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:36:06 +0000 Subject: gcr_4: 4.0.0 → 4.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gcr/-/compare/4.0.0...4.1.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gcr/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gcr/4.nix b/pkgs/development/libraries/gcr/4.nix index 28ca262ead1..650d87958c5 100644 --- a/pkgs/development/libraries/gcr/4.nix +++ b/pkgs/development/libraries/gcr/4.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gcr"; - version = "4.0.0"; + version = "4.1.0"; outputs = [ "out" "bin" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "xFhVkk8O57q0Pi3Ti/r9KsgVxumGQ0HAFh4XEXPc7Hw="; + sha256 = "nOqtKShLqRm5IW4oiMGOxnJAwsk7OkhWvFSIu8Hzo4M="; }; nativeBuildInputs = [ -- cgit 1.4.1 From ec56e0de065aaca346309158cd16032fa1d78b58 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:36:12 +0000 Subject: gjs: 1.75.2 → 1.75.90 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gjs/-/compare/1.75.2...1.75.90 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 8caafbcc7ea..3ed20f95e0d 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -31,13 +31,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.75.2"; + version = "1.75.90"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-+iv9G4v3W84PBaRckGFOGL1wgAUzhrIAwB3ve1LoI/M="; + sha256 = "sha256-Yv04Az03T/cU62rjtUWSWbHFN/2CLewdkpRIA6JEX3I="; }; patches = [ -- cgit 1.4.1 From aba06997280b216436b61d59447383cb97b01e9b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:38:48 +0000 Subject: tracker-miners: 3.5.0.beta → 3.5.0.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tracker-miners/-/compare/3.5.0.beta...3.5.0.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/tracker-miners/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 3df13b3c332..82807018038 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.5.0.beta"; + version = "3.5.0.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "R4gpdKN9C1w+gl/rMftv6ifOLsIik9SpEfc3IC60aSY="; + sha256 = "eSv03f+RT7I8Xw3YAFk/qmihi1lLHmtZKn2Bcop+Fgs="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 9795950fbb25bcde0dabee93bfdbf04178edfeea Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:35:56 +0000 Subject: baobab: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/baobab/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/baobab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/baobab/default.nix b/pkgs/desktops/gnome/core/baobab/default.nix index 400d8ed33bb..bb1f9db4821 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 = "44.beta"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "p12ey7F5DTPoOsEhM00eORMoeySjZOh32QQYQKkHrpE="; + sha256 = "OWQcMnSsyh+htFhsImSWKQFAd8n1J6ib9W8s3nHZUEM="; }; nativeBuildInputs = [ -- cgit 1.4.1 From c8dbf99619c4b80b72ff9c85d047f2b21a6f22aa Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:36:05 +0000 Subject: folks: 0.15.5 → 0.15.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/folks/-/compare/0.15.5...0.15.6 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/folks/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 57e90cd87f0..b3c6f0a5915 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , pkg-config , meson , ninja @@ -28,23 +27,15 @@ stdenv.mkDerivation rec { pname = "folks"; - version = "0.15.5"; + version = "0.15.6"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "D/+KiWMwzYKu5FmDJPflQciE0DN1NiEnI7S+s4x1kIY="; + sha256 = "yGZjDFU/Kc6b4cemAmfLQICmvM9LjVUdxMfmI02EAkg="; }; - patches = [ - # Do not check for unneeded GTK dependency. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/folks/-/commit/686d58fb2454e5038bb951423245ed8c2d4b5cf6.patch"; - sha256 = "0ydafVKhSrkHZK8bitPF5mNDTG5GrixGzBgBLNzLuXQ="; - }) - ]; - nativeBuildInputs = [ gettext gobject-introspection @@ -117,7 +108,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library that aggregates people from multiple sources to create metacontacts"; homepage = "https://wiki.gnome.org/Projects/Folks"; - license = licenses.lgpl2Plus; + license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.unix; }; -- cgit 1.4.1 From cc6084e9e33ad7c1457249dd31cea5a63f1a1497 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:36:24 +0000 Subject: gnome.gdm: 43.0 → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gdm/-/compare/43.0...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gdm/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix index a2265387e1e..21827476bfa 100644 --- a/pkgs/desktops/gnome/core/gdm/default.nix +++ b/pkgs/desktops/gnome/core/gdm/default.nix @@ -4,7 +4,6 @@ , substituteAll , meson , ninja -, python3 , rsync , pkg-config , glib @@ -44,13 +43,13 @@ in stdenv.mkDerivation rec { pname = "gdm"; - version = "43.0"; + version = "44.rc"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "lNcNbtffWfp/3k/QL+0RaFk6itzhD87hE8FI1Ss5IpQ="; + sha256 = "dxa9nkOVb4EpmZvdaLNs5ucCS8RHlFpYN2A4LTtSdok="; }; mesonFlags = [ @@ -71,7 +70,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 rsync gobject-introspection ]; @@ -126,8 +124,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs build-aux/meson_post_install.py - # Upstream checks some common paths to find an `X` binary. We already know it. echo #!/bin/sh > build-aux/find-x-server.sh echo "echo ${lib.getBin xorg.xorgserver}/bin/X" >> build-aux/find-x-server.sh -- cgit 1.4.1 From a08f052050a75832a53b422d44861d0d0c2f9a69 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:36:35 +0000 Subject: gnome.gnome-clocks: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-clocks/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-clocks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix index cbc95537e6f..3754a25687d 100644 --- a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "44.beta"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "aA90ZhpYDVGvOo6XY85SXg2NJckUid02r0gJP/trje8="; + sha256 = "FR7E9KyqyvdXj0UdqX4sRIA79quY7rfGNwSKkS9ccBA="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 87bf736bd7c93b188df4e9c5643444a66cef6955 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:36:36 +0000 Subject: gnome.gnome-characters: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-characters/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-characters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/pkgs/desktops/gnome/apps/gnome-characters/default.nix index 5afb0e1fbdd..f59d72ed2af 100644 --- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "44.beta"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "cUlibILXNw+nfUlHrNlAczguTn6lU6JIJXgZGJimFB8="; + sha256 = "OttXTRC2i3oE15werAYS+FnGtyUjffDvO34mVxgKSbc="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 23bb1095723507eae188dbdecdfde9f7b32ce217 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:36:37 +0000 Subject: gnome.gnome-contacts: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-contacts/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-contacts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix index 6d029bafa88..0645483ebe9 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "44.beta"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "hinEkGeL2yJwYZbYAhyWV6zbuDLtmHe4EsAz3g7wv2s="; + sha256 = "/GTJTk/w6+o6vKF2ngEDtzUVEQ7wVQdjYhP8kRbjS2o="; }; nativeBuildInputs = [ -- cgit 1.4.1 From b11877010771cc4fc6a8f91156e3f6492dfe7673 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:36:44 +0000 Subject: gnome.gnome-font-viewer: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-font-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix index 8b45aee0fd6..3389ddb37cb 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 = "44.beta"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0Dhb3qjH9AYWx8Fyp0SnbaaaKgUWs8lug6abc50Il+0="; + sha256 = "9olDJvoL8/hc/SeA7hQv0V9UdBo9PQ6pIY39o4O1yOw="; }; doCheck = true; -- cgit 1.4.1 From 65865b1a1a0b687fb11a7b95409d6a97b75a1f44 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:36:53 +0000 Subject: gnome.gnome-music: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-music/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-music/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix index 30f5153c937..fd8acf509aa 100644 --- a/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -30,13 +30,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "44.beta"; + version = "44.rc"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "tdbhsIlD/XP/EKHpAnU5gS0k88rOpB9nGlmRqWkLEag="; + sha256 = "PfHJTph3193a2btUujw/QmsGAFsqbbG75VB+cngDNhE="; }; nativeBuildInputs = [ -- cgit 1.4.1 From c682e73c1f231806ae8c6d003b7b2757c1bc557c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:36:58 +0000 Subject: gnome.gnome-control-center: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 687c407273d..eb89ef7b586 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -64,11 +64,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "44.beta"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-U/Sc2ykcH2h2FIN2bCEwFqN5UFGmGODdx33/TnKrqCI="; + sha256 = "sha256-9AsZeClzh0y3go70oGV75ZcZoCbfat1uc5kqwuerUQI="; }; patches = [ -- cgit 1.4.1 From 2f8f7972d5292e3068655e94e783a09d1b06427c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:36:59 +0000 Subject: gnome.gnome-remote-desktop: 44.alpha → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/compare/44.alpha...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index 608108fc3ec..e7f85e10dc1 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "44.alpha"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-lbpYHPMRnDPhj323Vi8Yr8KxPdAQ+DG/rtHOHm6XdWo="; + hash = "sha256-rZYLgX+oG0/tlTkjeUxxBJESnWIsXRdjmL5ERnW7tbQ="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 9393e8eb33e22708e0911f6c9a8415da8c0870c9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:37:03 +0000 Subject: gnome.gnome-session: 43.0 → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-session/-/compare/43.0...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-session/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-session/default.nix b/pkgs/desktops/gnome/core/gnome-session/default.nix index 03082f7879e..04cf3ed407c 100644 --- a/pkgs/desktops/gnome/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome/core/gnome-session/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "gnome-session"; # Also bump ./ctl.nix when bumping major version. - version = "43.0"; + version = "44.rc"; outputs = [ "out" "sessions" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-session/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "P7mUlQE4XIwUYY548XjZUt+YrYyRCA9MXhVoxzk64fI="; + sha256 = "A2WZUL53yX2O/92oOJJqX/3H0F/fmBNvwOl4djTnGkE="; }; patches = [ -- cgit 1.4.1 From 3415f5ecbf91381ff7fdad22cd01eaefbb127563 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:37:04 +0000 Subject: gnome.gnome-settings-daemon: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index 1b80b3b5ad5..7f4e339ab44 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "44.beta"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "nqXYLZ84eqBd0dBR7DS1OyT79k+cnNhCLt/sK+U27II="; + sha256 = "GyBy6IHZgquSv4eVh/ZuUjfKyReCxgpmYO139CtJuSY="; }; patches = [ -- cgit 1.4.1 From 3795fc2f52185644bf1f18e014a6d32988c1da97 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:37:15 +0000 Subject: gnome.gnome-weather: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-weather/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-weather/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/pkgs/desktops/gnome/apps/gnome-weather/default.nix index 61402884c22..10a8562f850 100644 --- a/pkgs/desktops/gnome/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "44.beta"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "6qX73OBhDPTXSBjd1j83yGcMhGR4rJuZVB2Xkw79S9Y="; + sha256 = "7qdhESvlmN9b0n2Ir1zskhbFiM8IRtwr0ei28NTURPg="; }; nativeBuildInputs = [ -- cgit 1.4.1 From d7b83599bf83431513a048f9ee90e2bd4896eb6f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:37:21 +0000 Subject: gnome.nautilus: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/nautilus/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/nautilus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 68da9a822b7..835d2f0a711 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -38,13 +38,13 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "44.beta"; + version = "44.rc"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "TEFVqfkyLjXuzUTPW1Ja/WSFlpmHb5VJELuW0bvKXlw="; + sha256 = "+M5JDZq6REfP+nhrLOwYUgQC6kIZa5dmo5FJOdo0wQ4="; }; patches = [ -- cgit 1.4.1 From 4af2ecdddcbfdb73cd4428a2ab277339d2df3f4c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:37:45 +0000 Subject: gnome-user-docs: 43.0 → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-user-docs/-/compare/43.0...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/data/documentation/gnome-user-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index 378f33be252..5c40607a012 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "43.0"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "NgcWDv/W+R4lqHmLV977IJndcLj+5Ofi8g8mN6woyu4="; + sha256 = "yy74MJKqsU1SYVctpjycIqf5hxKyI0z0R56gGu0ieuQ="; }; nativeBuildInputs = [ -- cgit 1.4.1 From b42fecbae80a9d723e9405fb9ab2b9867a84a2f3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 16:39:04 +0100 Subject: gnome.atomix: 3.34.0 → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/atomix/-/compare/3.34.0...44.rc Also clean up the expression. Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/games/atomix/default.nix | 62 ++++++++++++++++------------ 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/pkgs/desktops/gnome/games/atomix/default.nix b/pkgs/desktops/gnome/games/atomix/default.nix index 43278a05b4d..54743338bc1 100644 --- a/pkgs/desktops/gnome/games/atomix/default.nix +++ b/pkgs/desktops/gnome/games/atomix/default.nix @@ -1,33 +1,43 @@ -{ lib, stdenv, fetchurl, fetchpatch -, meson, ninja, pkg-config, wrapGAppsHook, python3 -, gettext, gnome, glib, gtk3, libgnome-games-support, gdk-pixbuf }: - -stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, wrapGAppsHook +, python3 +, gettext +, gnome +, glib +, gtk3 +, libgnome-games-support +, gdk-pixbuf +}: + +stdenv.mkDerivation (finalAttrs: { pname = "atomix"; - version = "3.34.0"; + version = "44.rc"; src = fetchurl { - url = "mirror://gnome/sources/atomix/${lib.versions.majorMinor version}/atomix-${version}.tar.xz"; - sha256 = "0h909a4mccf160hi0aimyicqhq2b0gk1dmqp7qwf87qghfrw6m00"; + url = "mirror://gnome/sources/atomix/${lib.versions.major finalAttrs.version}/atomix-${finalAttrs.version}.tar.xz"; + sha256 = "pujNEnUJNLv+6Grwd/uxnTcuq+GxXeemxecOjLdDJAw="; }; - patches = [ - # Pull upstream fix for -fno-common toolchains like gcc-10: - # https://gitlab.gnome.org/GNOME/atomix/-/merge_requests/2 - (fetchpatch { - name = "fno-common.patch"; - url = "https://gitlab.gnome.org/GNOME/atomix/-/commit/be7f44f1945a569494d46c60eaf6e7b39b2bb48b.patch"; - sha256 = "0nrwl6kb1als9mxd5s0la45z63xwshqlnxqjaax32w8yrl6kz7l8"; - }) + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + wrapGAppsHook + python3 ]; - nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook python3 ]; - buildInputs = [ glib gtk3 gdk-pixbuf libgnome-games-support gnome.adwaita-icon-theme ]; - - # When building with clang ceil() is not inlined: - # ld: src/libatomix.a.p/canvas_helper.c.o: undefined reference to symbol 'ceil@@GLIBC_2.2.5' - # https://gitlab.gnome.org/GNOME/atomix/-/merge_requests/3 - NIX_LDFLAGS = "-lm"; + buildInputs = [ + glib + gtk3 + gdk-pixbuf + libgnome-games-support + ]; postPatch = '' chmod +x meson_post_install.py @@ -36,8 +46,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "atomix"; + attrPath = "gnome.atomix"; }; }; @@ -48,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.unix; }; -} +}) -- cgit 1.4.1 From 755387543f459d6edc31595a98f8d998ffb7ccca Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 8 Mar 2023 02:34:13 +0000 Subject: gnome.mutter: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mutter/-/compare/44.beta...44.rc GTK 3 is now only used by tests, let’s disable them. This will require us to explicitly add libraries listed as dependencies by Mutter’s X11 client that were previously propagated by GTK 3. While at it let’s put them into their own block in preparation for future when the X11 client is optional. Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/mutter/default.nix | 53 +++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index d8434c3f0be..c4c1ae6be40 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -15,19 +15,29 @@ , libcanberra , ninja , xvfb-run -, xkeyboard_config , libxcvt -, libxkbfile , libICE +, libX11 +, libXcomposite +, libXcursor , libXdamage -, libxkbcommon +, libXext +, libXfixes +, libXi , libXtst +, libxkbfile +, xkeyboard_config +, libxkbcommon +, libXrender +, libxcb +, libXrandr +, libXinerama +, libXau , libinput , libdrm , gsettings-desktop-schemas , glib , atk -, gtk3 , gtk4 , fribidi , harfbuzz @@ -35,6 +45,7 @@ , pipewire , libgudev , libwacom +, libSM , xwayland , mesa , meson @@ -54,18 +65,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "44.beta"; + version = "44.rc"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - sha256 = "+Lgh89e9o9o5yzygwDg84sn/HCqzFNyJXoRyKBVxKkc="; + sha256 = "aQynddetFbm1DA48J2w+xH/Fvi+AVhLDZ1guay3jgls="; }; mesonFlags = [ "-Degl_device=true" "-Dinstalled_tests=false" # TODO: enable these + "-Dtests=false" "-Dwayland_eglstream=true" "-Dprofiler=true" "-Dxwayland_path=${xwayland}/bin/Xwayland" @@ -78,7 +90,6 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ # required for pkg-config to detect mutter-clutter json-glib - libXtst libcap_ng graphene ]; @@ -107,8 +118,6 @@ stdenv.mkDerivation (finalAttrs: { gobject-introspection gsettings-desktop-schemas atk - gtk3 - gtk4 fribidi harfbuzz libcanberra @@ -117,19 +126,35 @@ stdenv.mkDerivation (finalAttrs: { libinput libstartup_notification libwacom - libxkbcommon - libxkbfile - libICE - libXdamage + libSM colord lcms2 pango pipewire sysprof # for D-Bus interfaces libsysprof-capture - xkeyboard_config xwayland wayland-protocols + ] ++ [ + # X11 client + gtk4 + libICE + libX11 + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXtst + libxkbfile + xkeyboard_config + libxkbcommon + libXrender + libxcb + libXrandr + libXinerama + libXau ]; postPatch = '' -- cgit 1.4.1 From b4187a6dfd061e02d7d53a2716d037eab5f87ce0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 8 Mar 2023 20:37:29 +0000 Subject: vte: 0.71.92 → 0.71.99 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vte/-/compare/0.71.92...0.71.99 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/vte/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index b55ffa1a768..11e33ceb979 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.71.92"; + version = "0.71.99"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-0psrckN+7cFylU+hNu0hUzQKyeF2FEqmO2HCRroBC+g="; + sha256 = "sha256-Fbf0Lkgzs1JbvcAG1Wye5WdmxNY4r/VrOSlUtK090Ys="; }; patches = [ -- cgit 1.4.1 From 96439cfed09d07580cd38786ccb97fe817885c53 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 8 Mar 2023 20:40:39 +0000 Subject: gnome.gnome-terminal: 3.47.0 → 3.47.99 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-terminal/-/compare/3.47.0...3.47.99 Co-authored-by: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-terminal/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix index 2fc891b28fd..19a73bbe040 100644 --- a/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitLab -, fetchpatch , meson , ninja , pkg-config @@ -30,25 +29,16 @@ stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.47.0"; + version = "3.47.99"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gnome-terminal"; rev = version; - sha256 = "sha256-CriI1DtDBeujaz0HtXCyzoGxnas7NmD6EMQ+gLph3E4="; + sha256 = "sha256-EsXVW2XxRNLchJGAJ6BGCN6KdKF2wz/p49wBhdPObgQ="; }; - patches = [ - # Fix Nautilus extension build. - # https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7916 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-terminal/-/commit/614ea99b16fb09e10341fc6ccf5e115ac3f93caf.patch"; - sha256 = "K7JHPfXywF3QSjSjyUnNZ11/ed+QXHQ47i135QBMIR8="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -87,6 +77,7 @@ stdenv.mkDerivation rec { patchShebangs \ data/icons/meson_updateiconcache.py \ data/meson_desktopfile.py \ + data/meson_metainfofile.py \ src/meson_compileschemas.py ''; -- cgit 1.4.1 From 0c35dfccb99cb0592e2a93c7d7007aa831924910 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 10 Mar 2023 07:37:18 +0000 Subject: gnome.gnome-shell: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/44.beta...44.rc Since we disabled tests in mutter, we need to do it here as well to avoid: ERROR: Dependency "libmutter-test-12" not found, tried pkgconfig Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-shell/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index dd7b00b0414..a4addfd14a3 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -36,7 +36,7 @@ , gdm , upower , ibus -, libnma +, libnma-gtk4 , libgnomekbd , gnome-desktop , gsettings-desktop-schemas @@ -67,13 +67,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "44.beta"; + version = "44.rc"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "JACs9fFjtpoHtWB7VieWYHWHOx9ITVVLpugBa9VfCEY="; + sha256 = "Gy+x3fS7hWj/Du3Wqz19V7ider7iICt7hTmtu6gV55g="; }; patches = [ @@ -164,7 +164,7 @@ stdenv.mkDerivation rec { # not declared at build time, but typelib is needed at runtime libgweather - libnma + libnma-gtk4 # for gnome-extension tool bash-completion @@ -177,6 +177,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" + "-Dtests=false" ]; postPatch = '' @@ -185,6 +186,13 @@ stdenv.mkDerivation rec { # We can generate it ourselves. rm -f man/gnome-shell.1 rm data/theme/gnome-shell.css + + # Build fails with -Dgtk_doc=true + # https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6486 + # element include: XInclude error : could not load xxx, and no fallback was found + substituteInPlace docs/reference/shell/shell-docs.sgml \ + --replace '' ' ' \ + --replace '' ' ' ''; postInstall = '' -- cgit 1.4.1 From f441c242d2ea71e8f704f464030875f772eafe7a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 10 Mar 2023 16:21:51 +0800 Subject: desktop-file-utils: Support Desktop Entry Specification v1.5 The gnome-terminal desktop file validation fails otherwise. --- pkgs/tools/misc/desktop-file-utils/default.nix | 38 +++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 597eced414f..218eed5eb8b 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja, glib, libintl }: +{ stdenv +, lib +, fetchurl +, fetchpatch +, pkg-config +, meson +, ninja +, glib +, libintl +}: stdenv.mkDerivation rec { pname = "desktop-file-utils"; @@ -9,8 +18,29 @@ stdenv.mkDerivation rec { sha256 = "02bkfi6fyk4c0gh2avd897882ww5zl7qg7bzzf28qb57kvkvsvdj"; }; - nativeBuildInputs = [ pkg-config meson ninja ]; - buildInputs = [ glib libintl ]; + patches = [ + # Support Desktop Entry Specification v1.5. + # https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/merge_requests/11 + (fetchpatch { + url = "https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/commit/425177a28b6215e0745f95100160a08e810fd47c.patch"; + sha256 = "zu9EqTnQQGi5HqKh431JqigtJi+b16RuXSWQYbuuyxA="; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/commit/56d220dd679c7c3a8f995a41a27a7d6f3df49dea.patch"; + sha256 = "p4kamGIm2QBHfIbvDnx+qu5Gi7OU3Z0nQKr39SsEKqk="; + }) + ]; + + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; + + buildInputs = [ + glib + libintl + ]; postPatch = '' substituteInPlace src/install.c \ @@ -23,6 +53,6 @@ stdenv.mkDerivation rec { homepage = "http://www.freedesktop.org/wiki/Software/desktop-file-utils"; description = "Command line utilities for working with .desktop files"; platforms = platforms.linux ++ platforms.darwin; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } -- cgit 1.4.1 From 29fcc594834aca6c5c48eb8a8a0028473c1c44be Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 10 Mar 2023 12:00:17 +0000 Subject: evince: 43.1 → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evince/-/compare/43.1...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/evince/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index d561ad6646a..7a3710088c1 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -7,6 +7,7 @@ , gettext , libxml2 , appstream +, desktop-file-utils , glib , gtk3 , pango @@ -42,17 +43,18 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "43.1"; + version = "44.rc"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "bXXKYrc7+7YA9xigmBA9xrgT+QULlZS+kp4ptFidIzU="; + sha256 = "Dd34w75hRMZfJW+sDoqnx3tPQZrKCMvgkenaCM3xbIQ="; }; nativeBuildInputs = [ appstream + desktop-file-utils gettext gobject-introspection gi-docgen -- cgit 1.4.1 From 6a9a7646f93e03495a3a8ab4044a54b6c8285901 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 10 Mar 2023 12:02:16 +0000 Subject: gnome.ghex: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/ghex/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/ghex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix index c00687f2137..0317d2757e2 100644 --- a/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/pkgs/desktops/gnome/apps/ghex/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "ghex"; - version = "44.beta"; + version = "44.rc"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "kjcwo6SnIgjYK1hrjxmq3De7/9f/5mhMiF61AQZYEkw="; + sha256 = "iTjiWFM/DDW2MR/KD2RZ4vhu2xJ/xNSoz/oi21Lg17M="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 06ab7358ff9c77b8ccc2cb551d6201e1daed2e51 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 10 Mar 2023 20:49:00 +0100 Subject: spice: 0.15.0 → 0.15.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.freedesktop.org/spice/spice/-/tags/v0.15.1 https://gitlab.freedesktop.org/spice/spice/-/compare/v0.15.0...v0.15.1 https://gitlab.freedesktop.org/spice/spice-common/-/compare/fcfe9104bd62a5a1debfebf9ce25e96715662ab4...58d375e5eadc6fb9e587e99fd81adcb95d01e8d6 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/spice/default.nix | 31 ++++++++-------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 7f7493b2acc..25e60397b35 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -25,38 +25,18 @@ , gdk-pixbuf }: -let - # This file was mistakenly not included with the 0.15.0 release tarball. - # Should be fixed with the next release. - # https://gitlab.freedesktop.org/spice/spice/-/issues/56 - doxygen_sh = fetchurl { - url = "https://gitlab.freedesktop.org/spice/spice/-/raw/v0.15.0/doxygen.sh"; - sha256 = "0g4bx91qclihp1jfhdhyj7wp4hf4289794xxbw32kk58lnd7bzkg"; - }; -in - stdenv.mkDerivation rec { pname = "spice"; - version = "0.15.0"; + version = "0.15.1"; src = fetchurl { url = "https://www.spice-space.org/download/releases/spice-server/${pname}-${version}.tar.bz2"; - sha256 = "1xd0xffw0g5vvwbq4ksmm3jjfq45f9dw20xpmi82g1fj9f7wy85k"; + sha256 = "ramvZ6syGRa9frWePWGaSneWwIooxzLt/H8C/ICxo3o="; }; patches = [ ./remove-rt-on-darwin.patch ]; - postPatch = '' - install ${doxygen_sh} doxygen.sh - patchShebangs build-aux - - # https://gitlab.freedesktop.org/spice/spice-common/-/issues/5 - substituteInPlace subprojects/spice-common/meson.build \ - --replace \ - "cmd = run_command(python, '-m', module)" \ - "cmd = run_command(python, '-c', 'import @0@'.format(module))" - ''; nativeBuildInputs = [ glib @@ -99,6 +79,13 @@ stdenv.mkDerivation rec { "-Dgstreamer=1.0" ]; + postPatch = '' + patchShebangs build-aux + + # Forgotten in 0.15.1 tarball + sed -i /meson.add_dist_script/d meson.build + ''; + postInstall = '' ln -s spice-server $out/include/spice ''; -- cgit 1.4.1 From 1301ddbd4e25e1258d8551164b51d4ac4f06dcea Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 10 Mar 2023 20:50:22 +0100 Subject: spice-gtk: 0.41 → 0.42 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.freedesktop.org/spice/spice-gtk/-/compare/v0.41...v0.42 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/spice-gtk/default.nix | 26 +++++++++++++----------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index d54ffa3bd19..81311fb2370 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -62,25 +62,15 @@ stdenv.mkDerivation rec { pname = "spice-gtk"; - version = "0.41"; + version = "0.42"; outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { url = "https://www.spice-space.org/download/gtk/${pname}-${version}.tar.xz"; - sha256 = "sha256-2Pi1y+qRhHAu64zCdqZ9cqzbbjbnxzNJ+4RF5byglp8="; + sha256 = "sha256-k4ARfxgRrR+qGBLLZgJHm2KQ1KDYzEQtREJ/f2wOelg="; }; - postPatch = '' - # get rid of absolute path to helper in store so we can use a setuid wrapper - substituteInPlace src/usb-acl-helper.c \ - --replace 'ACL_HELPER_PATH"/' '"' - # don't try to setcap/suid in a nix builder - substituteInPlace src/meson.build \ - --replace "meson.add_install_script('../build-aux/setcap-or-suid'," \ - "# meson.add_install_script('../build-aux/setcap-or-suid'," - ''; - depsBuildBuild = [ pkg-config ]; @@ -149,6 +139,18 @@ stdenv.mkDerivation rec { "-Dcoroutine=gthread" # Fixes "Function missing:makecontext" ]; + postPatch = '' + # get rid of absolute path to helper in store so we can use a setuid wrapper + substituteInPlace src/usb-acl-helper.c \ + --replace 'ACL_HELPER_PATH"/' '"' + # don't try to setcap/suid in a nix builder + substituteInPlace src/meson.build \ + --replace "meson.add_install_script('../build-aux/setcap-or-suid'," \ + "# meson.add_install_script('../build-aux/setcap-or-suid'," + + patchShebangs subprojects/keycodemapdb/tools/keymap-gen + ''; + meta = with lib; { description = "GTK 3 SPICE widget"; longDescription = '' -- cgit 1.4.1 From 1877a8750afe882458e8656f49a799e51fe1e4fc Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 10 Mar 2023 12:02:41 +0000 Subject: gnome.gnome-boxes: 44.beta.1 → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-boxes/-/compare/44.beta.1...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-boxes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index e01e4fa0979..ed3e66aa759 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "44.beta.1"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "vUCk0EoXGLWk26+RGZ9N0gKqysevegyJPisFUykg7ug="; + sha256 = "sIC8A8VFn+W4H6AtQKpgYb5ZiJf2gQ4KG37VY2p6JhQ="; }; patches = [ -- cgit 1.4.1 From 09072ccd7a2dfcd3c631d79f61a21b9f780e18f6 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 10 Mar 2023 12:02:55 +0000 Subject: gnome.gnome-calendar: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calendar/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-calendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index e731af31dca..28d751b4f09 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "44.beta"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "3ll5sxyoqVyJzUQaf01iJ7EVl6miJC2N9yCgYSv3xyI="; + sha256 = "daNDPMo4yFctoYbZBYji50BkIC9rVveMeYueE0NnJk4="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 3f53eaacd39d0e9e73dc2477e8c7a537d78c486b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 10 Mar 2023 12:04:51 +0000 Subject: gnome.gnome-shell-extensions: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index a443198667b..9603ab2a89c 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 rec { pname = "gnome-shell-extensions"; - version = "44.beta"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "NsLCXgJsZCMGpYZdwwNHJ3m8OczQDwhx/m+HNEy5emU="; + sha256 = "lDmnAy2gHAjktTg1AE9Kt6P0ANUN1uE0emPZ36+Ac0A="; }; patches = [ -- cgit 1.4.1 From bba15a64e454cfea9751a88dec38e94d1afc052b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 10 Mar 2023 12:09:37 +0000 Subject: gtkmm4: 4.9.3 → 4.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtkmm/-/compare/4.9.3...4.10.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gtkmm/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix index 423d27a437e..e1ed8307a39 100644 --- a/pkgs/development/libraries/gtkmm/4.x.nix +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "4.9.3"; + version = "4.10.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "uGCyNIIqAwHDCQHHHx3/364fX5skBNDafdtd7WG19L4="; + sha256 = "4bEJdxVX7MU8upFagLbt6Cf/29AEnGL9+L1/p5r8xus="; }; nativeBuildInputs = [ -- cgit 1.4.1 From a33f4efd55c300e7ffe40e43a9137d25de420e99 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 10 Mar 2023 12:13:17 +0000 Subject: orca: 43.1 → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/orca/-/compare/ORCA_43_1...ORCA_44_RC Changelog-Reviewed-By: Jan Tojnar --- pkgs/applications/misc/orca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index d88c4f549d3..8a399ad3d4c 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -34,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "43.1"; + version = "44.rc"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "9ljgSc4WknO4Q0aBBCTW9QkpHwXX7MOnegPZEqo+aEA="; + sha256 = "pVG+LdbqRtfO5TTOyk0cH8HM+lL5E6pSizNXmf4oifs="; }; patches = [ -- cgit 1.4.1 From 5113382afe98a5a1ec7771468644ef6912480429 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 10 Mar 2023 12:14:23 +0000 Subject: xdg-desktop-portal-gnome: 44.beta → 44.rc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/compare/44.beta...44.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix index a811245c9ec..f1863fc28f7 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gnome"; - version = "44.beta"; + version = "44.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "g6GQnwPOHm+rByv38TahQVmxScc5mwkfkB8ND0Z4VeI="; + sha256 = "rj4WkLhwoJYqnyXBTp7EZtcSpPZpXVgKU/HfJblWzgI="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 703500d5fd6667680a08a90acb0d9168aae0aad3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 11 Mar 2023 18:58:32 +0000 Subject: glib: 2.75.4 → 2.76.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib/-/compare/2.75.4...2.76.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/glib/default.nix | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index acd67bb136a..3c97e542f9b 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -3,7 +3,6 @@ , stdenv , fetchurl , fetchpatch2 -, fetchpatch , gettext , meson , ninja @@ -57,11 +56,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.75.4"; + version = "2.76.0"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - sha256 = "Fs4ku488DqO9vak3wJC5O7i1rS1Bfl5eQsFKpM9ratE="; + sha256 = "Ulu3A7gHFC4a7lzPIiw0ToBkshwMRWd+9ZTlh4dMZ5c="; }; patches = lib.optionals stdenv.isDarwin [ @@ -110,27 +109,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.gnome.org/GNOME/glib/-/commit/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch"; hash = "sha256-8y+rl17buxazMK9Oj28CasC9AyRwt700knyCL1jDIJ0="; }) - - # Fix copying files on btrfs. - # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3309 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/glib/-/commit/406143b072ec92c2810f93441f037793215b04d9.patch"; - hash = "sha256-s2OZZWNgf+gp9TwhLR2nOL9OgV9jUyBrJN8FR8zcE1I="; - }) - - # Fix GJS tests. - # https://gitlab.gnome.org/GNOME/glib/-/issues/2932 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/glib/-/commit/4e62e55d6d0109012869a589eae2371e836e9cb3.patch"; - hash = "sha256-BadhneyDTINPMkNZ+Z/sqUtuHXipHE5gbXLki7dFmmA="; - }) - - # Fix g_file_info_get_is_backup. - # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3311 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/glib/-/commit/448a163bee9906ba3937ea8cdb4a08afeb6f9dc3.patch"; - hash = "sha256-YXMcmY4RnV9wUkM6Lrcu8o71ir+k2p385rb52wogHQc="; - }) ]; outputs = [ "bin" "out" "dev" "devdoc" ]; -- cgit 1.4.1 From 3863e0ff0df7dab228716be01301cb3bf556e399 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 11 Mar 2023 18:59:18 +0000 Subject: gnome.zenity: 3.90.0 → 3.91.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/zenity/-/compare/3.90.0...3.91.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/zenity/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/zenity/default.nix b/pkgs/desktops/gnome/core/zenity/default.nix index 8539b21b354..b5968f92f3d 100644 --- a/pkgs/desktops/gnome/core/zenity/default.nix +++ b/pkgs/desktops/gnome/core/zenity/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "zenity"; - version = "3.90.0"; + version = "3.91.0"; src = fetchurl { url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "XsvlcxBVqYfiDB+vBQdfECLd4wenLp0UUiRA1IHWhtA="; + sha256 = "N2GeCYAwgXj9vPaDItmaB7MzbBwLuY7ysyycsQkCI5k="; }; nativeBuildInputs = [ @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool to display dialogs from the commandline and shell scripts"; homepage = "https://wiki.gnome.org/Projects/Zenity"; + license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = teams.gnome.members; }; -- cgit 1.4.1 From 5871a21187bdba01b93ea73bc3c63e9d3643f4b0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 11 Mar 2023 18:59:26 +0000 Subject: gnome-photos: 43.0 → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-photos/-/compare/43.0...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/applications/graphics/gnome-photos/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index d3d3d66feb9..7a51f037f99 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -35,27 +35,17 @@ stdenv.mkDerivation rec { pname = "gnome-photos"; - version = "43.0"; + version = "44.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "x6x0WNUz8p2VUBHHS3YiTXnqMbzBLp1tDOe2w3BNCOE="; + sha256 = "544hA5fTxigJxs1VIdpuzLShHd6lvyr4YypH9Npcgp4="; }; patches = [ ./installed-tests-path.patch - - # Support babel 0.1.100 - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/gnome-photos/-/commit/64c6f733a44bac5b7f08445a686c000681f93f5f.patch"; - hash = "sha256-iB5qCcDEH8pEX42ypEGJ9QMJWE8VXirv5JfdC1jP218="; - }) - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/gnome-photos/-/commit/9db32c3508a8c5d357a053d5f8278c34b4df18f3.patch"; - hash = "sha256-iz6gSu5rUBZ3Ki5GSRVuLcwX0LRQvJT17XmXQ7WJSmI="; - }) ]; nativeBuildInputs = [ -- cgit 1.4.1 From 992dffb5b1360da3bed235da08e309c310a4abac Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 11 Mar 2023 20:25:10 +0100 Subject: abiword: clean up - Format the expression. - Remove Adwaita icon theme, it does not do anything as a dependency. --- pkgs/applications/office/abiword/default.nix | 47 +++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index c064ea94d04..954c50befc8 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -1,6 +1,22 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk3, fribidi -, libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl -, boost, libxslt, goffice, wrapGAppsHook, gnome +{ lib +, stdenv +, fetchurl +, pkg-config +, gtk3 +, fribidi +, libpng +, popt +, libgsf +, enchant +, wv +, librsvg +, bzip2 +, libjpeg +, perl +, boost +, libxslt +, goffice +, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -12,15 +28,30 @@ stdenv.mkDerivation rec { hash = "sha256-ElckfplwUI1tFFbT4zDNGQnEtCsl4PChvDJSbW86IbQ="; }; - enableParallelBuilding = true; - - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ + pkg-config + wrapGAppsHook + ]; buildInputs = [ - gtk3 librsvg bzip2 fribidi libpng popt - libgsf enchant wv libjpeg perl boost libxslt goffice gnome.adwaita-icon-theme + gtk3 + librsvg + bzip2 + fribidi + libpng + popt + libgsf + enchant + wv + libjpeg + perl + boost + libxslt + goffice ]; + enableParallelBuilding = true; + meta = with lib; { description = "Word processing program, similar to Microsoft Word"; homepage = "https://www.abisource.com/"; -- cgit 1.4.1 From 0d8905a0562ac4c1053176b6983bd32935512eac Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 11 Mar 2023 20:35:06 +0100 Subject: webkitgtk: 2.39.90 → 2.39.91 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://webkitgtk.org/2023/03/08/webkitgtk2.39.91-released.html Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/epiphany/default.nix | 9 ++++++++ pkgs/development/libraries/webkitgtk/default.nix | 26 ++++++++++-------------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 3e77e77e67c..178eb444f81 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -4,6 +4,7 @@ , ninja , gettext , fetchurl +, fetchpatch2 , pkg-config , gtk4 , glib @@ -43,6 +44,14 @@ stdenv.mkDerivation rec { sha256 = "33X7U1yAQbzvhNZSWGfVEjw58MaIUDxGBhTNs3Tp+Sk="; }; + patches = [ + # Fix compatibility with WebkitGTk 2.39.91 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1295.patch"; + hash = "sha256-xlgGaAzMYgwSty992EKWK5emkyZxyLoCw/HI+Uz74go="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils gettext diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 4ab35fc9d4b..56d9a2f9e41 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -2,7 +2,7 @@ , stdenv , runCommand , fetchurl -, fetchpatch +, fetchpatch2 , perl , python3 , ruby @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.39.90"; + version = "2.39.91"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-gnWGbDUppxXCPK442/Lt0xDYGIVGpHxaL3CdGT96X8A="; + hash = "sha256-kuim9ZlFBSnrC9VS5PwtH2kYMetNicr/uW+1gdLINtM="; }; patches = lib.optionals stdenv.isLinux [ @@ -100,19 +100,15 @@ stdenv.mkDerivation (finalAttrs: { wpebackend_fdo = libwpe-fdo; }) - # Various build fixes for 2.39.90, should be part of final release - # https://github.com/NixOS/nixpkgs/pull/218143#issuecomment-1445126808 - (fetchpatch { - url = "https://github.com/WebKit/WebKit/commit/5f8dc9d4cc01a31e53670acdcf7a9c4ea4626f58.patch"; - hash = "sha256-dTok1QK93Fp8RFED4wgbVdLErUnmIB4Xsm/VPutmQuw="; + # Various build fixes for 2.39.91, should be part of final release + # https://src.fedoraproject.org/rpms/webkitgtk/blob/1c16daccce69d47df5381968e9c7be8ed72e4f90/f/fix-installed-headers.patch + (fetchpatch2 { + url = "https://github.com/WebKit/WebKit/commit/53a8890833684fe813efd7b7a2b7417dbfa7b826.patch"; + hash = "sha256-utenJzQMr8AUMRT6CL06hi5sXPiXEJJmM7Vht+qxiw8="; }) - (fetchpatch { - url = "https://github.com/WebKit/WebKit/commit/f51987a0f316621a0ab324696c9a576bbaf1e686.patch"; - hash = "sha256-TZVrrH4+JS2I/ist7MdMLsuk9X/Nyx62AcODvzGkdx8="; - }) - (fetchpatch { - url = "https://github.com/WebKit/WebKit/commit/fe4fdc28cd214d36425d861791d05d1afaee60f5.patch"; - hash = "sha256-p1LNyvc6kGRhptov6AKVl2Rc+rrRnzHEtpF/AhqbA+E="; + (fetchpatch2 { + url = "https://github.com/WebKit/WebKit/commit/10c9256883bf38b9fbcfbc91577783d4df90d1bd.patch"; + hash = "sha256-eXMRh9oEcBeOiJvj+kRJHEIUwnviBvlI2JdBS6MVxtk="; }) ]; -- cgit 1.4.1 From 8de8fc42230bae261992998edb9c75de53d455f8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 11 Mar 2023 23:55:49 +0100 Subject: girara: 0.3.7 → 0.3.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://git.pwmt.org/pwmt/girara/-/compare/0.3.7...0.3.9 Also format the expression. Changelog-Reviewed-By: Jan Tojnar --- pkgs/applications/misc/girara/default.nix | 57 +++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 841aeca5896..a6736c7a2dd 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,21 +1,64 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, check, dbus, xvfb-run, glib, gtk, gettext, libiconv, json_c, libintl +{ lib +, stdenv +, fetchurl +, fetchpatch2 +, meson +, ninja +, pkg-config +, check +, dbus +, xvfb-run +, glib +, gtk +, gettext +, libiconv +, json-glib +, libintl }: stdenv.mkDerivation rec { pname = "girara"; - version = "0.3.7"; + version = "0.3.9"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://git.pwmt.org/pwmt/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-QTQiE/jnRSWPHbKMu2zMJ6YwCaXgAb95G74BzkNtTbc="; + hash = "sha256-DoqYykR/N17BHQ90GoLvAYluQ3odWPwUGRTacN6BiWU="; }; - nativeBuildInputs = [ meson ninja pkg-config gettext check dbus ]; - buildInputs = [ libintl libiconv json_c ]; - propagatedBuildInputs = [ glib gtk ]; - nativeCheckInputs = [ xvfb-run ]; + patches = [ + # Fix memory management bug revealed by GLib 2.76. + # https://git.pwmt.org/pwmt/girara/-/issues/17 + (fetchpatch2 { + url = "https://git.pwmt.org/pwmt/girara/-/commit/6926cc1234853ccf3010a1e2625aafcf462ed60e.patch"; + hash = "sha256-uayT6ikXtaBPxhZFyskShug3Tbvy2a9qimLRwdiAsic="; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + check + dbus + ]; + + buildInputs = [ + libintl + libiconv + json-glib + ]; + + propagatedBuildInputs = [ + glib + gtk + ]; + + nativeCheckInputs = [ + xvfb-run + ]; doCheck = !stdenv.isDarwin; -- cgit 1.4.1 From b54f99dc250dec5aecf5ac7f9342d190347ac917 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 12 Mar 2023 17:51:01 +0000 Subject: glibmm_2_68: 2.75.0 → 2.76.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glibmm/-/compare/2.75.0...2.76.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/glibmm/2.68.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix index ae1c37e2a2d..ece609893f7 100644 --- a/pkgs/development/libraries/glibmm/2.68.nix +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.75.0"; + version = "2.76.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-YLsS5mSIqozkHw6y82EvifXdyIfj5NRUmFJL9gsmaz0="; + sha256 = "sha256-hjfYDOq9lP3dbkiXCggqJkVY1KuCaE4V/8h+fvNGKrI="; }; nativeBuildInputs = [ -- cgit 1.4.1 From d4d54a4e266ecaf074bf8b63d02d00acbebbe401 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 13 Mar 2023 12:29:13 +0000 Subject: glibmm: 2.66.5 → 2.66.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glibmm/-/compare/2.66.5...2.66.6 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/glibmm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 9f4a16a0ce4..8800070ab61 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.66.5"; + version = "2.66.6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ezhGYt1uw7hsBXAzHTKvBdsr2Zp5FgK3Z7SgslZuwUk="; + sha256 = "sha256-U1h0JZgYHlNR17+NoHK/k+bdXxeNJ2QNTkYryPFOFS8="; }; outputs = [ "out" "dev" ]; -- cgit 1.4.1 From 5c45946077cba99733ec9f9bcd304a1fae23859b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 14 Mar 2023 16:34:33 +0000 Subject: gobject-introspection: 1.75.6 → 1.76.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gobject-introspection/-/compare/1.75.6...1.76.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gobject-introspection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 49fb038d4cc..f858fce0f76 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -36,7 +36,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gobject-introspection"; - version = "1.75.6"; + version = "1.76.0"; # outputs TODO: share/gobject-introspection-1.0/tests is needed during build # by pygobject3 (and maybe others), but it's only searched in $out @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gobject-introspection/${lib.versions.majorMinor finalAttrs.version}/gobject-introspection-${finalAttrs.version}.tar.xz"; - sha256 = "GhuXcXq8lJvXw8/mlpPaA7/bswxbSoXeT8oI4x8NJ/4="; + sha256 = "hVL/OlZ1i426IdQheVpSuan7+YRWWQe4Pxxk9N64OAw="; }; patches = [ -- cgit 1.4.1 From 71619a7829a3f8cc7befd3d8deacc3761120bac0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 14 Mar 2023 16:38:32 +0000 Subject: gtk4: 4.10.0 → 4.10.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk/-/compare/4.10.0...4.10.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gtk/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index d0285eb2b20..9283ec59a30 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.10.0"; + version = "4.10.1"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "jcHnw7OkZ3Lw+kFqjKP9IdDQs7A/swfS5zJ+vuaWJuQ="; + sha256 = "6PysBLx3FbnaZnyRGl7o8mLiANHWpQrfI2RcqM/NAxE="; }; depsBuildBuild = [ -- cgit 1.4.1 From bc23e0c8b9b13e7116b5bfc40ce012a1e0688b80 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 16 Mar 2023 16:13:28 +0000 Subject: gnome.gnome-calendar: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calendar/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-calendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index 28d751b4f09..7c7b14b23e3 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "daNDPMo4yFctoYbZBYji50BkIC9rVveMeYueE0NnJk4="; + sha256 = "lqzXTL9FZSk0UVzDRHo7iV6TP4YyTKkkNvZ93WPDqAI="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 0aae37164a1c1b4a4a2ebeb433c3e78c2f37af5f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 16 Mar 2023 16:13:45 +0000 Subject: gnome.gnome-software: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-software/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-software/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index 783d57733df..6302a5d8a2c 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ErgEYOCoAi7+/+EfU0gzO0MZQVNxNIqrmTRye8SQrIY="; + sha256 = "YZcZ+VKeC7Ha0w+tu3gNex2ZlAptsfcd9RvHNzQYMK8="; }; patches = [ -- cgit 1.4.1 From b77aa34466854cd8dfd7f5ab26d2da9caa2635b3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Mar 2023 19:19:47 +0100 Subject: feedbackd: Fix crash exposed by GLib 2.76 --- pkgs/applications/misc/feedbackd/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index e3dd4f94b86..a8345035db0 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch2 , docbook-xsl-nons , docutils , gi-docgen @@ -43,6 +44,13 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + (fetchpatch2 { + url = "https://source.puri.sm/Librem5/feedbackd/-/merge_requests/109.patch"; + hash = "sha256-z3Ud6P2GHYOaGA2vJDD3Sz47+M8p0VcYZ5gbYcGydMk="; + }) + ]; + depsBuildBuild = [ pkg-config ]; -- cgit 1.4.1 From fbec7d146c8bea034f9bcc827e8efb54f7de7842 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Mar 2023 18:37:30 +0000 Subject: gvfs: 1.50.3 → 1.50.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gvfs/-/compare/1.50.3...1.50.4 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gvfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index c4604a28a41..39c06d23fdb 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.50.3"; + version = "1.50.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "aJcRnpe7FgKdJ3jhpaVKamWSYx+LLzoqHepO8rAYA/0="; + sha256 = "q5BZpnalN+2+ohOIwqr+Gn4sjxrC39xtZFUCMwdUV/0="; }; patches = [ -- cgit 1.4.1 From 40df9774dcbeb91f5b287ac462a23df4ee5e3dca Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Mar 2023 18:38:16 +0000 Subject: libadwaita: 1.3.rc → 1.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.3.rc...1.3.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libadwaita/default.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index b03c4c3535f..daf02487d08 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , gi-docgen , meson , ninja @@ -21,7 +20,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.3.rc"; + version = "1.3.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -31,23 +30,9 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-Xb1sNT1KpWspRkjuPBcAaRMXtVpXnjhm+V2FkNthEKk="; + hash = "sha256-RIJtlSBZX4+rMOGQaFn31CCEKkWtPjtzO4fcX+iApvs="; }; - patches = [ - # Fixes for the broken carousel test - # https://github.com/NixOS/nixpkgs/pull/218143#issuecomment-1456610692 - # https://gitlab.gnome.org/GNOME/libadwaita/-/merge_requests/786 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libadwaita/-/commit/cbfd8e57d5ba684c8744f6955e0435e7a09b993e.patch"; - hash = "sha256-nVJD5Eu4gjyfIJf4/6e/ah10/dSxjLk5weWKxSP8byE="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libadwaita/-/commit/78dc3b1dc8527b29c8610a1ad3dee82c8b2b3771.patch"; - hash = "sha256-Nthf5crWjNlAPI+8SQ7YfUBCcmCJrHcfkpankqSm+Ic="; - }) - ]; - depsBuildBuild = [ pkg-config ]; -- cgit 1.4.1 From c98f017a794e62b74ba69b2de6382aeb72670bd1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Mar 2023 18:38:37 +0000 Subject: libsoup_3: 3.3.1 → 3.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libsoup/-/compare/3.3.1...3.4.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libsoup/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix index 6fded45313d..e0db4e70272 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "libsoup"; - version = "3.3.1"; + version = "3.4.0"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-oLH+RcHaVHpukifdrch+H+1YbVndB0/a6vA1s5hRkZ0="; + sha256 = "sha256-I+//ascPLB6HNQfaxSZJ7sAywVl6SulRdizjEjeJrMk="; }; depsBuildBuild = [ -- cgit 1.4.1 From 742558fc05857249e827501da8daa21ca168da52 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Mar 2023 18:36:34 +0000 Subject: glib-networking: 2.76.beta → 2.76.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib-networking/-/compare/2.76.beta...2.76.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/glib-networking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index d18d108e6bd..35091bcbcfc 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.76.beta"; + version = "2.76.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "wKtbDzWDMlIQWOsH88mj/awOelIBxBMKVnvZ1s0/HaE="; + sha256 = "FJoFoXnmKaU4viVmKqMktJnXxFScUVHbU3PngKG/G5o="; }; patches = [ -- cgit 1.4.1 From 1939066a4282c7d785378c6673ced473952813b5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Mar 2023 18:47:47 +0000 Subject: evolution-data-server: 3.47.3 → 3.48.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.47.3...3.48.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/evolution-data-server/default.nix | 4 ++-- .../gnome/core/evolution-data-server/hardcode-gsettings.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index aaf4e77ec8c..aa78fb4d006 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -50,13 +50,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.47.3"; + version = "3.48.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "q40nSW/I/0E0kzZrWQvgE7aT4288iL9Ic18VTNDy6Lo="; + sha256 = "DyX3MzHt9TkJvkD0ErKoaTknAydRdhYwPzIt4VcIPDU="; }; patches = [ 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 fb52897b39e..28a81249370 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch @@ -176,10 +176,10 @@ index 42f3457..b4926af 100644 cbc->priv->update_alarms_id = 0; cbc->priv->alarm_enabled = FALSE; diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c -index 0ad47a9..161c316 100644 +index 5087de1..5c24b87 100644 --- a/src/calendar/libecal/e-reminder-watcher.c +++ b/src/calendar/libecal/e-reminder-watcher.c -@@ -2576,7 +2576,19 @@ e_reminder_watcher_init (EReminderWatcher *watcher) +@@ -2578,7 +2578,19 @@ e_reminder_watcher_init (EReminderWatcher *watcher) watcher->priv = e_reminder_watcher_get_instance_private (watcher); watcher->priv->cancellable = g_cancellable_new (); -- cgit 1.4.1 From fda0e49d011a68b8edd27ecea7d68085938fb1f8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Mar 2023 18:36:11 +0000 Subject: d-spy: 1.5.0 → 1.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/d-spy/-/compare/1.5.0...1.6.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/tools/misc/d-spy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/d-spy/default.nix b/pkgs/development/tools/misc/d-spy/default.nix index fa4292eee10..e89bad9ce49 100644 --- a/pkgs/development/tools/misc/d-spy/default.nix +++ b/pkgs/development/tools/misc/d-spy/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "d-spy"; - version = "1.5.0"; + version = "1.6.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/d-spy/${lib.versions.majorMinor version}/d-spy-${version}.tar.xz"; - sha256 = "qxOcIOMNYq1sguyTOmEvVcyWZ/Mv551FXPUHmIwjXL0="; + sha256 = "otCiEFE7tGRw0A40VEeRIIMwFT9Ms0+FhxcpEaxPiv0="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 89f5891e166e73693d98c14c9dcdc0f80610b35c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Mar 2023 18:36:16 +0000 Subject: epiphany: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/epiphany/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/epiphany/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 178eb444f81..436c3ae1391 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -4,7 +4,6 @@ , ninja , gettext , fetchurl -, fetchpatch2 , pkg-config , gtk4 , glib @@ -37,21 +36,13 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "33X7U1yAQbzvhNZSWGfVEjw58MaIUDxGBhTNs3Tp+Sk="; + sha256 = "qr3J3oDECQc2duAOFbqXGHcV5LhLx3b+htuG0PgUC7E="; }; - patches = [ - # Fix compatibility with WebkitGTk 2.39.91 - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1295.patch"; - hash = "sha256-xlgGaAzMYgwSty992EKWK5emkyZxyLoCw/HI+Uz74go="; - }) - ]; - nativeBuildInputs = [ desktop-file-utils gettext @@ -97,8 +88,8 @@ stdenv.mkDerivation rec { # Tests need an X display mesonFlags = [ "-Dunit_tests=disabled" - ] ++ lib.optionals (!withPantheon) [ - "-Dgranite=disabled" + ] ++ lib.optionals withPantheon [ + "-Dgranite=enabled" ]; passthru = { -- cgit 1.4.1 From c410f1ee0787a80bca3256dfa8cbf9d1f64b8ea8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Mar 2023 18:36:24 +0000 Subject: evolution: 3.47.3 → 3.48.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution/-/compare/3.47.3...3.48.0 Changelog-Reviewed-By: Jan Tojnar --- .../networking/mailreaders/evolution/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index e5c1f2b3992..a7d902b2d3f 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.47.3"; + version = "3.48.0"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "71o5LATDDW6UwMlwx1QDd1ABbuNsefb+nGhpsGugqDM="; + sha256 = "LYRygZWJ6S78zk8tw70STpPTedMwCXj2mpZTxZKmDvY="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 8a0877d6b42f8195afbb369ec5d2a2fd6568e219 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Mar 2023 18:36:49 +0000 Subject: gnome.gnome-autoar: 0.4.3 → 0.4.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-autoar/-/compare/0.4.3...0.4.4 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/misc/gnome-autoar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix index 683b5c22626..8d1adac088e 100644 --- a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "gnome-autoar"; - version = "0.4.3"; + version = "0.4.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "e98HiVU0lqvdw8ljsM5zY4BcDALAJf7d68qsx4cknog="; + sha256 = "wK++MzvPPLFEGh9XTMjsexuBl3eRRdTt7uKJb9rPw8I="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 365557dc4bcac6a118cb5309e587e0994f0b51d0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Mar 2023 18:36:52 +0000 Subject: gnome.gnome-boxes: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-boxes/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-boxes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index ed3e66aa759..fdc1cd053c3 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sIC8A8VFn+W4H6AtQKpgYb5ZiJf2gQ4KG37VY2p6JhQ="; + sha256 = "3WTfNNg4WGDwp68T7sEuYV+v/iFD5Yo8kuUBKPqb88k="; }; patches = [ -- cgit 1.4.1 From 63a3f11c794b6d04e77fb4df11c8a1ae263e2ad6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Mar 2023 18:36:55 +0000 Subject: gnome.gnome-chess: 43.1 → 43.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-chess/-/compare/43.1...43.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/games/gnome-chess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-chess/default.nix b/pkgs/desktops/gnome/games/gnome-chess/default.nix index e431d2de012..43b4628d2bb 100644 --- a/pkgs/desktops/gnome/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "43.1"; + version = "43.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "c08JLZX8YECe6so0J7WkjLm1mdoRmVEZ2FuqmWU+ApI="; + sha256 = "NIUI+PbnRRwHNE/6egmpkM8dKIO8z1M0CdvgKSaNSfI="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 8e42e0d6b8a6b29b01cb95b5efc639b0087950a1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Mar 2023 18:36:56 +0000 Subject: gnome.gnome-clocks: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-clocks/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-clocks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix index 3754a25687d..4f9c2c15819 100644 --- a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "FR7E9KyqyvdXj0UdqX4sRIA79quY7rfGNwSKkS9ccBA="; + sha256 = "F9epc2XLjxoCOh1491AfM1Mhf6dXfXOv59DKHjtPODg="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 9349259753a301c5294ccc2c0b3fb572348fe04c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Mar 2023 18:37:04 +0000 Subject: gnome.gnome-disk-utility: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-disk-utility/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-disk-utility/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix index ef97d6c6276..5613207b3e1 100644 --- a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-f+Nis3x+yJvk8Ct7i3GAOUlhLH+q2HtlnZSdQLlov88="; + sha256 = "sha256-AgMQl4ls2zfYcXpYI/k+NyPU385/3EACyd/LFrfno+8="; }; nativeBuildInputs = [ -- cgit 1.4.1 From ad302fde3b1b4d18ea63150b4315ecb8086ada0d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Mar 2023 18:37:06 +0000 Subject: gnome.gnome-initial-setup: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-initial-setup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index d3432365ee2..31950375369 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "nYEwjr9B8dLLDbQV40Mmj5uU8IE7/YBTRS3fTJXn+wI="; + sha256 = "WTz8bcj4KphnG5TANbl9vojvVucIeAsq0dIyTk0Eu/8="; }; patches = [ -- cgit 1.4.1 From 22b0f6b4d320bfe77370c01af38c2aae72a21405 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Mar 2023 18:37:22 +0000 Subject: gnome.gnome-sudoku: 44.beta → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-sudoku/-/compare/44.beta...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/games/gnome-sudoku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index a3222daf63d..fc26ab94f72 100644 --- a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "44.beta"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0peQtr/tH8GQvSBfTRGN8hWeGs2Uz0l8lvv0Yd2XEZQ="; + sha256 = "ZRjZIzpG1+E4Bax4dme6RwGUjZ7UGke4h5f826Q7j7o="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 83c0d6aa8dbde721c62dbf9e97992240001ca6b8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Mar 2023 18:37:35 +0000 Subject: gnome.nautilus: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/nautilus/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/nautilus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 835d2f0a711..11dac0484ba 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -38,13 +38,13 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "44.rc"; + version = "44.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "+M5JDZq6REfP+nhrLOwYUgQC6kIZa5dmo5FJOdo0wQ4="; + sha256 = "V7meu44rnBUS04HlMJYYjAh7M0ENbFLYeie9YO52rH8="; }; patches = [ -- cgit 1.4.1 From 5653c20e9a099b30c1ba5b7fc772e766efb36909 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 18 Mar 2023 01:48:09 +0000 Subject: gnome.atomix: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/atomix/-/compare/44.rc...44.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/desktops/gnome/games/atomix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/atomix/default.nix b/pkgs/desktops/gnome/games/atomix/default.nix index 54743338bc1..0d43c8e2ee7 100644 --- a/pkgs/desktops/gnome/games/atomix/default.nix +++ b/pkgs/desktops/gnome/games/atomix/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "atomix"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/atomix/${lib.versions.major finalAttrs.version}/atomix-${finalAttrs.version}.tar.xz"; - sha256 = "pujNEnUJNLv+6Grwd/uxnTcuq+GxXeemxecOjLdDJAw="; + sha256 = "yISTF2iNh9pzTJBjA1YxBSAH8qh5m2xsyRUmWIC1X7Q="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 7c8e205bae01c62611799567bef949f999dfc76d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 18 Mar 2023 01:49:12 +0000 Subject: gnome.gnome-calculator: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calculator/-/compare/44.rc...44.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/desktops/gnome/core/gnome-calculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix index 418619434c1..6d3d4b394f5 100644 --- a/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "cBEhMt0EBTm1xNnp2bl/FQZimkXUEZ4KSS/QqFwiFhg="; + sha256 = "FOdjMp+IMJp+FSeA1XNhtUMQDjI5BrNOBlX9wxW3EEM="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 4d579a337c16675b300fdee53b7579a97291fae9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 18 Mar 2023 01:51:28 +0000 Subject: gnome.gnome-system-monitor: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/compare/44.rc...44.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/desktops/gnome/core/gnome-system-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix index b8d8d3dc055..f3e2677d6e0 100644 --- a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-system-monitor"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "CnNLR1DrphUnVJF9bxdH90BmPotGi69OqegJtRKyOCY="; + sha256 = "wrq37dupKCfEyN5EKT5+PITJ5QdvMZhYh/+Jac7EXm4="; }; patches = [ -- cgit 1.4.1 From 6a4d4a4c94f8d6f382e54540a6dcf461cd700868 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 18 Mar 2023 01:54:25 +0000 Subject: gnome-online-accounts: 3.47.1 → 3.48.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/compare/3.47.1...3.48.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/development/libraries/gnome-online-accounts/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 4486182fb14..6cdc54acd29 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -32,17 +32,16 @@ stdenv.mkDerivation rec { pname = "gnome-online-accounts"; - version = "3.47.1"; + version = "3.48.0"; outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ]; - # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87 src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gnome-online-accounts"; rev = version; - sha256 = "sha256-UKw6dV7pbck1zx4ChuFrL6yv1nh7bv1fJghyqdtDJIg="; + sha256 = "sha256-USl0Qay9pSgbbp3n/L8eBaRQwaBYledht5j+afmo++o="; }; mesonFlags = [ -- cgit 1.4.1 From 946b3562e30a21c6f35188a1015b4b088fc9c754 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 18 Mar 2023 01:56:21 +0000 Subject: gtksourceview5: 5.7.2 → 5.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtksourceview/-/compare/5.7.2...5.8.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/development/libraries/gtksourceview/5.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index c27733064e0..5b12d2cfb34 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; - version = "5.7.2"; + version = "5.8.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "v5JfEp3z+Kh9cfXh7194uOqdKMUzNum4OviYhFWO3o4="; + sha256 = "EQ3Uwg3vIYhvv3dymP4O+Mwq1gI7jzbHQkQRpBSBiTM="; }; patches = [ -- cgit 1.4.1 From 5c4ca3f9ce4eb8697f53002c92634abb92068027 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 18 Mar 2023 01:58:28 +0000 Subject: libpanel: 1.1.2 → 1.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libpanel/-/compare/1.1.2...1.2.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/development/libraries/libpanel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpanel/default.nix b/pkgs/development/libraries/libpanel/default.nix index 642e199fec0..3a9c80ed9c4 100644 --- a/pkgs/development/libraries/libpanel/default.nix +++ b/pkgs/development/libraries/libpanel/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "libpanel"; - version = "1.1.2"; + version = "1.2.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/libpanel/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "H21VQlPiyOBnx4pwQM84lwyAHLpTWhGWrlmEPSJHSrk="; + sha256 = "2QVbu6uWJfP1zm0f1xMutuo0proHqH6ZOJAfuLMVgeI="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 1949813ae35a9b730f5b1b69814d9d1502aceab1 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 18 Mar 2023 15:07:05 +0000 Subject: libdex: 0.1.1 → 0.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libdex/-/compare/0.1.1...0.2.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libdex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdex/default.nix b/pkgs/development/libraries/libdex/default.nix index 5a27c2b0e21..7e17773f3f4 100644 --- a/pkgs/development/libraries/libdex/default.nix +++ b/pkgs/development/libraries/libdex/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "libdex"; - version = "0.1.1"; + version = "0.2.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libdex"; rev = version; - sha256 = "wOGHbios95s2LSCN517/cF5MS9YQ+kNliMU4iHFYges="; + sha256 = "54TwMdO29jordVqlBsMZOVtHc7s7ivf/4OkpCSNu7VE="; }; nativeBuildInputs = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; passthru.updateScript = gnome.updateScript { - packageName = pname; + packageName = "libdex"; }; meta = with lib; { -- cgit 1.4.1 From 82773150df3de49505977f24ea82d26c041fb71c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 18 Mar 2023 14:43:09 +0000 Subject: gnome-text-editor: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-text-editor/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-text-editor/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix index c5917ad12d5..52d8680fb10 100644 --- a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix @@ -11,6 +11,7 @@ , wrapGAppsHook4 , ninja , gnome +, cairo , enchant , icu , itstool @@ -24,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gnome-text-editor"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-n1tx0nqFC0c6sjzv+SHafeEIOqKyBwPZtM8bvE8dO3s="; + sha256 = "sha256-9nvDeAc0/6gV/MTF2qe1VdJORZ+B6itUjmqFwWEqMco="; }; nativeBuildInputs = [ @@ -44,6 +45,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + cairo enchant icu glib -- cgit 1.4.1 From e428d39af9192621a6ca2af835e84d27a9d507f9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 19 Mar 2023 09:43:27 +0000 Subject: evince: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evince/-/compare/44.rc...44.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/desktops/gnome/core/evince/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 7a3710088c1..cc9e2ac3965 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "44.rc"; + version = "44.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Dd34w75hRMZfJW+sDoqnx3tPQZrKCMvgkenaCM3xbIQ="; + sha256 = "M57p4AXdeCOhP+IcccLsbSxMt0VIAm5HQe7nsnA+Cdo="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 30885bf1dc97569d1a8fd05a6ae1df88f7b737e0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 19 Mar 2023 09:44:16 +0000 Subject: gjs: 1.75.90 → 1.76.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gjs/-/compare/1.75.90...1.76.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/development/libraries/gjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 3ed20f95e0d..3db1a36e3f3 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -31,13 +31,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.75.90"; + version = "1.76.0"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Yv04Az03T/cU62rjtUWSWbHFN/2CLewdkpRIA6JEX3I="; + sha256 = "sha256-pj8VaWSxNgU+q1HqATEU59fBk7dRjSjAQLawLDyTOm0="; }; patches = [ -- cgit 1.4.1 From ecc3f7ce4e9fa5b837b3849e079d3b2a175a6114 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 19 Mar 2023 09:45:19 +0000 Subject: gnome.eog: 44.beta → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/eog/-/compare/44.beta...44.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/desktops/gnome/core/eog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index 1ca57916c61..a4aaa47d08a 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "44.beta"; + version = "44.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-W0YOBHadUFDua68kdc4sKJb09W5rdm+/LkrpcfN15Fk="; + sha256 = "sha256-QdhfqwXEMImNv9hH5I4fW0k13Dy87lRudZqQftpnEFQ="; }; patches = [ -- cgit 1.4.1 From 1c66db00e2aca3ec4319ba851c176a76c49443d1 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 19 Mar 2023 09:46:49 +0000 Subject: gnome.gnome-contacts: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-contacts/-/compare/44.rc...44.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/desktops/gnome/core/gnome-contacts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix index 0645483ebe9..a8e99ecec45 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "/GTJTk/w6+o6vKF2ngEDtzUVEQ7wVQdjYhP8kRbjS2o="; + sha256 = "fdEWO8HwavY4La5AFcQ0Q+4sEpKBKPyZ/USSktDee+0="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 334391a4c56de82bbb1f6bb02054d63994faad61 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 19 Mar 2023 09:47:35 +0000 Subject: gnome.gnome-maps: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-maps/-/compare/v44.rc...v44.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/desktops/gnome/apps/gnome-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 32327e22a98..9ec1e46de36 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-x7jYEv06wyabjciVnYTXecRocogVao7AvZzBN+mj+KU="; + sha256 = "sha256-YAPrc92f0mm0qRvtm/A+6askDFEk7tq/KL4io/77pZU="; }; doCheck = true; -- cgit 1.4.1 From f976d638a3cc77f5476a332ce197bbffba8039cd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 19 Mar 2023 09:48:13 +0000 Subject: gnome.gnome-remote-desktop: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/compare/44.rc...44.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index e7f85e10dc1..32d1b6a0722 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-rZYLgX+oG0/tlTkjeUxxBJESnWIsXRdjmL5ERnW7tbQ="; + hash = "sha256-9+UIjBj9sIaQrgNL92oa6tWafc0Xsm4ffJl1SAUQoP0="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 3beee4dd11167069998bb7367d4e376dad48a525 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 19 Mar 2023 09:50:58 +0000 Subject: gnome-builder: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-builder/-/compare/44.rc...44.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/applications/editors/gnome-builder/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 298c819e4f3..3f9edca661b 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "44.rc"; + version = "44.0"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ly52FVZjM2822adhWEZY4Nor1CbgfwVyycwA638ojb8="; + sha256 = "LrFGnlsZ6gzFTGa59+eqSQwLG6oZ9A/fC5FOZDl+UW4="; }; patches = [ @@ -63,6 +63,14 @@ stdenv.mkDerivation rec { # # Typelib file for namespace 'Pango', version '1.0' not found (g-irepository-error-quark, 0) ./fix-finding-test-typelibs.patch + + # Fix build with libadwaita 1.3 + # https://gitlab.gnome.org/GNOME/gnome-builder/-/issues/2010 + # https://gitlab.gnome.org/GNOME/libadwaita/-/merge_requests/792 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/d89a5c95e43f4a4e1a4e9d063e3962bac8e51db0.patch"; + sha256 = "sha256-dSMccodjhGKIGuj+2hi8fxZ3ZQ/pioQYQ36+vpOuJPY="; + }) ]; nativeBuildInputs = [ -- cgit 1.4.1 From 7244b02ff8d8d895f9cbc0025d623b99b51c3c54 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 19 Mar 2023 09:51:18 +0000 Subject: gnome-connections: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/connections/-/compare/44.rc...44.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/desktops/gnome/apps/gnome-connections/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-connections/default.nix b/pkgs/desktops/gnome/apps/gnome-connections/default.nix index 5fbbf6a8556..13dc7cd9690 100644 --- a/pkgs/desktops/gnome/apps/gnome-connections/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-connections/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-connections"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-fnUP9gP5SEbo7RyPczemWOhix4epzUI3b0Bf2utQtPM="; + hash = "sha256-NMemu/7Jqaz6nC0tukslFDHNcYdPjwVcX/JvJvQkQZk="; }; nativeBuildInputs = [ -- cgit 1.4.1 From d20c945e02bb414fd31d1c7f11b082df6d4a612e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 19 Mar 2023 09:52:16 +0000 Subject: gnome-user-docs: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-user-docs/-/compare/44.rc...44.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/data/documentation/gnome-user-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index 5c40607a012..cd506b61c59 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "yy74MJKqsU1SYVctpjycIqf5hxKyI0z0R56gGu0ieuQ="; + sha256 = "z2zX65xBSd2Tlm9x+huQevyPZR7MOvVOEIW89K0hsb0="; }; nativeBuildInputs = [ -- cgit 1.4.1 From df1ef059cd6c31627bae0f23472e606bdc3cf01b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 19 Mar 2023 09:56:03 +0000 Subject: libpeas: 1.34.0 → 1.36.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libpeas/-/compare/libpeas-1.34.0...libpeas-1.36.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/development/libraries/libpeas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index e218a78bdfc..a345ac704bc 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libpeas"; - version = "1.34.0"; + version = "1.36.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "QwX3Fdq0ta0+gAfa7DFmJecGWpTmPiXvVese+5ZKe/A="; + sha256 = "KXy5wszNjoYXYj0aPoQVtFMLjlqJPjUnu/0e3RMje0w="; }; depsBuildBuild = [ -- cgit 1.4.1 From 51dbeb8d1e58258b9993e17c2f04e8d99593947d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 19 Mar 2023 10:56:34 +0000 Subject: gnome.gnome-terminal: 3.47.99 → 3.48.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-terminal/-/compare/3.47.99...3.48.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/desktops/gnome/core/gnome-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix index 19a73bbe040..b1db819e1c2 100644 --- a/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -29,14 +29,14 @@ stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.47.99"; + version = "3.48.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gnome-terminal"; rev = version; - sha256 = "sha256-EsXVW2XxRNLchJGAJ6BGCN6KdKF2wz/p49wBhdPObgQ="; + sha256 = "sha256-Co0RnDprY1eJhXdOzs43nniXzpaFtBpnr13StMDw4+8="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 305984ae0774386179102c3ef5a3e35ce691da96 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Mar 2023 00:57:14 +0000 Subject: at-spi2-core: 2.47.90 → 2.48.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/at-spi2-core/-/compare/AT_SPI2_CORE_2_47_90...AT_SPI2_CORE_2_48_0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/at-spi2-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index e692244e69a..bf67c67b0d4 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.47.90"; + version = "2.48.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "cRicIa970IShKrhbIpwteYk2RwsS+ww/F343GB+2wAw="; + sha256 = "kFpbbxeQto7oA7/6n1+rTOtZH7T64LL4xhLFTx1OijA="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 2bcd9e2658570df444143878958f6d6372e1c846 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Mar 2023 00:58:38 +0000 Subject: gnome-desktop: 44.beta → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-desktop/-/compare/44.beta...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gnome-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnome-desktop/default.nix b/pkgs/development/libraries/gnome-desktop/default.nix index f5b5cf19548..db95029c804 100644 --- a/pkgs/development/libraries/gnome-desktop/default.nix +++ b/pkgs/development/libraries/gnome-desktop/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "44.beta"; + version = "44.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Km93B82bnMdzW7ryxbTFz4BZbvn0WxS7Nddt5H0a3kU="; + sha256 = "sha256-QsdzdF2EuhS8HPHExvRgYUiAOlzTN5QcY5ZHlfPFnUI="; }; patches = lib.optionals stdenv.isLinux [ -- cgit 1.4.1 From 1a1e543c7e55171b7dae9b95bc1994a9a8f36b3c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Mar 2023 00:58:52 +0000 Subject: gsettings-desktop-schemas: 44.beta → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/compare/44.beta...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gsettings-desktop-schemas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index 56d4c95d225..3f3bb65fbe4 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "44.beta"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Fk7gdvQpMIM3CGeOsxgdBv4u/Mv5RNqRHMgIgcPxKtQ="; + sha256 = "6y3kXK2QWZSEnmQqYjret11BshsGJtQNKge46igf7A4="; }; strictDeps = true; -- cgit 1.4.1 From 91aee608316b04d65c54ee2b191e557ee7c39917 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Mar 2023 00:59:04 +0000 Subject: jsonrpc-glib: 3.43.0 → 3.44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/jsonrpc-glib/-/compare/3.43.0...3.44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/jsonrpc-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index 174433db91a..855c3cfcf2c 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "jsonrpc-glib"; - version = "3.43.0"; + version = "3.44.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "DySHRkeO9g/fL7JV99u+1FuHFQvyhV7AqGYQeRjexBM="; + sha256 = "aUBqAlDQzFF1QIyufsqAwMa/rvxK4YMLNUwEM7zVzgY="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 781dce32a9448ca45b63c183204259c87581c630 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Mar 2023 00:59:38 +0000 Subject: python3.pkgs.pygobject3: 3.43.1 → 3.44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/pygobject/-/compare/3.43.1...3.44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/python-modules/pygobject/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 2d74b75dd18..2652db12e7f 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pygobject"; - version = "3.43.1"; + version = "3.44.0"; outputs = [ "out" "dev" ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "55ImenkMC5kJkru8QUmIy5apXAotSBQ2Xn9WzfqN9hM="; + sha256 = "9oY9ajtw2azkw2qZAdOeQsiAHREwnKKos0WdHCTjS38="; }; depsBuildBuild = [ -- cgit 1.4.1 From 7d9863eae24cf0aafcc56f7b21cea8e91810d5a2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Mar 2023 00:59:39 +0000 Subject: sysprof: 3.46.0 → 3.48.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/sysprof/-/compare/3.46.0...3.48.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/tools/profiling/sysprof/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index fed8af725fb..94293fe8529 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "sysprof"; - version = "3.46.0"; + version = "3.48.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "PkMNV4FQqN0LB1sX0vzBunBNQogCYvDMZR8z5JO+QHE="; + sha256 = "B9kIGmbPL7UnU/SP8rha2nXGD/G8GvG9FNiutieXIWg="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 136bbb1267d12c3dbc76fb9f8c22d81e26c79452 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Mar 2023 00:59:42 +0000 Subject: tracker: 3.5.0.rc → 3.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tracker/-/compare/3.5.0.rc...3.5.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/tracker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 262bacf68f9..1be0512255d 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "3.5.0.rc"; + version = "3.5.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "AgM6XOsTmc9H0CQugj9zNePC7qG+v1fpW7GslvrD7yM="; + sha256 = "EylCddu7rZY0s6g5DAjm8Svr/oT2zK+3Kyewwjuo2i8="; }; strictDeps = true; -- cgit 1.4.1 From d2d4cd97d536187b0203d23966dba7894b34545b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Mar 2023 02:03:58 +0100 Subject: webkitgtk: 2.39.91 → 2.40.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://webkitgtk.org/2023/03/17/webkitgtk2.40.0-released.html Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/webkitgtk/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 56d9a2f9e41..be3a5b26cab 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -2,7 +2,6 @@ , stdenv , runCommand , fetchurl -, fetchpatch2 , perl , python3 , ruby @@ -72,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.39.91"; + version = "2.40.0"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -83,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-kuim9ZlFBSnrC9VS5PwtH2kYMetNicr/uW+1gdLINtM="; + hash = "sha256-pGB+ob+JZp6JscssY/quxRP5PeCbauYMxx1qiqt6s5M="; }; patches = lib.optionals stdenv.isLinux [ @@ -99,17 +98,6 @@ stdenv.mkDerivation (finalAttrs: { src = ./fdo-backend-path.patch; wpebackend_fdo = libwpe-fdo; }) - - # Various build fixes for 2.39.91, should be part of final release - # https://src.fedoraproject.org/rpms/webkitgtk/blob/1c16daccce69d47df5381968e9c7be8ed72e4f90/f/fix-installed-headers.patch - (fetchpatch2 { - url = "https://github.com/WebKit/WebKit/commit/53a8890833684fe813efd7b7a2b7417dbfa7b826.patch"; - hash = "sha256-utenJzQMr8AUMRT6CL06hi5sXPiXEJJmM7Vht+qxiw8="; - }) - (fetchpatch2 { - url = "https://github.com/WebKit/WebKit/commit/10c9256883bf38b9fbcfbc91577783d4df90d1bd.patch"; - hash = "sha256-eXMRh9oEcBeOiJvj+kRJHEIUwnviBvlI2JdBS6MVxtk="; - }) ]; preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' -- cgit 1.4.1 From 86d3c315635b23f82779180d7b2d1afb724a2b88 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Mar 2023 00:59:45 +0000 Subject: tracker-miners: 3.5.0.rc → 3.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tracker-miners/-/compare/3.5.0.rc...3.5.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/tracker-miners/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 82807018038..b32df6b026a 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.5.0.rc"; + version = "3.5.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "eSv03f+RT7I8Xw3YAFk/qmihi1lLHmtZKn2Bcop+Fgs="; + sha256 = "F5ZmA9xDKphSa0kFhqSKzX+fWZNfeJXfxRcppGppAaM="; }; nativeBuildInputs = [ -- cgit 1.4.1 From d4ef4a731a6620bed3f404b64289c73463c95a8f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Mar 2023 00:59:48 +0000 Subject: xdg-desktop-portal-gnome: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix index f1863fc28f7..3848f1cc953 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gnome"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "rj4WkLhwoJYqnyXBTp7EZtcSpPZpXVgKU/HfJblWzgI="; + sha256 = "VQEeV/ZLfK8IN0Be+gNKM2uec965+E5cFMyfeo4OezQ="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 1860d0e98bc3e83a16c16fa7e38818aafe61a992 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Mar 2023 00:57:16 +0000 Subject: baobab: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/baobab/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/baobab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/baobab/default.nix b/pkgs/desktops/gnome/core/baobab/default.nix index bb1f9db4821..d27c4947c33 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 = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "OWQcMnSsyh+htFhsImSWKQFAd8n1J6ib9W8s3nHZUEM="; + sha256 = "hFtju5Ej10VoyBJsVxu8dCc0g/+SAXmizx7du++hv8A="; }; nativeBuildInputs = [ -- cgit 1.4.1 From ef9c58f485f883f9f5429de244483353b1f41a66 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Mar 2023 00:57:45 +0000 Subject: gnome.gnome-characters: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-characters/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-characters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/pkgs/desktops/gnome/apps/gnome-characters/default.nix index f59d72ed2af..08f73059502 100644 --- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "OttXTRC2i3oE15werAYS+FnGtyUjffDvO34mVxgKSbc="; + sha256 = "BbFcAozBkK75LmCS/YT6jV8kSODpB2RGo1ZvOggf9Qs="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 3ff89d67b6d20ca9a2762cd3cc5c013249afe0b3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Mar 2023 00:57:49 +0000 Subject: gnome.gnome-control-center: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index eb89ef7b586..f61c49fe4cf 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -64,11 +64,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-9AsZeClzh0y3go70oGV75ZcZoCbfat1uc5kqwuerUQI="; + sha256 = "sha256-vb+rTPI9BXNAltsfn2+sfu0/y52jK/Sx8m7ToE5avGY="; }; patches = [ -- cgit 1.4.1 From cde8da6126a55e60ef833f46143fb0cf767893af Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Mar 2023 00:57:53 +0000 Subject: gnome.gnome-font-viewer: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-font-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix index 3389ddb37cb..30fafeee2ae 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 = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "9olDJvoL8/hc/SeA7hQv0V9UdBo9PQ6pIY39o4O1yOw="; + sha256 = "oVEd8wsijMLvEXXdnSuTQ46pEuJZE0BLJjzz1Fe7n5c="; }; doCheck = true; -- cgit 1.4.1 From 57446c1eb97b5485c008ddb33ed960b58d7ba82f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Mar 2023 00:58:20 +0000 Subject: gnome.mutter: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mutter/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/mutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index c4c1ae6be40..76228560bba 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -65,13 +65,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "44.rc"; + version = "44.0"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - sha256 = "aQynddetFbm1DA48J2w+xH/Fvi+AVhLDZ1guay3jgls="; + sha256 = "chSwfhNYnvfB31U8ftEaAnmOQ62mwiiRP056Zm7vusQ="; }; mesonFlags = [ -- cgit 1.4.1 From 6805ba9b3b07fe549859506e6dd54ca014846a9e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Mar 2023 00:58:05 +0000 Subject: gnome.gnome-shell: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-shell/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index a4addfd14a3..8421d8ed04b 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -67,13 +67,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "44.rc"; + version = "44.0"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Gy+x3fS7hWj/Du3Wqz19V7ider7iICt7hTmtu6gV55g="; + sha256 = "MxCtwd1OIQmY1Z84cbwx9+BJFUKNnO2IwqZrKwXWwAo="; }; patches = [ @@ -104,6 +104,14 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/9a647c460b651aaec0b8a21f046cc289c1999416/f/0001-gdm-Work-around-failing-fingerprint-auth.patch"; sha256 = "pFvZli3TilUt6YwdZztpB8Xq7O60XfuWUuPMMVSpqLw="; }) + + # Logout/reboot/poweroff timeout leaves the session in a broken state + # https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6506 + # Should be part of 44.1 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/5766d4111ac065b37417bedcc1b998ab6bee5514.patch"; + sha256 = "d9oEzRnVbaFeCaBFhfLnW/Z8FzyQ7J8L7eAQe91133k="; + }) ]; nativeBuildInputs = [ -- cgit 1.4.1 From 0ac63b9e9e6217b6674f0addf6d1eb060f640749 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Mar 2023 00:58:06 +0000 Subject: gnome.gnome-shell-extensions: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/compare/44.rc...44.0 Meson is now compiling the schemas, let’s stop compiling them ourselves and clean up the postFixup a bit. Changelog-Reviewed-By: Jan Tojnar --- .../gnome/core/gnome-shell-extensions/default.nix | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 9603ab2a89c..56f0e610229 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 rec { pname = "gnome-shell-extensions"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "lDmnAy2gHAjktTg1AE9Kt6P0ANUN1uE0emPZ36+Ac0A="; + sha256 = "jDRecvMaHjf1UGPgsVmXMBsBGU7WmHcv2HrrUMuxAas="; }; patches = [ @@ -40,23 +40,23 @@ stdenv.mkDerivation rec { ]; preFixup = '' - # The meson build doesn't compile the schemas. - # Fixup adapted from export-zips.sh in the source. + # Since we do not install the schemas to central location, + # let’s link them to where extensions installed + # through the extension portal would look for them. + # Adapted from export-zips.sh in the source. extensiondir=$out/share/gnome-shell/extensions schemadir=${glib.makeSchemaPath "$out" "$name"} - glib-compile-schemas $schemadir - for f in $extensiondir/*; do - name=`basename ''${f%%@*}` - uuid=$name@gnome-shell-extensions.gcampax.github.com + name=$(basename "''${f%%@*}") schema=$schemadir/org.gnome.shell.extensions.$name.gschema.xml + schemas_compiled=$schemadir/gschemas.compiled - if [ -f $schema ]; then - mkdir $f/schemas - ln -s $schema $f/schemas; - glib-compile-schemas $f/schemas + if [[ -f $schema ]]; then + mkdir "$f/schemas" + ln -s "$schema" "$f/schemas" + ln -s "$schemas_compiled" "$f/schemas" fi done ''; -- cgit 1.4.1 From 1abc33572b3164f34e552bd6b81e1b73563cadb4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Mar 2023 00:58:05 +0000 Subject: gnome.gnome-settings-daemon: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index 7f4e339ab44..d93384f9b9f 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "GyBy6IHZgquSv4eVh/ZuUjfKyReCxgpmYO139CtJuSY="; + sha256 = "tBetocE0KozymDfs8t7Jvc23VCNbGhYbZDXD0R8hCZk="; }; patches = [ -- cgit 1.4.1 From b2e4b60a5782e187378c47772916c7c8f3969423 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Mar 2023 00:58:14 +0000 Subject: gnome.gnome-weather: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-weather/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-weather/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/pkgs/desktops/gnome/apps/gnome-weather/default.nix index 10a8562f850..51582a96c65 100644 --- a/pkgs/desktops/gnome/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "7qdhESvlmN9b0n2Ir1zskhbFiM8IRtwr0ei28NTURPg="; + sha256 = "aw04rHhQQWmd9iiSbjXbe1/6CG7g1pNMIioZxrmSO68="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 26ac2741129f8e84a34949f998dc2db9801a7882 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Mar 2023 00:58:29 +0000 Subject: simple-scan: 42.5 → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/simple-scan/-/compare/42.5...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/simple-scan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/simple-scan/default.nix b/pkgs/desktops/gnome/core/simple-scan/default.nix index 07910cd8c76..9d7e60eed64 100644 --- a/pkgs/desktops/gnome/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome/core/simple-scan/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "42.5"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-BfXfpOniBu+p1ATJhh3XxEIJF5PnNMQXGXOZFyUOQFA="; + sha256 = "sha256-Obhw/Ub0R/dH6uzC3yYEnvdzGFCZ8OE8Z1ZWJk3ZjpU="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 5d796ac124ff34b42007239d121e08188d32350b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Mar 2023 00:58:36 +0000 Subject: gnome-console: 44.beta → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/console/-/compare/44.beta...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/applications/terminal-emulators/gnome-console/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix index 698cb3e225c..460b6426cdf 100644 --- a/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gnome-console"; - version = "44.beta"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "kmM/Mfk2+kvBjib8JQd4MOEpYvty7dXB+nX1/oNLku4="; + sha256 = "0cGv1eyNK9+Eo9sCmwSiQy7Me80kLCp0X+mYakKJiEQ="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 71a009844bb9f771b67d13fb966209cb8d982697 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Mar 2023 02:30:31 +0000 Subject: vte: 0.71.99 → 0.72.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vte/-/compare/0.71.99...0.72.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/vte/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 11e33ceb979..a8fed065198 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.71.99"; + version = "0.72.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Fbf0Lkgzs1JbvcAG1Wye5WdmxNY4r/VrOSlUtK090Ys="; + sha256 = "sha256-QP6RTWxw2zQXbJInJbbG6hXV88sqm0TFfiAKX5UKZzY="; }; patches = [ -- cgit 1.4.1 From 2f269a8919d3712f47fb252f9524f90b2788782d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 20 Mar 2023 11:21:27 +0000 Subject: gnome.gnome-backgrounds: 44.beta → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/compare/44.beta...44.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/desktops/gnome/core/gnome-backgrounds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix index 392ecb929d2..3710866a41a 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 = "44.beta"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "UBPTQ4gq+84r35GoiwewsNkG1m3jY8+UOG/oaLbg6cA="; + sha256 = "SoOTs4cTXypqQkoaDDrJTgdCtiuCNaCSPJKfUeBL4E4="; }; patches = [ -- cgit 1.4.1 From 2a8aa873f24a56eca26c03d1553ef61e43768c54 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 20 Mar 2023 11:26:32 +0000 Subject: gnome-tour: 43.0 → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-tour/-/compare/43.0...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-tour/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-tour/default.nix b/pkgs/desktops/gnome/core/gnome-tour/default.nix index c7edd87d122..c471417d616 100644 --- a/pkgs/desktops/gnome/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome/core/gnome-tour/default.nix @@ -11,7 +11,7 @@ , gdk-pixbuf , desktop-file-utils , appstream-glib -, wrapGAppsHook +, wrapGAppsHook4 , python3 , gnome , libadwaita @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-tour"; - version = "43.0"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-E1HkGWJ/vXx3GTKm7xrYDAvy5oKMSUigYgaJhN2zzIg="; + hash = "sha256-Bt52d90cWQ0OozoDLJzPTDfGK8ViFbgjyHnkLuYwwrY="; }; cargoVendorDir = "vendor"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { python3 rustPlatform.cargoSetupHook rustc - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ -- cgit 1.4.1 From 63646fed4195011620fdf4c9a485b2354509148d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 21 Mar 2023 08:14:53 +0000 Subject: gnome-builder: 44.0 → 44.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-builder/-/compare/44.0...44.1 Changelog-Reviewed-By: Bobby Rong --- pkgs/applications/editors/gnome-builder/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 3f9edca661b..2e43f8b66ee 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -5,7 +5,6 @@ , desktop-file-utils , editorconfig-core-c , fetchurl -, fetchpatch , flatpak , gnome , libgit2-glib @@ -42,13 +41,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "44.0"; + version = "44.1"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "LrFGnlsZ6gzFTGa59+eqSQwLG6oZ9A/fC5FOZDl+UW4="; + sha256 = "+Tmn+VtLbh0EvY20vpygtnsqp2W4bGP03yP9s6ftzz4="; }; patches = [ @@ -63,14 +62,6 @@ stdenv.mkDerivation rec { # # Typelib file for namespace 'Pango', version '1.0' not found (g-irepository-error-quark, 0) ./fix-finding-test-typelibs.patch - - # Fix build with libadwaita 1.3 - # https://gitlab.gnome.org/GNOME/gnome-builder/-/issues/2010 - # https://gitlab.gnome.org/GNOME/libadwaita/-/merge_requests/792 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/d89a5c95e43f4a4e1a4e9d063e3962bac8e51db0.patch"; - sha256 = "sha256-dSMccodjhGKIGuj+2hi8fxZ3ZQ/pioQYQ36+vpOuJPY="; - }) ]; nativeBuildInputs = [ -- cgit 1.4.1 From d4b2e063c65213f0f6646c719fe97fef0c2dec67 Mon Sep 17 00:00:00 2001 From: Erin van der Veen Date: Wed, 22 Mar 2023 21:00:23 +0100 Subject: gegl: add patch to pass test gegl_tile --- pkgs/development/libraries/gegl/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index ecf9090864d..619226fb2cc 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , pkg-config , vala , gobject-introspection @@ -47,6 +48,18 @@ stdenv.mkDerivation rec { sha256 = "q6g6DLqmxW7cKeoi8ugXKVClO5bapRWSCD1ZIivd4C0="; }; + patches = [ + # Fix memory management issues revealed by GLib 2.76 update. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gegl/-/commit/f2f2cea219f2265e152e3308004dc98d2fd48f33.patch"; + hash = "sha256-5GR8zHvuiH9eapPDnIEGr/ksYw6feKqMaJlmj83R4XY="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gegl/-/commit/79e28a7d3a843114588f4b5a095ff7a797c0e2e1.patch"; + hash = "sha256-+2iT+THlLcOgFvGl76IUWGhww+H8rzDWmXn0Kq6YCUk="; + }) + ]; + nativeBuildInputs = [ pkg-config gettext -- cgit 1.4.1 From de66a960d683a74ebed169bf1595a4cdc15cfdd6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 22 Mar 2023 22:29:04 +0000 Subject: evince: 44.0 → 44.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evince/-/compare/44.0...44.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/evince/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index cc9e2ac3965..95b1c358b71 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "44.0"; + version = "44.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "M57p4AXdeCOhP+IcccLsbSxMt0VIAm5HQe7nsnA+Cdo="; + sha256 = "Fa/TuxX/s4/sqzTCM1CVCtJwqwOoW5TjM9ndfuanQxQ="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 4333d6dc95fdeca23491486c144b71eb6c719c20 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 22 Mar 2023 22:29:17 +0000 Subject: gnome.adwaita-icon-theme: 44.beta → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/compare/44.beta...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix index ca1a08b7d74..8be9575b6de 100644 --- a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "44.beta"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "dyoVbuViRNbVa3b3DPxubkpGZqtIwjS3w+laYmo5qNY="; + sha256 = "SInFYBu/7NJdgLo0IgnQqTbc9pHuVr1uykzeNh8aZkw="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 14cbd4b053aaa7fc6ac9d7a854570d228c11e13d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 22 Mar 2023 22:29:20 +0000 Subject: glib: 2.76.0 → 2.76.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib/-/compare/2.76.0...2.76.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/glib/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 3c97e542f9b..d52ea735f8f 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -56,11 +56,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.76.0"; + version = "2.76.1"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - sha256 = "Ulu3A7gHFC4a7lzPIiw0ToBkshwMRWd+9ZTlh4dMZ5c="; + sha256 = "Q9wPahJpWPW0VBNsQ5jqtCAknBYXGnaXhEhuJfL9oZ8="; }; patches = lib.optionals stdenv.isDarwin [ @@ -102,13 +102,6 @@ stdenv.mkDerivation (finalAttrs: { # Disable flaky test. # https://gitlab.gnome.org/GNOME/glib/-/issues/820 ./skip-timer-test.patch - - # Fix API break breaking C++ apps. - # https://gitlab.gnome.org/GNOME/glib/-/issues/2936 - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/glib/-/commit/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch"; - hash = "sha256-8y+rl17buxazMK9Oj28CasC9AyRwt700knyCL1jDIJ0="; - }) ]; outputs = [ "bin" "out" "dev" "devdoc" ]; -- cgit 1.4.1 From 2a32c75d1d1ac98d3fe19fcae0431bf9dd4acbb6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 22 Mar 2023 22:29:28 +0000 Subject: gnome.gdm: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gdm/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix index 21827476bfa..55044682da1 100644 --- a/pkgs/desktops/gnome/core/gdm/default.nix +++ b/pkgs/desktops/gnome/core/gdm/default.nix @@ -43,13 +43,13 @@ in stdenv.mkDerivation rec { pname = "gdm"; - version = "44.rc"; + version = "44.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "dxa9nkOVb4EpmZvdaLNs5ucCS8RHlFpYN2A4LTtSdok="; + sha256 = "ziCwoiHb+M3gBktQH9jzj3ODkVKFfEU1M36wnMUvf2w="; }; mesonFlags = [ -- cgit 1.4.1 From bf3a5c815a089c89cc766fdbcbdaf90fff5efc3b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 22 Mar 2023 22:29:48 +0000 Subject: gnome.gnome-music: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-music/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-music/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix index fd8acf509aa..d66efad0728 100644 --- a/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -30,13 +30,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "44.rc"; + version = "44.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PfHJTph3193a2btUujw/QmsGAFsqbbG75VB+cngDNhE="; + sha256 = "m9GqyVcuYkcgJKaVDYOubyhr4zzZx3fz1E+hbQOPHVE="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 4ec1018c41282f0cbbd1f6bac12cda9545606bf7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 22 Mar 2023 22:29:56 +0000 Subject: gnome.gnome-session: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-session/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gnome-session/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-session/default.nix b/pkgs/desktops/gnome/core/gnome-session/default.nix index 04cf3ed407c..dcafff9e0ec 100644 --- a/pkgs/desktops/gnome/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome/core/gnome-session/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "gnome-session"; # Also bump ./ctl.nix when bumping major version. - version = "44.rc"; + version = "44.0"; outputs = [ "out" "sessions" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-session/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "A2WZUL53yX2O/92oOJJqX/3H0F/fmBNvwOl4djTnGkE="; + sha256 = "zPgpqWUmE16en5F1JlFdNqUJK9+jFvNzfdjFpSTb8sY="; }; patches = [ -- cgit 1.4.1 From ec3f75d01cbfb3e3ba43f43652d2f1d7cda4ee25 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 23 Mar 2023 00:21:36 +0100 Subject: nixos/doc/rl-2305: Mention GNOME 44 --- nixos/doc/manual/release-notes/rl-2305.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 20e9a89f218..855c353da91 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -18,6 +18,8 @@ In addition to numerous new and upgraded packages, this release has the followin - Cinnamon has been updated to 5.6, see [the pull request](https://github.com/NixOS/nixpkgs/pull/201328#issue-1449910204) for what is changed. +- GNOME has been upgraded to version 44. Please see the [release notes](https://release.gnome.org/44/) for details. + - KDE Plasma has been updated to v5.27, see [the release notes](https://kde.org/announcements/plasma/5/5.27.0/) for what is changed. - `nixos-rebuild` now supports an extra `--specialisation` option that can be used to change specialisation for `switch` and `test` commands. -- cgit 1.4.1 From 4c434c4c3bbe59e2d817ca60690bace8341c0813 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 23 Mar 2023 20:28:11 +0000 Subject: gobject-introspection: 1.76.0 → 1.76.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gobject-introspection/-/compare/1.76.0...1.76.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gobject-introspection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index f858fce0f76..ea226337045 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -36,7 +36,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gobject-introspection"; - version = "1.76.0"; + version = "1.76.1"; # outputs TODO: share/gobject-introspection-1.0/tests is needed during build # by pygobject3 (and maybe others), but it's only searched in $out @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gobject-introspection/${lib.versions.majorMinor finalAttrs.version}/gobject-introspection-${finalAttrs.version}.tar.xz"; - sha256 = "hVL/OlZ1i426IdQheVpSuan7+YRWWQe4Pxxk9N64OAw="; + sha256 = "GWF4v2Q0VQHc3E2EabNqpv6ASJNU7+cct8uKuCo3OL8="; }; patches = [ -- cgit 1.4.1 From 700a3ddc256436babfe38e01c1dd4b318da3b736 Mon Sep 17 00:00:00 2001 From: Erin van der Veen Date: Fri, 24 Mar 2023 09:12:42 +0100 Subject: dee: disable unused-result error --- pkgs/development/libraries/dee/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index 25cf88253e6..4a2199f450e 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -56,6 +56,10 @@ stdenv.mkDerivation rec { "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; + # Compilation fails after a change in glib where + # g_string_free now returns a value + env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; + enableParallelBuilding = true; meta = with lib; { -- cgit 1.4.1 From 59f3104579c7ef3881f82bd3271249899a24ecb7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 24 Mar 2023 18:07:16 +0000 Subject: gnome.ghex: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/ghex/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/ghex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix index 0317d2757e2..96c1633b8da 100644 --- a/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/pkgs/desktops/gnome/apps/ghex/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "ghex"; - version = "44.rc"; + version = "44.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "iTjiWFM/DDW2MR/KD2RZ4vhu2xJ/xNSoz/oi21Lg17M="; + sha256 = "WKpHz9vtEoCjwTGVHBokWWEpQEoLDTR6Pb//tv9oOXY="; }; nativeBuildInputs = [ -- cgit 1.4.1 From ed090bc4ab3b3dc5efedc5a40acdb392d8bd2d38 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 24 Mar 2023 18:09:00 +0000 Subject: orca: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/orca/-/compare/ORCA_44_RC...ORCA_44_0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/applications/misc/orca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 8a399ad3d4c..e80da5170ac 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -34,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "44.rc"; + version = "44.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "pVG+LdbqRtfO5TTOyk0cH8HM+lL5E6pSizNXmf4oifs="; + sha256 = "e8WX7AvBtnQgC2L995XUuulkemNxfXVN9hWHzCUFAs4="; }; patches = [ -- cgit 1.4.1 From 0296aa20e54146d5e97f059ac043a983f7d2f4e9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 23 Mar 2023 23:46:35 +0800 Subject: pantheon.mutter: 42.7 -> 43.4 https://gitlab.gnome.org/GNOME/mutter/-/compare/42.7...43.3 https://gitlab.gnome.org/GNOME/mutter/-/compare/43.3...43.4 --- pkgs/desktops/gnome/core/mutter/42/default.nix | 168 -------------------- pkgs/desktops/gnome/core/mutter/42/fix-paths.patch | 13 -- pkgs/desktops/gnome/core/mutter/43/default.nix | 175 +++++++++++++++++++++ pkgs/desktops/gnome/default.nix | 3 +- pkgs/desktops/pantheon/default.nix | 2 +- 5 files changed, 178 insertions(+), 183 deletions(-) delete mode 100644 pkgs/desktops/gnome/core/mutter/42/default.nix delete mode 100644 pkgs/desktops/gnome/core/mutter/42/fix-paths.patch create mode 100644 pkgs/desktops/gnome/core/mutter/43/default.nix diff --git a/pkgs/desktops/gnome/core/mutter/42/default.nix b/pkgs/desktops/gnome/core/mutter/42/default.nix deleted file mode 100644 index 3ee9f155df4..00000000000 --- a/pkgs/desktops/gnome/core/mutter/42/default.nix +++ /dev/null @@ -1,168 +0,0 @@ -{ fetchurl -, fetchpatch -, substituteAll -, runCommand -, lib -, stdenv -, pkg-config -, gnome -, gettext -, gobject-introspection -, cairo -, pango -, json-glib -, libstartup_notification -, zenity -, libcanberra -, ninja -, xvfb-run -, xkeyboard_config -, libxcvt -, libxkbfile -, libXdamage -, libxkbcommon -, libXtst -, libinput -, libdrm -, gsettings-desktop-schemas -, glib -, gtk3 -, gnome-desktop -, pipewire -, libgudev -, libwacom -, xwayland -, mesa -, meson -, gnome-settings-daemon -, xorgserver -, python3 -, wrapGAppsHook -, sysprof -, libsysprof-capture -, desktop-file-utils -, libcap_ng -, egl-wayland -, graphene -, wayland-protocols -}: - -let self = stdenv.mkDerivation rec { - pname = "mutter"; - version = "42.7"; - - outputs = [ "out" "dev" "man" ]; - - src = fetchurl { - url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "OwmmsHDRMHwD2EMorIS0+m1jmfk4MEo4wpTxso3yipM="; - }; - - patches = [ - # Fix build with separate sysprof. - # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2572 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch"; - sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU="; - }) - - (substituteAll { - src = ./fix-paths.patch; - inherit zenity; - }) - ]; - - mesonFlags = [ - "-Degl_device=true" - "-Dinstalled_tests=false" # TODO: enable these - "-Dwayland_eglstream=true" - "-Dprofiler=true" - "-Dxwayland_path=${xwayland}/bin/Xwayland" - # This should be auto detected, but it looks like it manages a false - # positive. - "-Dxwayland_initfd=disabled" - ]; - - propagatedBuildInputs = [ - # required for pkg-config to detect mutter-clutter - json-glib - libXtst - libcap_ng - graphene - ]; - - nativeBuildInputs = [ - desktop-file-utils - gettext - libxcvt - mesa # needed for gbm - meson - ninja - xvfb-run - pkg-config - python3 - wrapGAppsHook - xorgserver - ]; - - buildInputs = [ - cairo - egl-wayland - glib - gnome-desktop - gnome-settings-daemon - gobject-introspection - gsettings-desktop-schemas - gtk3 - libcanberra - libdrm - libgudev - libinput - libstartup_notification - libwacom - libxkbcommon - libxkbfile - libXdamage - pango - pipewire - sysprof # for D-Bus interfaces - libsysprof-capture - xkeyboard_config - xwayland - wayland-protocols - ]; - - postPatch = '' - patchShebangs src/backends/native/gen-default-modes.py - ''; - - postInstall = '' - ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; - - # Install udev files into our own tree. - PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; - - passthru = { - libdir = "${self}/lib/mutter-10"; - - tests = { - libdirExists = runCommand "mutter-libdir-exists" {} '' - if [[ ! -d ${self.libdir} ]]; then - echo "passthru.libdir should contain a directory, “${self.libdir}” is not one." - exit 1 - fi - touch $out - ''; - }; - }; - - meta = with lib; { - description = "A window manager for GNOME"; - homepage = "https://gitlab.gnome.org/GNOME/mutter"; - license = licenses.gpl2Plus; - maintainers = teams.pantheon.members; - platforms = platforms.linux; - }; -}; -in self diff --git a/pkgs/desktops/gnome/core/mutter/42/fix-paths.patch b/pkgs/desktops/gnome/core/mutter/42/fix-paths.patch deleted file mode 100644 index 6ac0a431f61..00000000000 --- a/pkgs/desktops/gnome/core/mutter/42/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/core/util.c b/src/core/util.c -index 57b73747d..f424cc81c 100644 ---- a/src/core/util.c -+++ b/src/core/util.c -@@ -636,7 +636,7 @@ meta_show_dialog (const char *type, - - args = g_ptr_array_new (); - -- append_argument (args, "zenity"); -+ append_argument (args, "@zenity@/bin/zenity"); - append_argument (args, type); - - if (display) diff --git a/pkgs/desktops/gnome/core/mutter/43/default.nix b/pkgs/desktops/gnome/core/mutter/43/default.nix new file mode 100644 index 00000000000..f3d18b67c45 --- /dev/null +++ b/pkgs/desktops/gnome/core/mutter/43/default.nix @@ -0,0 +1,175 @@ +{ fetchurl +, runCommand +, lib +, fetchpatch +, stdenv +, pkg-config +, gnome +, gettext +, gobject-introspection +, cairo +, colord +, lcms2 +, pango +, json-glib +, libstartup_notification +, libcanberra +, ninja +, xvfb-run +, xkeyboard_config +, libxcvt +, libxkbfile +, libXdamage +, libxkbcommon +, libXtst +, libinput +, libdrm +, gsettings-desktop-schemas +, glib +, gtk3 +, gnome-desktop +, pipewire +, libgudev +, libwacom +, xwayland +, mesa +, meson +, gnome-settings-daemon +, xorgserver +, python3 +, wrapGAppsHook +, gi-docgen +, sysprof +, libsysprof-capture +, desktop-file-utils +, libcap_ng +, egl-wayland +, graphene +, wayland-protocols +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mutter"; + version = "43.4"; + + outputs = [ "out" "dev" "man" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; + sha256 = "FiU2cxEaLsyW/I0tFfrdobVU0B3CioMEE11J1rqHsUA="; + }; + + patches = [ + # Fix build with separate sysprof. + # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2572 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch"; + sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU="; + }) + ]; + + mesonFlags = [ + "-Degl_device=true" + "-Dinstalled_tests=false" # TODO: enable these + "-Dwayland_eglstream=true" + "-Dprofiler=true" + "-Dxwayland_path=${xwayland}/bin/Xwayland" + # This should be auto detected, but it looks like it manages a false + # positive. + "-Dxwayland_initfd=disabled" + "-Ddocs=true" + ]; + + propagatedBuildInputs = [ + # required for pkg-config to detect mutter-clutter + json-glib + libXtst + libcap_ng + graphene + ]; + + nativeBuildInputs = [ + desktop-file-utils + gettext + libxcvt + mesa # needed for gbm + meson + ninja + xvfb-run + pkg-config + python3 + wrapGAppsHook + gi-docgen + xorgserver + ]; + + buildInputs = [ + cairo + egl-wayland + glib + gnome-desktop + gnome-settings-daemon + gobject-introspection + gsettings-desktop-schemas + gtk3 + libcanberra + libdrm + libgudev + libinput + libstartup_notification + libwacom + libxkbcommon + libxkbfile + libXdamage + colord + lcms2 + pango + pipewire + sysprof # for D-Bus interfaces + libsysprof-capture + xkeyboard_config + xwayland + wayland-protocols + ]; + + postPatch = '' + patchShebangs src/backends/native/gen-default-modes.py + ''; + + postInstall = '' + ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" + ''; + + 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-11/doc" "$devdoc" + ''; + + # Install udev files into our own tree. + PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + + separateDebugInfo = true; + + passthru = { + libdir = "${finalAttrs.finalPackage}/lib/mutter-11"; + + tests = { + libdirExists = runCommand "mutter-libdir-exists" {} '' + if [[ ! -d ${finalAttrs.finalPackage.libdir} ]]; then + echo "passthru.libdir should contain a directory, “${finalAttrs.finalPackage.libdir}” is not one." + exit 1 + fi + touch $out + ''; + }; + }; + + meta = with lib; { + description = "A window manager for GNOME"; + homepage = "https://gitlab.gnome.org/GNOME/mutter"; + license = licenses.gpl2Plus; + maintainers = teams.pantheon.members; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 155d8413ee2..cfd47ddda45 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -97,7 +97,7 @@ lib.makeScope pkgs.newScope (self: with self; { mutter = callPackage ./core/mutter { }; # Needed for elementary's gala, wingpanel and greeter until support for higher versions is provided - mutter42 = callPackage ./core/mutter/42 { }; + mutter43 = callPackage ./core/mutter/43 { }; nautilus = callPackage ./core/nautilus { }; @@ -272,5 +272,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-devel-docs = throw "The ‘gnome.gnome-devel-docs’ package was removed as it is outdated and no longer relevant."; # added 2022-10-26 mutter338 = throw "The ‘gnome.mutter338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22 + mutter42 = throw "The ‘gnome.mutter42’ package was removed as it is no longer needed by Pantheon."; # added 2023-03-23 gnome-settings-daemon338 = throw "The ‘gnome.gnome-settings-daemon338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22 } diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index a96cce755c9..b5ce60985bd 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -40,7 +40,7 @@ lib.makeScope pkgs.newScope (self: with self; { maintainers = lib.teams.pantheon.members; - mutter = pkgs.gnome.mutter42; + mutter = pkgs.gnome.mutter43; # Using 42 to match Mutter used in Pantheon gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon42; -- cgit 1.4.1 From 4601539c51443c549c7d7881e4669c7fd9ee931d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 23 Mar 2023 23:53:44 +0800 Subject: pantheon.gnome-settings-daemon: 42.2 -> 43.0 https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/compare/42.2...43.0 --- .../core/gnome-settings-daemon/42/default.nix | 135 --------------------- .../core/gnome-settings-daemon/42/fix-paths.patch | 15 --- .../core/gnome-settings-daemon/43/default.nix | 128 +++++++++++++++++++ .../core/gnome-settings-daemon/43/fix-paths.patch | 15 +++ .../global-backlight-helper.patch | 26 ---- pkgs/desktops/gnome/default.nix | 5 +- pkgs/desktops/pantheon/default.nix | 4 +- 7 files changed, 148 insertions(+), 180 deletions(-) delete mode 100644 pkgs/desktops/gnome/core/gnome-settings-daemon/42/default.nix delete mode 100644 pkgs/desktops/gnome/core/gnome-settings-daemon/42/fix-paths.patch create mode 100644 pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-settings-daemon/43/fix-paths.patch delete mode 100644 pkgs/desktops/gnome/core/gnome-settings-daemon/global-backlight-helper.patch diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/42/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/42/default.nix deleted file mode 100644 index e05040cc6e4..00000000000 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/42/default.nix +++ /dev/null @@ -1,135 +0,0 @@ -{ stdenv -, lib -, fetchpatch -, substituteAll -, fetchurl -, meson -, ninja -, pkg-config -, gnome -, perl -, gettext -, gtk3 -, glib -, libnotify -, libgnomekbd -, lcms2 -, libpulseaudio -, alsa-lib -, libcanberra-gtk3 -, upower -, colord -, libgweather -, polkit -, gsettings-desktop-schemas -, geoclue2 -, systemd -, libgudev -, libwacom -, libxslt -, libxml2 -, modemmanager -, networkmanager -, gnome-desktop -, geocode-glib_2 -, docbook_xsl -, wrapGAppsHook -, python3 -, tzdata -, nss -, gcr -, gnome-session-ctl -}: - -stdenv.mkDerivation rec { - pname = "gnome-settings-daemon"; - version = "42.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "nESXFKqOwSccDbUTffNFgZWUPwXM0KyJNdkzl3cLqwA="; - }; - - patches = [ - # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/aae1e774dd9de22fe3520cf9eb2bfbf7216f5eb0.patch"; - sha256 = "O4m0rOW8Zrgu3Q0p0OA8b951VC0FjYbOUk9MLzB9icI="; - }) - - (substituteAll { - src = ./fix-paths.patch; - inherit tzdata; - }) - - # Use geocode-glib_2 dependency - # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/300 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/03739474621e579e10b72577960ff94b4001e7ff.patch"; - sha256 = "W4uD4ChNPZSsmQfmfmmXFA2Sm1RDkV7MqG8DmT4qeCY="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - perl - gettext - libxml2 - libxslt - docbook_xsl - wrapGAppsHook - python3 - ]; - - buildInputs = [ - gtk3 - glib - gsettings-desktop-schemas - modemmanager - networkmanager - libnotify - libgnomekbd # for org.gnome.libgnomekbd.keyboard schema - gnome-desktop - lcms2 - libpulseaudio - alsa-lib - libcanberra-gtk3 - upower - colord - libgweather - nss - polkit - geocode-glib_2 - geoclue2 - systemd - libgudev - libwacom - gcr - ]; - - mesonFlags = [ - "-Dudev_dir=${placeholder "out"}/lib/udev" - "-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl" - ]; - - # Default for release buildtype but passed manually because - # we're using plain - env.NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; - - postPatch = '' - for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl meson_post_install.py; do - chmod +x $f - patchShebangs $f - done - ''; - - meta = with lib; { - description = "GNOME Settings Daemon"; - homepage = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/"; - license = licenses.gpl2Plus; - maintainers = teams.pantheon.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/42/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-settings-daemon/42/fix-paths.patch deleted file mode 100644 index 2229302cab7..00000000000 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/42/fix-paths.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/plugins/datetime/tz.h -+++ b/plugins/datetime/tz.h -@@ -27,11 +27,7 @@ - - #include - --#ifndef __sun --# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" --#else --# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" --#endif -+#define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab" - - typedef struct _TzDB TzDB; - typedef struct _TzLocation TzLocation; diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix new file mode 100644 index 00000000000..95eb6fe1d25 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix @@ -0,0 +1,128 @@ +{ stdenv +, lib +, fetchpatch +, substituteAll +, fetchurl +, meson +, ninja +, pkg-config +, gnome +, perl +, gettext +, gtk3 +, glib +, libnotify +, libgnomekbd +, lcms2 +, libpulseaudio +, alsa-lib +, libcanberra-gtk3 +, upower +, colord +, libgweather +, polkit +, gsettings-desktop-schemas +, geoclue2 +, systemd +, libgudev +, libwacom +, libxslt +, libxml2 +, modemmanager +, networkmanager +, gnome-desktop +, geocode-glib_2 +, docbook_xsl +, wrapGAppsHook +, python3 +, tzdata +, nss +, gcr_4 +, gnome-session-ctl +}: + +stdenv.mkDerivation rec { + pname = "gnome-settings-daemon"; + version = "43.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "NRO7JPxvgYFmciOmSgZ1NP3M879mMmqUA9OLDw1gE9A="; + }; + + patches = [ + # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/aae1e774dd9de22fe3520cf9eb2bfbf7216f5eb0.patch"; + sha256 = "O4m0rOW8Zrgu3Q0p0OA8b951VC0FjYbOUk9MLzB9icI="; + }) + + (substituteAll { + src = ./fix-paths.patch; + inherit tzdata; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + perl + gettext + libxml2 + libxslt + docbook_xsl + wrapGAppsHook + python3 + ]; + + buildInputs = [ + gtk3 + glib + gsettings-desktop-schemas + modemmanager + networkmanager + libnotify + libgnomekbd # for org.gnome.libgnomekbd.keyboard schema + gnome-desktop + lcms2 + libpulseaudio + alsa-lib + libcanberra-gtk3 + upower + colord + libgweather + nss + polkit + geocode-glib_2 + geoclue2 + systemd + libgudev + libwacom + gcr_4 + ]; + + mesonFlags = [ + "-Dudev_dir=${placeholder "out"}/lib/udev" + "-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl" + ]; + + # Default for release buildtype but passed manually because + # we're using plain + env.NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; + + postPatch = '' + for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl; do + chmod +x $f + patchShebangs $f + done + ''; + + meta = with lib; { + description = "GNOME Settings Daemon"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/"; + license = licenses.gpl2Plus; + maintainers = teams.pantheon.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/43/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-settings-daemon/43/fix-paths.patch new file mode 100644 index 00000000000..2229302cab7 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/43/fix-paths.patch @@ -0,0 +1,15 @@ +--- a/plugins/datetime/tz.h ++++ b/plugins/datetime/tz.h +@@ -27,11 +27,7 @@ + + #include + +-#ifndef __sun +-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" +-#else +-# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" +-#endif ++#define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab" + + typedef struct _TzDB TzDB; + typedef struct _TzLocation TzLocation; diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/global-backlight-helper.patch b/pkgs/desktops/gnome/core/gnome-settings-daemon/global-backlight-helper.patch deleted file mode 100644 index 8f3951af2da..00000000000 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/global-backlight-helper.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c -index d7d10fd2..5619d6ad 100644 ---- a/plugins/power/gsd-backlight.c -+++ b/plugins/power/gsd-backlight.c -@@ -358,7 +358,7 @@ gsd_backlight_run_set_helper (GsdBacklight *backlight, GTask *task) - proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE, - &error, - "pkexec", -- LIBEXECDIR "/gsd-backlight-helper", -+ "/run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper", - g_udev_device_get_sysfs_path (backlight->udev_device), - data->value_str, NULL); - } else { -diff --git a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in -index f16300f8..79d6bd17 100644 ---- a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in -+++ b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in -@@ -25,7 +25,7 @@ - no - yes - -- @libexecdir@/gsd-backlight-helper -+ /run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper - - - diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index cfd47ddda45..62af89161e7 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -75,8 +75,8 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { }; - # Using 42 to match Mutter used in Pantheon - gnome-settings-daemon42 = callPackage ./core/gnome-settings-daemon/42 { }; + # Using 43 to match Mutter used in Pantheon + gnome-settings-daemon43 = callPackage ./core/gnome-settings-daemon/43 { }; gnome-software = callPackage ./core/gnome-software { }; @@ -274,4 +274,5 @@ lib.makeScope pkgs.newScope (self: with self; { mutter338 = throw "The ‘gnome.mutter338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22 mutter42 = throw "The ‘gnome.mutter42’ package was removed as it is no longer needed by Pantheon."; # added 2023-03-23 gnome-settings-daemon338 = throw "The ‘gnome.gnome-settings-daemon338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22 + gnome-settings-daemon42 = throw "The ‘gnome.gnome-settings-daemon42’ package was removed as it is no longer needed by Pantheon."; # added 2023-03-23 } diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index b5ce60985bd..9ba16c2eb76 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -42,8 +42,8 @@ lib.makeScope pkgs.newScope (self: with self; { mutter = pkgs.gnome.mutter43; - # Using 42 to match Mutter used in Pantheon - gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon42; + # Using 43 to match Mutter used in Pantheon + gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon43; elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; -- cgit 1.4.1 From a0ab388a7a300cb06ec31dcbf44f7cf8aac75af2 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 23 Mar 2023 22:18:02 +0800 Subject: gnome.mutter43: Apply fixes for GLib 2.76 This is a downstream patch because the code path is gone in mutter 44. We should give mutter 44 some try once gala supports it. Fixes https://github.com/elementary/gala/issues/1580 --- pkgs/desktops/gnome/core/mutter/43/default.nix | 8 +++++++ .../core/mutter/43/glib-2-76-gala-crash.patch | 25 ++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/desktops/gnome/core/mutter/43/glib-2-76-gala-crash.patch diff --git a/pkgs/desktops/gnome/core/mutter/43/default.nix b/pkgs/desktops/gnome/core/mutter/43/default.nix index f3d18b67c45..5953d00de45 100644 --- a/pkgs/desktops/gnome/core/mutter/43/default.nix +++ b/pkgs/desktops/gnome/core/mutter/43/default.nix @@ -66,6 +66,14 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch"; sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU="; }) + + # GLib 2.76 switches from using its own slice allocator to using the system malloc instead. + # This makes dragging window between workspace in multitasking view crashes Pantheon's Gala. + # Inspiration https://github.com/mate-desktop/mate-desktop/pull/538 + # Backtrace https://github.com/elementary/gala/issues/1580 + # Upstream report https://gitlab.gnome.org/GNOME/mutter/-/issues/2495 + # The patch will not apply on 44.0+, make sure this is fixed when trying to clean this up. + ./glib-2-76-gala-crash.patch ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome/core/mutter/43/glib-2-76-gala-crash.patch b/pkgs/desktops/gnome/core/mutter/43/glib-2-76-gala-crash.patch new file mode 100644 index 00000000000..895cabcdbdb --- /dev/null +++ b/pkgs/desktops/gnome/core/mutter/43/glib-2-76-gala-crash.patch @@ -0,0 +1,25 @@ +diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c +index d34c8f59f..8835a6a33 100644 +--- a/clutter/clutter/clutter-actor.c ++++ b/clutter/clutter/clutter-actor.c +@@ -12304,7 +12304,7 @@ clutter_actor_run_actions (ClutterActor *self, + ClutterEventPhase phase) + { + ClutterActorPrivate *priv; +- const GList *actions, *l; ++ const GList *actions, *l, *next; + gboolean retval = CLUTTER_EVENT_PROPAGATE; + + priv = self->priv; +@@ -12313,9 +12313,10 @@ clutter_actor_run_actions (ClutterActor *self, + + actions = _clutter_meta_group_peek_metas (priv->actions); + +- for (l = actions; l; l = l->next) ++ for (l = actions; l; l = next) + { + ClutterAction *action = l->data; ++ next = l->next; + ClutterEventPhase action_phase; + + action_phase = clutter_action_get_phase (action); -- cgit 1.4.1 From 771a33899e6d9fe94b535ade4503538722aa25d5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 24 Mar 2023 00:00:45 +0800 Subject: nixos/doc/rl-2305: Mention default mutter version change for Pantheon --- nixos/doc/manual/release-notes/rl-2305.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 855c353da91..0a9fec3d4c8 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -217,7 +217,7 @@ In addition to numerous new and upgraded packages, this release has the followin - `vim_configurable` has been renamed to `vim-full` to avoid confusion: `vim-full`'s build-time features are configurable, but both `vim` and `vim-full` are _customizable_ (in the sense of user configuration, like vimrc). -- Pantheon now defaults to Mutter 42 and GNOME settings daemon 42, all Pantheon packages are now tracking elementary OS 7 updates. +- Pantheon now defaults to Mutter 43 and GNOME settings daemon 43, all Pantheon packages are now tracking elementary OS 7 updates. - The module for the application firewall `opensnitch` got the ability to configure rules. Available as [services.opensnitch.rules](#opt-services.opensnitch.rules) -- cgit 1.4.1 From c5e9a792f756cdad5cb8644bc4679a78a566ad18 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 26 Mar 2023 17:37:06 +0800 Subject: authenticator: Drop GTK4 override We have updated GTK4 to 4.10. --- pkgs/top-level/all-packages.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14c97e9c69e..e0591379705 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2833,18 +2833,7 @@ with pkgs; audiowaveform = callPackage ../tools/audio/audiowaveform { }; - authenticator = callPackage ../applications/misc/authenticator rec { - # Remove when GTK is upgraded past 4.8 - # https://github.com/NixOS/nixpkgs/issues/216770 - gtk4 = pkgs.gtk4.overrideAttrs (_: rec { - version = "4.9.4"; - src = fetchurl { - url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "sha256-kaOv1YQB1OXYHjCwjuPxE6R2j/EBQDNqcqMmx3JyvjA="; - }; - }); - wrapGAppsHook4 = wrapGAppsHook.override { gtk3 = gtk4; }; - }; + authenticator = callPackage ../applications/misc/authenticator { }; authelia = callPackage ../servers/authelia { }; -- cgit 1.4.1 From 90a26a2d3825bad6c6eeda26aabe49c9fbc787ec Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 26 Mar 2023 18:27:47 +0800 Subject: gnome.gpaste: 43.1 → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/Keruspe/GPaste/compare/v43.1...v44.0 Also removes clutter, probably same as a9953119 this is kept to generate cargs for mutter-clutter-*. Hopefully this is no longer the case since clutter is no longer maintained. --- pkgs/desktops/gnome/misc/gpaste/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gpaste/default.nix b/pkgs/desktops/gnome/misc/gpaste/default.nix index adee04a0df8..c549533f8dd 100644 --- a/pkgs/desktops/gnome/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome/misc/gpaste/default.nix @@ -1,8 +1,6 @@ { stdenv , lib , fetchFromGitHub -, appstream-glib -, clutter , gjs , glib , gobject-introspection @@ -21,14 +19,14 @@ }: stdenv.mkDerivation rec { - version = "43.1"; + version = "44.0"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "sha256-wOxhaYWX76jSur3uh75vDfAedbiLh2ikoMuobCZx3jE="; + sha256 = "sha256-mYbyu3IIF6pQz1oEqEWLe7jdR99M3LxiMiRR9x7qFh8="; }; patches = [ @@ -47,7 +45,6 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - appstream-glib gobject-introspection meson ninja @@ -58,7 +55,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - clutter # required by mutter-clutter gjs glib gtk3 @@ -70,7 +66,6 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgcr3=false" # Build with gcr4 "-Dcontrol-center-keybindings-dir=${placeholder "out"}/share/gnome-control-center/keybindings" "-Ddbus-services-dir=${placeholder "out"}/share/dbus-1/services" "-Dsystemd-user-unit-dir=${placeholder "out"}/etc/systemd/user" -- cgit 1.4.1 From bf1b8d9b617fb91a2edfc4d4f330234dd3e788a3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 26 Mar 2023 21:10:05 +0200 Subject: gegl: 0.4.42 → 0.4.44 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gegl/-/compare/GEGL_0_4_42...GEGL_0_4_44 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gegl/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 619226fb2cc..bd4aea3210f 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , pkg-config , vala , gobject-introspection @@ -38,28 +37,16 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.42"; + version = "0.4.44"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "q6g6DLqmxW7cKeoi8ugXKVClO5bapRWSCD1ZIivd4C0="; + sha256 = "CkzbQWNeQGoISc0NPwPK99l8q4qhPShwfVMtAInVYSY="; }; - patches = [ - # Fix memory management issues revealed by GLib 2.76 update. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gegl/-/commit/f2f2cea219f2265e152e3308004dc98d2fd48f33.patch"; - hash = "sha256-5GR8zHvuiH9eapPDnIEGr/ksYw6feKqMaJlmj83R4XY="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gegl/-/commit/79e28a7d3a843114588f4b5a095ff7a797c0e2e1.patch"; - hash = "sha256-+2iT+THlLcOgFvGl76IUWGhww+H8rzDWmXn0Kq6YCUk="; - }) - ]; - nativeBuildInputs = [ pkg-config gettext -- cgit 1.4.1 From 28dfa5bc41e2d930a63b384d0081fd8b4dbdd1e3 Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Mon, 27 Mar 2023 18:28:07 +0800 Subject: komikku: add webkitgtk-6.0 support --- pkgs/applications/graphics/komikku/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index 474d43258c2..564af456f0f 100644 --- a/pkgs/applications/graphics/komikku/default.nix +++ b/pkgs/applications/graphics/komikku/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitLab +, fetchpatch , desktop-file-utils , gettext , glib @@ -29,6 +30,18 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-DxW9uefY6Fks3qSUeLMp3BB85SfLgzwBr4KO9do2y2o="; }; + patches = [ + # https://gitlab.com/valos/Komikku/-/merge_requests/208 + (fetchpatch { + url = "https://gitlab.com/valos/Komikku/-/commit/c9a09817acd767a7cb4ceea9b212fffd798eae61.patch"; + hash = "sha256-McjQApLY7OKbdelrTeh3aRw90B6T9V5FtLL5Y62BmGA="; + }) + (fetchpatch { + url = "https://gitlab.com/valos/Komikku/-/commit/bda93631420f6a69a50be0068f259d60b9558930.patch"; + hash = "sha256-Xu+IaQKf0I99a2uh97j8xSlGYSJHuNPMy/zZtWRxLaM="; + }) + ]; + nativeBuildInputs = [ meson ninja -- cgit 1.4.1 From 1df1978d5010c45f53701990ec5e5a5a277d480b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 30 Mar 2023 15:47:17 +0000 Subject: pitivi: 2022.06 → 2023.03 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/pitivi/-/compare/2022.06.0...2023.03.0 Flatpak now applies a patch to libsoundtouch to fix an issue but that is not a regression: https://gitlab.gnome.org/GNOME/pitivi/-/commit/581f451adb206d66243bbce7ce0c88cfa61aafee Changelog-Reviewed-By: Jan Tojnar --- pkgs/applications/video/pitivi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 7e6f89855ed..e15b0969e35 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -20,13 +20,13 @@ python3.pkgs.buildPythonApplication rec { pname = "pitivi"; - version = "2022.06"; + version = "2023.03"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/pitivi/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Uz0448bSEcK9DpXiuWsPCDO98NXUd6zgffYRWDUGyDg="; + sha256 = "PX1OFEeavqMPvF613BKgxwErxqW2huw6mQxo8YpBS/M="; }; patches = [ -- cgit 1.4.1 From d0a4f6c5da0c54f63b0d56f09f0be480e8c53233 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 3 Apr 2023 10:09:15 +0000 Subject: epiphany: 44.0 → 44.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/epiphany/-/compare/44.0...44.1 Changelog-Reviewed-By: Bobby Rong --- pkgs/desktops/gnome/core/epiphany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 436c3ae1391..2c18f50dbd2 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 = "44.0"; + version = "44.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "qr3J3oDECQc2duAOFbqXGHcV5LhLx3b+htuG0PgUC7E="; + sha256 = "u60o/HJzqGa5teXdVoa9BIQww/C+7UwIJgtNCN2P+Fs="; }; nativeBuildInputs = [ -- cgit 1.4.1 From e7ac3aca1c470c0abda00d9352a9846ac1fd3d4a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 3 Apr 2023 10:11:34 +0000 Subject: gnome.gnome-boxes: 44.0 → 44.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-boxes/-/compare/44.0...44.1 Changelog-Reviewed-By: Bobby Rong --- pkgs/desktops/gnome/apps/gnome-boxes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index fdc1cd053c3..4acb9b91eba 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "44.0"; + version = "44.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "3WTfNNg4WGDwp68T7sEuYV+v/iFD5Yo8kuUBKPqb88k="; + sha256 = "OJcGDWlvf6LZEudywnYdvlNDOrXxnr+kvE6Jc4X6ulM="; }; patches = [ -- cgit 1.4.1 From 80ef897a5d9e283a5c4ce52af695c71737e4d941 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 3 Apr 2023 10:15:20 +0000 Subject: gnome.rygel: 0.42.1 → 0.42.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/rygel/-/compare/rygel-0.42.1...rygel-0.42.2 Changelog-Reviewed-By: Bobby Rong --- pkgs/desktops/gnome/core/rygel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/rygel/default.nix b/pkgs/desktops/gnome/core/rygel/default.nix index 6c5d6bc64b7..b9491a236df 100644 --- a/pkgs/desktops/gnome/core/rygel/default.nix +++ b/pkgs/desktops/gnome/core/rygel/default.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.42.1"; + version = "0.42.2"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "BfMrbray/j8dg8Vp3QKnRnfN5nyTpb3O6JXiPr+omD0="; + sha256 = "FYHjkw9dOv4XSHLJawoc014UJ5VCUffnMs5iZlOBioc="; }; patches = [ -- cgit 1.4.1 From 48753b589a0b5355fe0e883d4de076f4d258e4c1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 3 Apr 2023 19:24:33 +0200 Subject: fprintd: Stop tests from crashing with GLib 2.76 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GLib 2.76 started raising critical warnings for unhandled GTasks. Since tests are failing on criticals to detect issues, they started to fail. https://gitlab.freedesktop.org/libfprint/fprintd/-/issues/151 Let’s disable fatal-criticals until the issue is resolved. --- pkgs/tools/security/fprintd/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 76b71e24aca..472334f4a6f 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -98,6 +98,13 @@ stdenv.mkDerivation rec { patchShebangs \ po/check-translations.sh \ tests/unittest_inspector.py + + # Stop tests from failing due to unhandled GTasks uncovered by GLib 2.76 bump. + # https://gitlab.freedesktop.org/libfprint/fprintd/-/issues/151 + substituteInPlace tests/fprintd.py \ + --replace "env['G_DEBUG'] = 'fatal-criticals'" "" + substituteInPlace tests/meson.build \ + --replace "'G_DEBUG=fatal-criticals'," "" ''; meta = with lib; { -- cgit 1.4.1 From 7e9e6958207e3f129e2f28c7d723a8d99de977b2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Apr 2023 23:06:44 +0000 Subject: grilo-plugins: 0.3.15 → 0.3.16 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Adds support for libdmapsharing but we are not adding it because the required version depends on libsoup3 but Rhythmox, which also uses libdmapsharing still wants libsoup2. - Updates supported lua version. https://gitlab.gnome.org/GNOME/grilo-plugins/-/compare/grilo-plugins-0.3.15...grilo-plugins-0.3.16 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/grilo-plugins/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 9643efc8514..966e85a4bca 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -11,7 +11,7 @@ , libsoup_3 , gnome , libxml2 -, lua5_3 +, lua5_4 , liboauth , libgdata , libmediaart @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "grilo-plugins"; - version = "0.3.15"; + version = "0.3.16"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "hRjD2VT5MJXZVWJKBEzhanNFUy+BHSmdv6HhFM/rqzM="; + sha256 = "/m9Nvlhsa4uiQGOU4gLyLQCdZCqW6zpU8y9qIdCEzcs="; }; patches = [ @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { grilo libxml2 # libgdata - lua5_3 + lua5_4 liboauth sqlite gnome-online-accounts -- cgit 1.4.1 From 94164a992567e18921fc813a12d2860406278aa7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 26 Mar 2023 13:05:20 +0000 Subject: python3.pkgs.pygobject3: 3.44.0 → 3.44.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/pygobject/-/compare/3.44.0...3.44.1 --- pkgs/development/python-modules/pygobject/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 2652db12e7f..b8337aea562 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pygobject"; - version = "3.44.0"; + version = "3.44.1"; outputs = [ "out" "dev" ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "9oY9ajtw2azkw2qZAdOeQsiAHREwnKKos0WdHCTjS38="; + sha256 = "PGgF0TIb6QzDLmSCFaViQw4NPW7c2o9MXnqdr/ytVxA="; }; depsBuildBuild = [ -- cgit 1.4.1 From 1a7671c70462370ad0b7f7c1b81ba8a9e001b52f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Apr 2023 23:07:43 +0000 Subject: vala_0_56: 0.56.4 → 0.56.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vala/-/compare/0.56.4...0.56.6 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/compilers/vala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index fd3007cc15e..3a97fd2eda6 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -103,8 +103,8 @@ in rec { }; vala_0_56 = generic { - version = "0.56.4"; - sha256 = "hixB2ThUPtPY2GyCGaYQh3lxk97+6NoMUMr0mZPGa2o="; + version = "0.56.6"; + sha256 = "BQ6EHL/iuOfQ+zUMlQa9dVe+HNhqkMiWdl8aCaGHABM="; }; vala = vala_0_56; -- cgit 1.4.1 From 98d2e797e8f879a3ac7f608eac9c4c08181d874c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 6 Apr 2023 02:54:37 +0200 Subject: nixos/tests/gnome: Do not use autostart and switch to kgx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Starting terminal with autostart makes it harder to control when it is activated. This reverts commit 7aaf5262258a4c2e7366510d0978050f0ed965c4. Unfortunately, we cannot simply just go back since that would fail as mentioned in the reverted commit. It appears that this is due to the app not being able to find DISPLAY, since switching to a different terminal emulator will complain: (kgx:1612): Gtk-WARNING **: 01:12:49.988: cannot open display: :0.0 Let’s use D-Bus activation rather than executing the program through su. That will hopefully take care of all the necessary environment variables. And since GNOME Terminal does not support D-Bus activation for the app, let’s switch to GNOME Console. It probably makes sense anyway, as it is the default terminal emulator. Also let’s unify the WMClass detection a bit. Though, weirdly, the WMClass differs on Wayland. --- nixos/tests/gnome-xorg.nix | 16 ++++++++-------- nixos/tests/gnome.nix | 23 +++++++++-------------- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/nixos/tests/gnome-xorg.nix b/nixos/tests/gnome-xorg.nix index 618458b1f6b..f520a012383 100644 --- a/nixos/tests/gnome-xorg.nix +++ b/nixos/tests/gnome-xorg.nix @@ -24,7 +24,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { services.xserver.desktopManager.gnome.enable = true; services.xserver.desktopManager.gnome.debug = true; services.xserver.displayManager.defaultSession = "gnome-xorg"; - programs.gnome-terminal.enable = true; systemd.user.services = { "org.gnome.Shell@x11" = { @@ -61,10 +60,10 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { # False when startup is done startingUp = su "${gdbus} ${eval} Main.layoutManager._startingUp"; - # Start gnome-terminal - gnomeTerminalCommand = su "gnome-terminal"; + # Start Console + launchConsole = su "${bus} gapplication launch org.gnome.Console"; - # Hopefully gnome-terminal's wm class + # Hopefully Console's wm class wmClass = su "${gdbus} ${eval} global.display.focus_window.wm_class"; in '' with subtest("Login to GNOME Xorg with GDM"): @@ -82,13 +81,14 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { "${startingUp} | grep -q 'true,..false'" ) - with subtest("Open Gnome Terminal"): + with subtest("Open Console"): machine.succeed( - "${gnomeTerminalCommand}" + "${launchConsole}" ) - # correct output should be (true, '"Gnome-terminal"') + # correct output should be (true, '"kgx"') + # For some reason, this deviates from Wayland. machine.wait_until_succeeds( - "${wmClass} | grep -q 'true,...Gnome-terminal'" + "${wmClass} | grep -q 'true,...kgx'" ) machine.sleep(20) machine.screenshot("screen") diff --git a/nixos/tests/gnome.nix b/nixos/tests/gnome.nix index 05619cbd7d8..5ab641f9f84 100644 --- a/nixos/tests/gnome.nix +++ b/nixos/tests/gnome.nix @@ -22,14 +22,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { services.xserver.desktopManager.gnome.enable = true; services.xserver.desktopManager.gnome.debug = true; - programs.gnome-terminal.enable = true; - - environment.systemPackages = [ - (pkgs.makeAutostartItem { - name = "org.gnome.Terminal"; - package = pkgs.gnome.gnome-terminal; - }) - ]; systemd.user.services = { "org.gnome.Shell@wayland" = { @@ -64,10 +56,10 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { # False when startup is done startingUp = su "${gdbus} ${eval} Main.layoutManager._startingUp"; - # Start gnome-terminal - gnomeTerminalCommand = su "${bus} gnome-terminal"; + # Start Console + launchConsole = su "${bus} gapplication launch org.gnome.Console"; - # Hopefully gnome-terminal's wm class + # Hopefully Console's wm class wmClass = su "${gdbus} ${eval} global.display.focus_window.wm_class"; in '' with subtest("Login to GNOME with GDM"): @@ -86,10 +78,13 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { "${startingUp} | grep -q 'true,..false'" ) - with subtest("Open Gnome Terminal"): - # correct output should be (true, '"gnome-terminal-server"') + with subtest("Open Console"): + machine.succeed( + "${launchConsole}" + ) + # correct output should be (true, '"org.gnome.Console"') machine.wait_until_succeeds( - "${wmClass} | grep -q 'gnome-terminal-server'" + "${wmClass} | grep -q 'true,...org.gnome.Console'" ) machine.sleep(20) machine.screenshot("screen") -- cgit 1.4.1 From d8dde72fbb99ce7912e655a5765b4f5a42256c94 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 6 Apr 2023 04:04:40 +0200 Subject: nixosTests.gnome: Fix tests for 44 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Launching an app externally (like we do in tests) does not dismiss the GNOME Shell’s Activities view opened on log-in. 2. Activities view grabs input so that user can type to search. 3. Due to a regression in Mutter 44, a window focus is not acquired when Shell grabs input https://gitlab.gnome.org/GNOME/mutter/-/commit/3ac82a58c51a5c8db6b49e89a1232f99c79644cc As a result, trying to determine the WMClass would throw: TypeError: global.display.focus_window is null Let’s dismiss the Activities view with Escape key as a workaround. --- nixos/tests/gnome-xorg.nix | 3 +++ nixos/tests/gnome.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/nixos/tests/gnome-xorg.nix b/nixos/tests/gnome-xorg.nix index f520a012383..d616d4f0235 100644 --- a/nixos/tests/gnome-xorg.nix +++ b/nixos/tests/gnome-xorg.nix @@ -82,6 +82,9 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { ) with subtest("Open Console"): + # Close the Activities view so that Shell can correctly track the focused window. + machine.send_key("esc") + machine.succeed( "${launchConsole}" ) diff --git a/nixos/tests/gnome.nix b/nixos/tests/gnome.nix index 5ab641f9f84..5a28e3bb0e8 100644 --- a/nixos/tests/gnome.nix +++ b/nixos/tests/gnome.nix @@ -79,6 +79,9 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { ) with subtest("Open Console"): + # Close the Activities view so that Shell can correctly track the focused window. + machine.send_key("esc") + machine.succeed( "${launchConsole}" ) -- cgit 1.4.1 From 4693c65af333aac1b3d06dfe89d4333c6c54337a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 6 Apr 2023 22:15:34 +0800 Subject: tdesktop: Drop glibmm_2_68 override We are now building this with glibmm 2.76. This reverts commit b6641c2209354eb38d1f52c74cf89296cd0553a0. --- .../instant-messengers/telegram/tdesktop/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 6b47401c558..835e2197e18 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,7 +1,6 @@ { lib , fetchFromGitHub , fetchpatch -, fetchurl , callPackage , pkg-config , cmake @@ -71,13 +70,6 @@ let cxxStandard = "20"; }; }; - glibmm = glibmm_2_68.overrideAttrs (_: { - version = "2.76.0"; - src = fetchurl { - url = "mirror://gnome/sources/glibmm/2.76/glibmm-2.76.0.tar.xz"; - sha256 = "sha256-hjfYDOq9lP3dbkiXCggqJkVY1KuCaE4V/8h+fvNGKrI="; - }; - }); in stdenv.mkDerivation rec { pname = "telegram-desktop"; @@ -148,7 +140,7 @@ stdenv.mkDerivation rec { range-v3 tl-expected hunspell - glibmm + glibmm_2_68 webkitgtk_4_1 jemalloc rnnoise -- cgit 1.4.1 From cd67ddc5d3895d21ae751a12886557b2fce5cc2d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 7 Apr 2023 12:07:07 +0200 Subject: pkgsi686Linux.tracker: Disable tests Works around https://gitlab.gnome.org/GNOME/tracker/-/issues/398 --- pkgs/development/libraries/tracker/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 1be0512255d..c644cba0e79 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -101,7 +101,8 @@ stdenv.mkDerivation rec { "-Dsystemd_user_services=false" ]; - doCheck = true; + # https://gitlab.gnome.org/GNOME/tracker/-/issues/398 + doCheck = !stdenv.isi686; postPatch = '' chmod +x \ -- cgit 1.4.1