busybox: 1.31.1 -> 1.32.0

This commit is contained in:
James Landrein
2020-11-24 00:58:36 +01:00
committed by James
parent 5c9e2ff989
commit 565c6a2a57
3 changed files with 2 additions and 172 deletions
+2 -7
View File
@@ -48,17 +48,14 @@ let
in
stdenv.mkDerivation rec {
# TODO: When bumping this version, please validate whether the wget patch is present upstream
# and remove the patch if it is. The patch should be present upstream for all versions 1.32.0+.
# See NixOs/nixpkgs#94722 for context.
name = "busybox-1.31.1";
name = "busybox-1.32.0";
# Note to whoever is updating busybox: please verify that:
# nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test
# still builds after the update.
src = fetchurl {
url = "https://busybox.net/downloads/${name}.tar.bz2";
sha256 = "1659aabzp8w4hayr4z8kcpbk2z1q2wqhw7i1yb0l72b45ykl1yfh";
sha256 = "w12H8dBLKxU9M8J1wmMuQNOIqI8ZqecXJ+C7v/Uf5ok=";
};
hardeningDisable = [ "format" "pie" ]
@@ -66,8 +63,6 @@ stdenv.mkDerivation rec {
patches = [
./busybox-in-store.patch
./0001-Fix-build-with-glibc-2.31.patch
./0001-wget-implement-TLS-verification-with-ENABLE_FEATURE_.patch
] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch;
postPatch = "patchShebangs .";