public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #126594 from NixOS/backport-126551-to-staging-21.05

Browse Source 
[Backport staging-21.05] glibc: 2.32-46 -> 2.32-48
This commit is contained in:
Maximilian Bosch 2021-06-22 17:40:43 +02:00 committed by GitHub
commit 4432fd7d23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pkgs/development/libraries/glibc/2.32-master.patch.gz
View File

Binary file not shown.

4
pkgs/development/libraries/glibc/common.nix
View File

@ -42,7 +42,7 @@
let let
version = "2.32"; version = "2.32";
patchSuffix = "-46"; patchSuffix = "-48";
sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"; sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn";
in 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. /* 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 $ git fetch --all -p && git checkout origin/release/2.32/master && git describe
glibc-2.32-46-g1799ac8eab glibc-2.32-48-g16949aeaa0
$ git show --minimal --reverse glibc-2.32.. | gzip -9n --rsyncable - > 2.32-master.patch.gz $ git show --minimal --reverse glibc-2.32.. | gzip -9n --rsyncable - > 2.32-master.patch.gz
To compare the archive contents zdiff can be used. To compare the archive contents zdiff can be used.