diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-02-16 18:32:21 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-02-16 18:32:21 +0000 |
| commit | 9becdcc5df71b47a5da84ad670e9a7eae9e0c65a (patch) | |
| tree | 2ddf0335eb393f89501e3753b50c3f7ab0552d12 /nixpkgs/pkgs/development/libraries/glibc/common.nix | |
| parent | 49f2a77ac9abc88c253f68952eda26557fc3b555 (diff) | |
| parent | ff96a0fa5635770390b184ae74debea75c3fd534 (diff) | |
| download | nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.gz nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.bz2 nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.lz nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.xz nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.zst nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.zip | |
nixpkgs: merge nixos-unstable
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/glibc/common.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/glibc/common.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/glibc/common.nix b/nixpkgs/pkgs/development/libraries/glibc/common.nix index 6637a9bb2a39..54882ba67185 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/common.nix +++ b/nixpkgs/pkgs/development/libraries/glibc/common.nix @@ -42,7 +42,7 @@ let version = "2.32"; - patchSuffix = "-25"; + patchSuffix = "-35"; sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"; in @@ -62,11 +62,11 @@ stdenv.mkDerivation ({ /* 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 release/2.32/master; git describe - glibc-2.32-25-g0d9793e82a - $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-25.patch.gz + $ git checkout origin/release/2.32/master; git describe + glibc-2.32-35-g082798622d + $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-35.patch.gz */ - ./2.32-25.patch.gz + ./2.32-35.patch.gz /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch |