summary refs log tree commit diff
path: root/pkgs/misc/busybox/default.nix
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2012-03-11 21:23:15 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2012-03-11 21:23:15 +0000
commit5ada5e0712f1cfdf7d9e9ba6fc51db4ded34402f (patch)
treec3b3d92180e58c5fbe9abebea0badc26912b611f /pkgs/misc/busybox/default.nix
parent7b47dea7b062d0a9c2028ebf3e2cfa0adcf77d80 (diff)
downloadnixpkgs-5ada5e0712f1cfdf7d9e9ba6fc51db4ded34402f.tar
nixpkgs-5ada5e0712f1cfdf7d9e9ba6fc51db4ded34402f.tar.gz
nixpkgs-5ada5e0712f1cfdf7d9e9ba6fc51db4ded34402f.tar.bz2
nixpkgs-5ada5e0712f1cfdf7d9e9ba6fc51db4ded34402f.tar.lz
nixpkgs-5ada5e0712f1cfdf7d9e9ba6fc51db4ded34402f.tar.xz
nixpkgs-5ada5e0712f1cfdf7d9e9ba6fc51db4ded34402f.tar.zst
nixpkgs-5ada5e0712f1cfdf7d9e9ba6fc51db4ded34402f.zip
Updating busybox and fixing its configurator.
svn path=/nixpkgs/trunk/; revision=32998
Diffstat (limited to 'pkgs/misc/busybox/default.nix')
-rw-r--r--pkgs/misc/busybox/default.nix8
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/misc/busybox/default.nix b/pkgs/misc/busybox/default.nix
index 6ca30ddd96b..b5bf9e038c9 100644
--- a/pkgs/misc/busybox/default.nix
+++ b/pkgs/misc/busybox/default.nix
@@ -3,7 +3,6 @@
 let
   configParser = ''
     function parseconfig {
-        set -x
         while read LINE; do
             NAME=`echo "$LINE" | cut -d \  -f 1`
             OPTION=`echo "$LINE" | cut -d \  -f 2`
@@ -18,12 +17,11 @@ let
             fi
 
             echo "parseconfig: removing $NAME"
-            sed -i /^$NAME=/d .config
+            sed -i /$NAME'\(=\| \)'/d .config
 
             echo "parseconfig: setting $NAME=$OPTION"
             echo "$NAME=$OPTION" >> .config
         done
-        set +x
     }
   '';
 
@@ -39,11 +37,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "busybox-1.19.0";
+  name = "busybox-1.19.4";
 
   src = fetchurl {
     url = "http://busybox.net/downloads/${name}.tar.bz2";
-    sha256 = "0332yxvlfv2hbix9n70dyp4xlm2hrk248qqdg006hyfpjsh49kqr";
+    sha256 = "1vhh6xa71w4wzby0f4x357fv6zxvkklmyjc8njgbbzv1v83391cv";
   };
 
   configurePhase = ''