From 3ecbe36e8d5118f44994dcef6dcd2fd18c65eb02 Mon Sep 17 00:00:00 2001 From: Frederik Ramcke <757280+EggBaconAndSpam@users.noreply.github.com> Date: Mon, 23 Aug 2021 15:41:52 +0200 Subject: [PATCH] glibc: 2.32-48 -> 2.32-54 --- .../libraries/glibc/2.32-master.patch.gz | Bin 66850 -> 71829 bytes pkgs/development/libraries/glibc/common.nix | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibc/2.32-master.patch.gz b/pkgs/development/libraries/glibc/2.32-master.patch.gz index 8ea998b5bea2cb66113573133190ff3a75fd51d6..b935f821e956ad3582d97f78bd5946b84cda5306 100644 GIT binary patch delta 5190 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 A$N&HU delta 172 zcmV;d08{^!u>_)u1c0;wg9Lv=RQP&&Nv4UG2FA(8iAJ=p{2>(yxIO{j^g{m%g<7RO z#%2rx27^}?aKdhkC&>!59VOK`YjcqAfX(c9$RSH0O`6Ed`XE<(Al3P#)KrF$nu<#8 z0BEp5c1L;o`FQ%d#s^0RJ3IRLfJ}rMuA^Y212b8zI2G0_Cbf>!C9WWjL!1E)69nx? aLL@Booo@=n)_MxKYCQnqzU`9m+5-Uku}`7^ diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 049688cf74d..5d4556da32e 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -42,7 +42,7 @@ let version = "2.32"; - patchSuffix = "-48"; + patchSuffix = "-54"; sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"; in @@ -61,7 +61,7 @@ stdenv.mkDerivation ({ [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. $ git fetch --all -p && git checkout origin/release/2.32/master && git describe - glibc-2.32-48-g16949aeaa0 + glibc-2.32-54-g182ffd8e75 $ git show --minimal --reverse glibc-2.32.. | gzip -9n --rsyncable - > 2.32-master.patch.gz To compare the archive contents zdiff can be used.