diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2023-03-04 09:11:40 +0000 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2023-04-06 01:35:03 +0200 |
| commit | ceeb9f39db4030a500a6855ba6c6e1395d4864c6 (patch) | |
| tree | abc5dba184eb55cf410a83e6509a4eb4b88b33f6 /pkgs/development/libraries/glib | |
| parent | 48d92a5e9a47c1e392b4f6248944dbe95e0b6bea (diff) | |
glib: 2.75.3 → 2.75.4
https://gitlab.gnome.org/GNOME/glib/-/compare/2.75.3...2.75.4 Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
Diffstat (limited to 'pkgs/development/libraries/glib')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 2b97ddca0dfb7..acd67bb136a69 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" ]; |