diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2023-03-11 18:58:32 +0000 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2023-04-06 01:35:19 +0200 |
| commit | 703500d5fd6667680a08a90acb0d9168aae0aad3 (patch) | |
| tree | 1a75e188b21de7b156ca7acd9ec26c4a292c503d /pkgs/development/libraries/glib | |
| parent | 5113382afe98a5a1ec7771468644ef6912480429 (diff) | |
glib: 2.75.4 → 2.76.0
https://gitlab.gnome.org/GNOME/glib/-/compare/2.75.4...2.76.0 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, 2 insertions, 24 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index acd67bb136a69..3c97e542f9be2 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -3,7 +3,6 @@ , stdenv , fetchurl , fetchpatch2 -, fetchpatch , gettext , meson , ninja @@ -57,11 +56,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.75.4"; + version = "2.76.0"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - sha256 = "Fs4ku488DqO9vak3wJC5O7i1rS1Bfl5eQsFKpM9ratE="; + sha256 = "Ulu3A7gHFC4a7lzPIiw0ToBkshwMRWd+9ZTlh4dMZ5c="; }; patches = lib.optionals stdenv.isDarwin [ @@ -110,27 +109,6 @@ 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" ]; |