diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2023-02-01 22:35:45 +0000 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2023-02-02 00:06:52 +0100 |
| commit | 746e2b1fc46c8fe5f58918518b228514133f570d (patch) | |
| tree | eba1b1cf50eaf5b2a3112325129e71490a0432a9 /pkgs/development/libraries/glib | |
| parent | e0e87e36c6b54096fedfaddf8af5e129429c221a (diff) | |
glib: 2.74.3 → 2.74.5
https://gitlab.gnome.org/GNOME/glib/-/compare/2.74.3...2.74.5 Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
Diffstat (limited to 'pkgs/development/libraries/glib')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ac7977d0f62f2..de5e0b781f8dc 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -55,11 +55,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.74.3"; + version = "2.74.5"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - sha256 = "6bxB7NlpDZvGqXDMc4ARm4KOW2pLFsOTxjiz3CuHy8s="; + sha256 = "zrqDpZmc6zGkxPyZISB8uf//0qsdbsA8Fi0/YIpcFMg="; }; patches = lib.optionals stdenv.isDarwin [ @@ -117,20 +117,6 @@ stdenv.mkDerivation (finalAttrs: { # Disable flaky test. # https://gitlab.gnome.org/GNOME/glib/-/issues/820 ./skip-timer-test.patch - - # GVariant security fixes - # https://discourse.gnome.org/t/multiple-fixes-for-gvariant-normalisation-issues-in-glib/12835 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3126.patch"; - sha256 = "CNCxouYy8xNHt4eJtPZ2eOi9b0SxzI2DkklNfQMk3d8="; - }) - - # Menu model security fix - # https://discourse.gnome.org/t/fixes-for-gdbusmenumodel-crashes-in-glib/12846 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/glib/-/commit/4f4d770a1e40f719d5a310cffdac29cbb4e20c11.patch"; - sha256 = "+S44AnC86HfbMwkRe1ll54IK9pLxaFD3LqiVhPelnXI="; - }) ]; outputs = [ "bin" "out" "dev" "devdoc" ]; |