diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-12-06 16:25:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-06 16:25:14 +0100 |
| commit | f2d78a4d52b69d6430e498d06880267e36a881ab (patch) | |
| tree | 1da851c2133bed2260db2b7ed3852b09deab4abf /pkgs/development/libraries/glib | |
| parent | 60f52f6c836b27882a6ffaf529f505d4e1e0f45c (diff) | |
| parent | 2edad4b9c2f0e197c0d016566efdcff3f147edea (diff) | |
Merge pull request #204383 from jtojnar/gnome-staging
GNOME staging updates
Diffstat (limited to 'pkgs/development/libraries/glib')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index a566062c0ee47..12f46af022fc6 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -56,11 +56,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.74.1"; + version = "2.74.3"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - sha256 = "CrmBYY0dtHhF5WQXsNfBI/gaNCeyuck/Wkb/W7uWSWQ="; + sha256 = "6bxB7NlpDZvGqXDMc4ARm4KOW2pLFsOTxjiz3CuHy8s="; }; patches = lib.optionals stdenv.isDarwin [ @@ -118,14 +118,6 @@ stdenv.mkDerivation (finalAttrs: { # Disable flaky test. # https://gitlab.gnome.org/GNOME/glib/-/issues/820 ./skip-timer-test.patch - - # Fix infinite loop (e.g. in gnome-keyring) - # https://github.com/NixOS/nixpkgs/pull/197754#issuecomment-1312805358 - # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3039 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/glib/-/commit/2a36bb4b7e46f9ac043561c61f9a790786a5440c.patch"; - sha256 = "b77Hxt6WiLxIGqgAj9ZubzPWrWmorcUOEe/dp01BcXA="; - }) ]; outputs = [ "bin" "out" "dev" "devdoc" ]; |