From 874fa4d8a35d570f11e622d55ba3a60a6ac9e660 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 6 May 2015 00:14:18 -0700
Subject: busybox: 1.22.1 -> 1.23.2

Also use musl as libc since it is just as small as uclibc, usually more
performant, and regularly makes releases.
---
 pkgs/os-specific/linux/busybox/default.nix | 25 +++++++++++++++----------
 pkgs/stdenv/linux/make-bootstrap-tools.nix |  2 +-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 47f9fb9a5a40..2a96f4b46b39 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -1,4 +1,9 @@
-{ lib, stdenv, uclibc, fetchurl, enableStatic ? false, enableMinimal ? false, useUclibc ? false, extraConfig ? "" }:
+{ stdenv, fetchurl, musl
+, enableStatic ? false
+, enableMinimal ? false
+, useMusl ? false
+, extraConfig ? ""
+}:
 
 let
   configParser = ''
@@ -21,11 +26,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "busybox-1.22.1";
+  name = "busybox-1.23.2";
 
   src = fetchurl {
     url = "http://busybox.net/downloads/${name}.tar.bz2";
-    sha256 = "12v7nri79v8gns3inmz4k24q7pcnwi00hybs0wddfkcy1afh42xf";
+    sha256 = "16ii9sqracvh2r1gfzhmlypl269nnbkpvrwa7270k35d3bigk9h5";
   };
 
   patches = [ ./busybox-in-store.patch ];
@@ -41,7 +46,7 @@ stdenv.mkDerivation rec {
     CONFIG_PREFIX "$out"
     CONFIG_INSTALL_NO_USR y
 
-    ${lib.optionalString enableStatic ''
+    ${stdenv.lib.optionalString enableStatic ''
       CONFIG_STATIC y
     ''}
 
@@ -54,8 +59,8 @@ stdenv.mkDerivation rec {
     EOF
 
     make oldconfig
-  '' + lib.optionalString useUclibc ''
-    makeFlagsArray+=("CC=gcc -isystem ${uclibc}/include -B${uclibc}/lib -L${uclibc}/lib")
+  '' + stdenv.lib.optionalString useMusl ''
+    makeFlagsArray+=("CC=gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib")
   '';
 
   crossAttrs = {
@@ -69,11 +74,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Tiny versions of common UNIX utilities in a single small executable";
     homepage = http://busybox.net/;
-    license = lib.licenses.gpl2;
-    maintainers = [ lib.maintainers.viric ];
-    platforms = lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ viric ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 3ad81476c2e9..a995606886f3 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -17,7 +17,7 @@ rec {
   };
 
   busyboxMinimal = busybox.override {
-    useUclibc = true;
+    useMusl = true;
     enableStatic = true;
     enableMinimal = true;
     extraConfig = ''
-- 
cgit 1.4.1