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: 9c0459648006
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 826f08c65f8c
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Nov 23, 2020

  1. busybox: 1.31.1 -> 1.32.0

    James Landrein authored and James committed Nov 23, 2020

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    565c6a2 View commit details

Commits on Jan 3, 2021

  1. Merge pull request #104433 from j4m3s-s/master 

    busybox: 1.31.1 -> 1.32.0
    @SuperSandro2000
    SuperSandro2000 authored Jan 3, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    826f08c View commit details
71 changes: 0 additions & 71 deletions pkgs/os-specific/linux/busybox/0001-Fix-build-with-glibc-2.31.patch
View file

This file was deleted.

94 changes: 0 additions & 94 deletions ...os-specific/linux/busybox/0001-wget-implement-TLS-verification-with-ENABLE_FEATURE_.patch
View file

This file was deleted.

9 changes: 2 additions & 7 deletions pkgs/os-specific/linux/busybox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -48,26 +48,21 @@ 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" ]
++ lib.optionals enableStatic [ "fortify" ];

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 .";