diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2017-01-03 08:40:32 -0500 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2017-01-03 08:40:32 -0500 |
| commit | 9bd93ac6e0202391c3cf21a8f6896c5eab312dcf (patch) | |
| tree | e0843473453fe64db90b816c337895faccfe8ab1 /pkgs/os-specific/linux/busybox | |
| parent | cdf306909f3bf25fe962195c584dbe5b18ee9896 (diff) | |
| download | nixpkgs-9bd93ac6e0202391c3cf21a8f6896c5eab312dcf.tar nixpkgs-9bd93ac6e0202391c3cf21a8f6896c5eab312dcf.tar.gz nixpkgs-9bd93ac6e0202391c3cf21a8f6896c5eab312dcf.tar.bz2 nixpkgs-9bd93ac6e0202391c3cf21a8f6896c5eab312dcf.tar.lz nixpkgs-9bd93ac6e0202391c3cf21a8f6896c5eab312dcf.tar.xz nixpkgs-9bd93ac6e0202391c3cf21a8f6896c5eab312dcf.tar.zst nixpkgs-9bd93ac6e0202391c3cf21a8f6896c5eab312dcf.zip | |
busybox: 1.25.1 -> 1.26.1
Diffstat (limited to 'pkgs/os-specific/linux/busybox')
| -rw-r--r-- | pkgs/os-specific/linux/busybox/busybox-in-store.patch | 16 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/busybox/default.nix | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/busybox/busybox-in-store.patch b/pkgs/os-specific/linux/busybox/busybox-in-store.patch index 3500f167a14..d3111efbdc4 100644 --- a/pkgs/os-specific/linux/busybox/busybox-in-store.patch +++ b/pkgs/os-specific/linux/busybox/busybox-in-store.patch @@ -1,14 +1,14 @@ Allow BusyBox to be invoked as "<something>-busybox". This is necessary when it's run from the Nix store as <hash>-busybox during stdenv bootstrap. ---- busybox-1.25.1-orig/libbb/appletlib.orig 2016-10-26 19:54:20.510957575 -0400 -+++ busybox-1.25.1/libbb/appletlib.c 2016-10-26 19:48:31.590862853 -0400 -@@ -884,7 +884,7 @@ - int applet; - - # if ENABLE_BUSYBOX +--- busybox-1.26.1-orig/libbb/appletlib.orig 2016-10-26 19:54:20.510957575 -0400 ++++ busybox-1.26.1/libbb/appletlib.c 2016-10-26 19:48:31.590862853 -0400 +@@ -887,7 +887,7 @@ + static NORETURN void run_applet_and_exit(const char *name, char **argv) + { + # if ENABLE_BUSYBOX - if (is_prefixed_with(name, "busybox")) + if (strstr(name, "busybox") != 0) exit(busybox_main(argv)); - # endif - /* find_applet_by_name() search is more expensive, so goes second */ + # endif + # if NUM_APPLETS > 0 diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 6f86529a265..b3502d269b0 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -26,11 +26,11 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.25.1"; + name = "busybox-1.26.1"; src = fetchurl { url = "http://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "0bm0l8xdjdz3kdyajp8wg27yamsw7r2y88nnrxwvvz984c7pwri7"; + sha256 = "1wl1yy82am53srhgpi1w04hs5hbqjljrrxwwfic35k1mza3y9fqg"; }; hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ]; |