about summary refs log tree commit diff
path: root/pkgs/tools/archivers
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-02-05 13:41:09 +0100
committerVladimír Čunát <v@cunat.cz>2020-02-05 13:41:09 +0100
commit48a997cd76c8f141938cf98f82a867d0cf88fec2 (patch)
tree78469b48c8ca2451134c411b689902ed4d046414 /pkgs/tools/archivers
parent15021db2fa441d7fa73538dd0e46e9d74731ace8 (diff)
parent5ca088f1cc4216fe4a11a769ec5d55343a3f978a (diff)
downloadnixlib-48a997cd76c8f141938cf98f82a867d0cf88fec2.tar
nixlib-48a997cd76c8f141938cf98f82a867d0cf88fec2.tar.gz
nixlib-48a997cd76c8f141938cf98f82a867d0cf88fec2.tar.bz2
nixlib-48a997cd76c8f141938cf98f82a867d0cf88fec2.tar.lz
nixlib-48a997cd76c8f141938cf98f82a867d0cf88fec2.tar.xz
nixlib-48a997cd76c8f141938cf98f82a867d0cf88fec2.tar.zst
nixlib-48a997cd76c8f141938cf98f82a867d0cf88fec2.zip
Merge #66528: glibc: 2.27 -> 2.30 (into staging)
Includes update of stdenv bootstap tools (for three main platforms)
and many package fixes with new glibc.
Diffstat (limited to 'pkgs/tools/archivers')
-rw-r--r--pkgs/tools/archivers/sharutils/default.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix
index 0dfd234bc758..b4fc2377f0e4 100644
--- a/pkgs/tools/archivers/sharutils/default.nix
+++ b/pkgs/tools/archivers/sharutils/default.nix
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
       url = "https://sources.debian.org/data/main/s/sharutils/1:4.15.2-2+deb9u1/debian/patches/01-fix-heap-buffer-overflow-cve-2018-1000097.patch";
       sha256 = "19g0sxc8g79aj5gd5idz5409311253jf2q8wqkasf0handdvsbxx";
     })
+    (fetchurl {
+      url = "https://sources.debian.org/data/main/s/sharutils/1:4.15.2-4/debian/patches/02-fix-ftbfs-with-glibc-2.28.patch";
+      sha256 = "15kpjqnfs98n6irmkh8pw7masr08xala7gx024agv7zv14722vkc";
+    })
   ];
 
   postPatch = let