From 6fb325e389475293e2b5b7378ce6434e8b61bf7d Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 30 Mar 2021 19:10:03 +0000 Subject: [PATCH] glibc: 2.32-39 -> 2.32-40 --- .../libraries/glibc/2.32-master.patch.gz | Bin 56968 -> 58063 bytes pkgs/development/libraries/glibc/common.nix | 15 ++++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/glibc/2.32-master.patch.gz b/pkgs/development/libraries/glibc/2.32-master.patch.gz index bd99c36d741225496eaef384c4e7d2f339206569..bcf4d13443cf5e51b80d5f4cce4f65f8d4878585 100644 GIT binary patch delta 4426 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 delta 3322 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 X=Jj*qZ4Fj8{xeA$8XHe^VrBpUB@krx diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index b3862cc5c0b..7a83ffd36d7 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -42,7 +42,7 @@ let version = "2.32"; - patchSuffix = "-39"; + patchSuffix = "-40"; sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"; in @@ -59,12 +59,13 @@ stdenv.mkDerivation ({ patches = [ - /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git - and using git or something would complicate bootstrapping. - Fortunately it's not too big. - $ git checkout origin/release/2.32/master; git describe - glibc-2.32-39-g44b3959329 - $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-master.patch.gz + /* 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-40-g778b8d3786 + $ git show --minimal --reverse glibc-2.32.. | gzip -9n --rsyncable - > 2.32-master.patch.gz + + To compare the archive contents zdiff can be used. + $ zdiff -u 2.32-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz */ ./2.32-master.patch.gz