summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-10-29 14:55:04 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-10-29 14:55:04 +0100
commitac8e5cd145fa5f22bab1b01d8b4db4d26d22e65c (patch)
tree930c52185d80e476a3cfc7ac59f06108ac4cd90e
parent41a479b15f2f26fde3952e384d1aff37bde7186b (diff)
downloadnixlib-ac8e5cd145fa5f22bab1b01d8b4db4d26d22e65c.tar
nixlib-ac8e5cd145fa5f22bab1b01d8b4db4d26d22e65c.tar.gz
nixlib-ac8e5cd145fa5f22bab1b01d8b4db4d26d22e65c.tar.bz2
nixlib-ac8e5cd145fa5f22bab1b01d8b4db4d26d22e65c.tar.lz
nixlib-ac8e5cd145fa5f22bab1b01d8b4db4d26d22e65c.tar.xz
nixlib-ac8e5cd145fa5f22bab1b01d8b4db4d26d22e65c.tar.zst
nixlib-ac8e5cd145fa5f22bab1b01d8b4db4d26d22e65c.zip
uclibc: Update to the latest prerelease
This resolves a segfault in busybox.
-rw-r--r--pkgs/os-specific/linux/uclibc/default.nix14
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix
index dadae487cd2f..169733112054 100644
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/pkgs/os-specific/linux/uclibc/default.nix
@@ -46,22 +46,16 @@ let
   '';
 
 in
+
 stdenv.mkDerivation {
-  name = "uclibc-0.9.33.2" + stdenv.lib.optionalString (cross != null)
+  name = "uclibc-0.9.34-pre-20141029" + stdenv.lib.optionalString (cross != null)
     ("-" + cross.config);
 
   src = fetchurl {
-    url = http://www.uclibc.org/downloads/uClibc-0.9.33.2.tar.bz2;
-    sha256 = "0qhngsbzj2s6nz92b1s2p0dmvwk8xiqpy58j7ljzw186grvjr3cq";
+    url = http://www.uclibc.org/downloads/snapshots/uClibc-20141029.tar.bz2;
+    sha256 = "018r3bhw1jyyihmm5xxq1psl3r5yx02a57p8qxvay3vvzxn2cvzm";
   };
 
-  patches =
-    [ (fetchurl {
-        url = https://dev.openwrt.org/export/37939/trunk/toolchain/uClibc/patches-0.9.33.2/970-add___kernel_long_and___kernel_ulong.patch;
-        sha256 = "1d1bfjpw0qla5zr32wk32s1y3wl2576zidbmvqsmqf0359bxhxrg";
-      })
-    ];
-
   # 'ftw' needed to build acl, a coreutils dependency
   configurePhase = ''
     make defconfig ${archMakeFlag}