diff options
| author | James Landrein <james@cri.epita.fr> | 2020-11-20 23:44:19 +0100 |
|---|---|---|
| committer | James <me@j4m3s.eu> | 2020-11-24 00:58:36 +0100 |
| commit | 565c6a2a572c4e06ddb986a80dcd85b02d360bbf (patch) | |
| tree | 9912329e2828bb7fac0bffda138125cb950ff697 /pkgs/os-specific/linux/busybox/default.nix | |
| parent | 5c9e2ff98990c6e004610c8980f09a9b5d013691 (diff) | |
| download | nixpkgs-565c6a2a572c4e06ddb986a80dcd85b02d360bbf.tar nixpkgs-565c6a2a572c4e06ddb986a80dcd85b02d360bbf.tar.gz nixpkgs-565c6a2a572c4e06ddb986a80dcd85b02d360bbf.tar.bz2 nixpkgs-565c6a2a572c4e06ddb986a80dcd85b02d360bbf.tar.lz nixpkgs-565c6a2a572c4e06ddb986a80dcd85b02d360bbf.tar.xz nixpkgs-565c6a2a572c4e06ddb986a80dcd85b02d360bbf.tar.zst nixpkgs-565c6a2a572c4e06ddb986a80dcd85b02d360bbf.zip | |
busybox: 1.31.1 -> 1.32.0
Diffstat (limited to 'pkgs/os-specific/linux/busybox/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/busybox/default.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 599754129b4..026ea6fd2e8 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -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 ."; |