Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 80c367cf1bee
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 733b53313cab
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jan 22, 2021

  1. glibc: 2.32-25 -> 2.32-35

    @TredwellGit @FRidh
    TredwellGit authored and FRidh committed Jan 22, 2021
    Copy the full SHA
    733b533 View commit details
Showing with 5 additions and 5 deletions.
  1. BIN pkgs/development/libraries/glibc/{2.32-25.patch.gz → 2.32-35.patch.gz}
  2. +5 −5 pkgs/development/libraries/glibc/common.nix
Binary file renamed ...elopment/libraries/glibc/2.32-25.patch.gz → ...elopment/libraries/glibc/2.32-35.patch.gz
View file
Binary file not shown.
10 changes: 5 additions & 5 deletions pkgs/development/libraries/glibc/common.nix
View file
Original file line number Diff line number Diff line change
@@ -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