diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-10-11 13:21:26 +0000 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-10-24 01:17:53 +0200 |
commit | bd2b324906a0619e4c6b298d1bbacd9ba553f5e3 (patch) | |
tree | 92b25425a77af3fa85c9d58aeda143e4e0f61e2e /pkgs/development/libraries/glib | |
parent | 2c7d0b5362a1aaed77c684e2f4d39cd21ae2db2e (diff) |
glib: 2.66.0 → 2.66.1
https://ftp.gnome.org/pub/GNOME/sources/glib/2.66/glib-2.66.1.news
Diffstat (limited to 'pkgs/development/libraries/glib')
-rw-r--r-- | pkgs/development/libraries/glib/default.nix | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index d719c5037df68..f3ff51459c1cb 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.66.0"; + version = "2.66.1"; src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0v0m268qichkh0sirj8gd4awwg6258yr8k6s6p0lhmh68gqnp9n5"; + sha256 = "0q7g70j6vjvcw4xf6bbfkm4j6mradcabdcdcy4gs5hxwkzkgysd2"; }; patches = optionals stdenv.isDarwin [ @@ -83,12 +83,6 @@ stdenv.mkDerivation rec { # 3. Tools for desktop environment that cannot go to $bin due to $out depending on them ($out) # * gio-launch-desktop ./split-dev-programs.patch - - # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1648 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/glib/-/commit/642baa50fa561f7abfbbfe5ac9a10351a706b95a.patch"; - sha256 = "0mrin6x6iy9x2bplz6q7ljdq677nmvcwhns7nkahj719h0qpzn0z"; - }) ] ++ optional doCheck ./skip-timer-test.patch; outputs = [ "bin" "out" "dev" "devdoc" ]; |