diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-19 09:13:54 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-19 09:13:54 +0000 |
| commit | 220273ccc689041667ab5ff55fe5b1e93689227a (patch) | |
| tree | d1c95664832920b476ab48ab5dd9ad09ec67d82d /nixpkgs/pkgs/development/libraries/glibc | |
| parent | 68bab940e926ec7ae7380947a78c581e6aadcd18 (diff) | |
| parent | 6e3ee8957637a60f5072e33d78e05c0f65c54366 (diff) | |
| download | nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar.gz nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar.bz2 nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar.lz nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar.xz nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar.zst nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.zip | |
Merge commit '6e3ee8957637a60f5072e33d78e05c0f65c54366'
Conflicts: nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/glibc')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz | bin | 147266 -> 155232 bytes | |||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/glibc/common.nix | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz b/nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz index 49ffd4a7441c..777e94e2b2ea 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz +++ b/nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz Binary files differdiff --git a/nixpkgs/pkgs/development/libraries/glibc/common.nix b/nixpkgs/pkgs/development/libraries/glibc/common.nix index 9a84a5f8167a..ffec9972d287 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/common.nix +++ b/nixpkgs/pkgs/development/libraries/glibc/common.nix @@ -44,7 +44,7 @@ let version = "2.33"; - patchSuffix = "-108"; + patchSuffix = "-117"; sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8="; in @@ -63,7 +63,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.33/master && git describe - glibc-2.33-108-g3e2a15c666 + glibc-2.33-117-g55446dd8a2 $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz To compare the archive contents zdiff can be used. |