2018-07-21 02:44:44 +02:00
|
|
|
{ stdenv, lib, buildPackages, fetchurl
|
2015-05-06 09:14:18 +02:00
|
|
|
, enableStatic ? false
|
|
|
|
, enableMinimal ? false
|
2018-01-23 22:42:02 +01:00
|
|
|
, useMusl ? stdenv.hostPlatform.libc == "musl", musl
|
2015-05-06 09:14:18 +02:00
|
|
|
, extraConfig ? ""
|
|
|
|
}:
|
2010-03-09 23:17:38 +01:00
|
|
|
|
2018-01-23 22:42:02 +01:00
|
|
|
assert stdenv.hostPlatform.libc == "musl" -> useMusl;
|
|
|
|
|
2010-03-09 23:17:38 +01:00
|
|
|
let
|
2010-08-01 23:06:45 +02:00
|
|
|
configParser = ''
|
|
|
|
function parseconfig {
|
|
|
|
while read LINE; do
|
2010-08-01 23:25:37 +02:00
|
|
|
NAME=`echo "$LINE" | cut -d \ -f 1`
|
|
|
|
OPTION=`echo "$LINE" | cut -d \ -f 2`
|
2010-08-01 23:06:45 +02:00
|
|
|
|
2014-10-29 13:32:40 +01:00
|
|
|
if ! [[ "$NAME" =~ ^CONFIG_ ]]; then continue; fi
|
2010-08-01 23:06:45 +02:00
|
|
|
|
2010-08-01 23:25:37 +02:00
|
|
|
echo "parseconfig: removing $NAME"
|
2012-03-11 22:23:15 +01:00
|
|
|
sed -i /$NAME'\(=\| \)'/d .config
|
2010-08-01 23:06:45 +02:00
|
|
|
|
2010-11-21 21:39:52 +01:00
|
|
|
echo "parseconfig: setting $NAME=$OPTION"
|
|
|
|
echo "$NAME=$OPTION" >> .config
|
2010-08-01 23:06:45 +02:00
|
|
|
done
|
|
|
|
}
|
|
|
|
'';
|
|
|
|
|
2018-01-23 22:42:02 +01:00
|
|
|
libcConfig = lib.optionalString useMusl ''
|
|
|
|
CONFIG_FEATURE_UTMP n
|
|
|
|
CONFIG_FEATURE_WTMP n
|
|
|
|
'';
|
2010-03-09 23:17:38 +01:00
|
|
|
in
|
|
|
|
|
2010-08-22 01:13:21 +02:00
|
|
|
stdenv.mkDerivation rec {
|
Merge staging-next into master (#44009)
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.
* libffi: simplify using `checkInputs`
* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix
* utillinux: 2.32 -> 2.32.1
https://lkml.org/lkml/2018/7/16/532
* busybox: 1.29.0 -> 1.29.1
* bind: 9.12.1-P2 -> 9.12.2
https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html
* curl: 7.60.0 -> 7.61.0
* gvfs: make tests run, but disable
* ilmbase: disable tests on i686. Spooky!
* mdds: fix tests
* git: disable checks as tests are run in installcheck
* ruby: disable tests
* libcommuni: disable checks as tests are run in installcheck
* librdf: make tests run, but disable
* neon, neon_0_29: make tests run, but disable
* pciutils: 3.6.0 -> 3.6.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.
* mesa: more include fixes
mostly from void-linux (thanks!)
* npth: 1.5 -> 1.6
minor bump
* boost167: Add lockfree next_prior patch
* stdenv: cleanup darwin bootstrapping
Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.
* Revert "pciutils: use standardized equivalent for canonicalize_file_name"
This reverts commit f8db20fb3ae382eba1ba2b160fe24739f43c0bd7.
Patching should no longer be needed with 3.6.1.
* binutils-wrapper: Try to avoid adding unnecessary -L flags
(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>
* libffi: don't check on darwin
libffi usages in stdenv broken darwin. We need to disable doCheck for that case.
* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook
* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273
When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.
* parity-ui: fix after merge
* python.pkgs.pytest-flake8: disable test, fix build
* Revert "meson: 0.46.1 -> 0.47.0"
With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.
When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.
Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.
I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)
This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.
--
Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).
Fixes #43650.
This reverts commit 305ac4dade5758c58e8ab1666ad0197fd305828d.
(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 16:04:48 +02:00
|
|
|
name = "busybox-1.29.1";
|
2010-03-09 23:17:38 +01:00
|
|
|
|
2017-08-21 09:11:00 +02:00
|
|
|
# Note to whoever is updating busybox: please verify that:
|
|
|
|
# nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test
|
|
|
|
# still builds after the update.
|
2010-03-09 23:17:38 +01:00
|
|
|
src = fetchurl {
|
2018-06-28 20:43:35 +02:00
|
|
|
url = "https://busybox.net/downloads/${name}.tar.bz2";
|
Merge staging-next into master (#44009)
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.
* libffi: simplify using `checkInputs`
* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix
* utillinux: 2.32 -> 2.32.1
https://lkml.org/lkml/2018/7/16/532
* busybox: 1.29.0 -> 1.29.1
* bind: 9.12.1-P2 -> 9.12.2
https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html
* curl: 7.60.0 -> 7.61.0
* gvfs: make tests run, but disable
* ilmbase: disable tests on i686. Spooky!
* mdds: fix tests
* git: disable checks as tests are run in installcheck
* ruby: disable tests
* libcommuni: disable checks as tests are run in installcheck
* librdf: make tests run, but disable
* neon, neon_0_29: make tests run, but disable
* pciutils: 3.6.0 -> 3.6.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.
* mesa: more include fixes
mostly from void-linux (thanks!)
* npth: 1.5 -> 1.6
minor bump
* boost167: Add lockfree next_prior patch
* stdenv: cleanup darwin bootstrapping
Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.
* Revert "pciutils: use standardized equivalent for canonicalize_file_name"
This reverts commit f8db20fb3ae382eba1ba2b160fe24739f43c0bd7.
Patching should no longer be needed with 3.6.1.
* binutils-wrapper: Try to avoid adding unnecessary -L flags
(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>
* libffi: don't check on darwin
libffi usages in stdenv broken darwin. We need to disable doCheck for that case.
* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook
* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273
When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.
* parity-ui: fix after merge
* python.pkgs.pytest-flake8: disable test, fix build
* Revert "meson: 0.46.1 -> 0.47.0"
With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.
When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.
Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.
I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)
This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.
--
Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).
Fixes #43650.
This reverts commit 305ac4dade5758c58e8ab1666ad0197fd305828d.
(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 16:04:48 +02:00
|
|
|
sha256 = "1hqlr5b3bsyb6avadz1z4za6pyl32r1krnpcpwwqilhnx8q0f9gw";
|
2010-03-09 23:17:38 +01:00
|
|
|
};
|
|
|
|
|
2017-09-01 02:46:26 +02:00
|
|
|
hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ];
|
2015-12-23 02:59:47 +01:00
|
|
|
|
2017-11-09 12:11:35 +01:00
|
|
|
patches = [
|
2018-01-07 22:50:23 +01:00
|
|
|
./busybox-in-store.patch
|
2017-11-09 12:11:35 +01:00
|
|
|
];
|
2014-10-29 13:34:46 +01:00
|
|
|
|
2018-03-14 22:58:04 +01:00
|
|
|
postPatch = "patchShebangs .";
|
|
|
|
|
2010-08-01 23:06:45 +02:00
|
|
|
configurePhase = ''
|
2014-04-09 01:15:38 +02:00
|
|
|
export KCONFIG_NOTIMESTAMP=1
|
2014-10-29 13:32:40 +01:00
|
|
|
make ${if enableMinimal then "allnoconfig" else "defconfig"}
|
|
|
|
|
2010-08-01 23:06:45 +02:00
|
|
|
${configParser}
|
2014-10-29 13:32:40 +01:00
|
|
|
|
2010-08-01 23:06:45 +02:00
|
|
|
cat << EOF | parseconfig
|
2014-10-29 13:32:40 +01:00
|
|
|
|
|
|
|
CONFIG_PREFIX "$out"
|
|
|
|
CONFIG_INSTALL_NO_USR y
|
|
|
|
|
2015-10-25 10:15:35 +01:00
|
|
|
CONFIG_LFS y
|
|
|
|
|
2016-07-19 03:37:14 +02:00
|
|
|
${lib.optionalString enableStatic ''
|
2014-10-29 13:32:40 +01:00
|
|
|
CONFIG_STATIC y
|
|
|
|
''}
|
|
|
|
|
|
|
|
# Use the external mount.cifs program.
|
|
|
|
CONFIG_FEATURE_MOUNT_CIFS n
|
|
|
|
CONFIG_FEATURE_MOUNT_HELPERS y
|
|
|
|
|
2016-07-08 17:32:17 +02:00
|
|
|
# Set paths for console fonts.
|
|
|
|
CONFIG_DEFAULT_SETFONT_DIR "/etc/kbd"
|
|
|
|
|
2018-01-23 22:42:36 +01:00
|
|
|
# Bump from 4KB, much faster I/O
|
|
|
|
CONFIG_FEATURE_COPYBUF_KB 64
|
|
|
|
|
2014-07-30 10:49:31 +02:00
|
|
|
${extraConfig}
|
2017-11-25 19:43:57 +01:00
|
|
|
CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cc.targetPrefix}"
|
2018-01-23 22:42:02 +01:00
|
|
|
${libcConfig}
|
2010-08-01 23:06:45 +02:00
|
|
|
EOF
|
2014-10-29 13:32:40 +01:00
|
|
|
|
2010-08-01 23:25:37 +02:00
|
|
|
make oldconfig
|
2016-06-01 21:52:03 +02:00
|
|
|
|
|
|
|
runHook postConfigure
|
|
|
|
'';
|
|
|
|
|
|
|
|
postConfigure = lib.optionalString useMusl ''
|
2018-02-06 14:29:21 +01:00
|
|
|
makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}cc -isystem ${musl.dev}/include -B${musl}/lib -L${musl}/lib")
|
2010-08-01 23:06:45 +02:00
|
|
|
'';
|
2010-03-09 23:17:38 +01:00
|
|
|
|
2017-06-26 05:10:03 +02:00
|
|
|
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
2016-07-19 03:37:14 +02:00
|
|
|
|
2017-06-02 23:35:13 +02:00
|
|
|
buildInputs = lib.optionals (enableStatic && !useMusl) [ stdenv.cc.libc stdenv.cc.libc.static ];
|
2016-06-01 21:52:03 +02:00
|
|
|
|
2012-05-21 19:51:40 +02:00
|
|
|
enableParallelBuilding = true;
|
|
|
|
|
2018-04-25 05:20:18 +02:00
|
|
|
doCheck = false; # tries to access the net
|
|
|
|
|
2015-05-06 09:14:18 +02:00
|
|
|
meta = with stdenv.lib; {
|
2012-03-28 00:05:03 +02:00
|
|
|
description = "Tiny versions of common UNIX utilities in a single small executable";
|
2017-08-02 23:50:51 +02:00
|
|
|
homepage = https://busybox.net/;
|
2015-05-06 09:14:18 +02:00
|
|
|
license = licenses.gpl2;
|
2018-07-22 21:50:19 +02:00
|
|
|
maintainers = with maintainers; [ ];
|
2015-05-06 09:14:18 +02:00
|
|
|
platforms = platforms.linux;
|
2012-03-28 00:05:03 +02:00
|
|
|
};
|
2010-03-09 23:17:38 +01:00
|
|
|
}
|