From a4f2ad82d5e04525f00c1cb4eff8f60c084c7ffb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Nov 2023 20:27:27 +0000 Subject: [PATCH] =?UTF-8?q?glib:=202.78.0=20=E2=86=92=202.78.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib/-/compare/2.78.0...2.78.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/development/libraries/glib/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 6ebd096ba6ee..c11f6b8432bc 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -2,7 +2,6 @@ , lib , stdenv , fetchurl -, fetchpatch2 , gettext , meson , ninja @@ -51,11 +50,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.78.0"; + version = "2.78.1"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - sha256 = "ROqri3IId84wPFVAtlexJvEtyUly2YgLUpWfQ/tTezA="; + sha256 = "kVvD0PhQfWUOrTgy4vj7Zw/OWarE13VKfatvHm/teLI="; }; patches = lib.optionals stdenv.isDarwin [ @@ -97,13 +96,6 @@ 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" ];