lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

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.

+16 -11
+15 -10
pkgs/os-specific/linux/busybox/default.nix
··· 1 - { lib, stdenv, uclibc, fetchurl, enableStatic ? false, enableMinimal ? false, useUclibc ? false, extraConfig ? "" }: 1 + { stdenv, fetchurl, musl 2 + , enableStatic ? false 3 + , enableMinimal ? false 4 + , useMusl ? false 5 + , extraConfig ? "" 6 + }: 2 7 3 8 let 4 9 configParser = '' ··· 21 26 in 22 27 23 28 stdenv.mkDerivation rec { 24 - name = "busybox-1.22.1"; 29 + name = "busybox-1.23.2"; 25 30 26 31 src = fetchurl { 27 32 url = "http://busybox.net/downloads/${name}.tar.bz2"; 28 - sha256 = "12v7nri79v8gns3inmz4k24q7pcnwi00hybs0wddfkcy1afh42xf"; 33 + sha256 = "16ii9sqracvh2r1gfzhmlypl269nnbkpvrwa7270k35d3bigk9h5"; 29 34 }; 30 35 31 36 patches = [ ./busybox-in-store.patch ]; ··· 41 46 CONFIG_PREFIX "$out" 42 47 CONFIG_INSTALL_NO_USR y 43 48 44 - ${lib.optionalString enableStatic '' 49 + ${stdenv.lib.optionalString enableStatic '' 45 50 CONFIG_STATIC y 46 51 ''} 47 52 ··· 54 59 EOF 55 60 56 61 make oldconfig 57 - '' + lib.optionalString useUclibc '' 58 - makeFlagsArray+=("CC=gcc -isystem ${uclibc}/include -B${uclibc}/lib -L${uclibc}/lib") 62 + '' + stdenv.lib.optionalString useMusl '' 63 + makeFlagsArray+=("CC=gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib") 59 64 ''; 60 65 61 66 crossAttrs = { ··· 69 74 70 75 enableParallelBuilding = true; 71 76 72 - meta = { 77 + meta = with stdenv.lib; { 73 78 description = "Tiny versions of common UNIX utilities in a single small executable"; 74 79 homepage = http://busybox.net/; 75 - license = lib.licenses.gpl2; 76 - maintainers = [ lib.maintainers.viric ]; 77 - platforms = lib.platforms.linux; 80 + license = licenses.gpl2; 81 + maintainers = with maintainers; [ viric ]; 82 + platforms = platforms.linux; 78 83 }; 79 84 }
+1 -1
pkgs/stdenv/linux/make-bootstrap-tools.nix
··· 17 17 }; 18 18 19 19 busyboxMinimal = busybox.override { 20 - useUclibc = true; 20 + useMusl = true; 21 21 enableStatic = true; 22 22 enableMinimal = true; 23 23 extraConfig = ''