From 3e4ca2e5cbfd4c015fa63be849fe7079ed85a378 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 24 Sep 2023 09:29:13 +0000 Subject: [PATCH] =?UTF-8?q?glib:=202.77.3=20=E2=86=92=202.78.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib/-/compare/2.77.3...2.78.0 NEWS look okay - Error handling of invalid GKeyFile string escape sequences - gdb: Workaround optimized out quark_seq_id - meson: fix `gnetworking.h` install tag - gthread: Annotate g_thread_exit() with G_NORETURN - Fix gutils-user-database unit test Changelog-reviewed-by: Bobby Rong Changelog-reviewed-by: Jan Tojnar --- pkgs/development/libraries/glib/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index c1b76049e46d..6ebd096ba6ee 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -51,11 +51,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.77.3"; + version = "2.78.0"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - sha256 = "F1P5Y7toCyioPW4glfY9DUuUJEZ1vNJgOFCy68GsamE="; + sha256 = "ROqri3IId84wPFVAtlexJvEtyUly2YgLUpWfQ/tTezA="; }; patches = lib.optionals stdenv.isDarwin [ @@ -97,6 +97,13 @@ stdenv.mkDerivation (finalAttrs: { # Disable flaky test. # https://gitlab.gnome.org/GNOME/glib/-/issues/820 ./skip-timer-test.patch + + # Fix protentional NetworkManager crashes. + # https://gitlab.gnome.org/GNOME/glib/-/issues/3105 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/82c764ce2e42f0d1032627dabcbd742d5f2bd8fa.patch"; + hash = "sha256-HALd5kv+dwZQJA75rG9IbAMr+DwR99Lm+8+HHg7eBBc="; + }) ]; outputs = [ "bin" "out" "dev" "devdoc" ];