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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 MvYJSf+oCKC0NU;R$N&HU delta 172 zcmbQbk!4XAOT!k%W|n&AkRMf5p36F?u^l^ktkZ4Fx<87doIC6o?|*Un&(#{W)b>~! z4-;E+xLCoVydL$FTw7#SuUcdmPk7&O_D#hJMQ;V)Stm~aQV6eBxcYO+m5{axv%0+A zGGuIUEOW2?^|RvF&SUKEY}VGlel+;BNUd9(u!Pw-a;=5vHEp%6eV0|&DfBtdVdN8L fdF$?^qVr{LKG%_JRa`r=Y#AQzdpqgFEoKG)`ms-< 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.