about summary refs log tree commit diff
path: root/pkgs/development/libraries/glib
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2023-09-24 09:29:13 +0000
committerJan Tojnar <jtojnar@gmail.com>2023-11-21 08:42:25 +0100
commit3e4ca2e5cbfd4c015fa63be849fe7079ed85a378 (patch)
tree1f10922f3b6000be740cd35cb697d9530a87e5fa /pkgs/development/libraries/glib
parent56f2696aecfcbf203887fc16bc5fa0f85473a8d6 (diff)
glib: 2.77.3 → 2.78.0
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 <rjl931189261@126.com>
Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
Diffstat (limited to 'pkgs/development/libraries/glib')
-rw-r--r--pkgs/development/libraries/glib/default.nix11
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index c1b76049e46d9..6ebd096ba6eeb 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" ];