Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ae482bb41e24
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b75f2114eabc
Choose a head ref
  • 5 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 7, 2020

  1. busybox: Add a default udhcpc dispatcher script 

    The udhcpc binary which currently ships as part of the busybox
derivation will by default search for a dispatcher script at the
location /usr/share/udhcpc/default.script.

This commit includes a working default script with udhcpc and updates
the location where udhcpc searches for this script.

The script was taken the script from the udhcpc package in debian
buster. The only changes from that script is to make it use paths from
the nix store and remove the run-time check for /sbin/resolvconf.
    @TethysSvensson
    TethysSvensson committed Jul 7, 2020
    Copy the full SHA
    b98ad8d View commit details

Commits on Jul 28, 2020

  1. maintainers: add TethysSvensson

    @TethysSvensson
    TethysSvensson committed Jul 28, 2020
    Copy the full SHA
    179b74c View commit details

  2. busybox: Download and patch the dispatcher script from upstream

    @TethysSvensson
    TethysSvensson committed Jul 28, 2020
    Copy the full SHA
    dcc963b View commit details

Commits on Jul 29, 2020

  1. busybox: Use fetchzip instead of fetchTarball to get the dispatcher s… 

    …cript
    @TethysSvensson
    TethysSvensson committed Jul 29, 2020
    Copy the full SHA
    b657c89 View commit details

Commits on Jul 31, 2020

  1. Merge pull request #92581 from TethysSvensson/busybox-udhcpc-script

    @Mic92
    Mic92 authored Jul 31, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b75f211 View commit details
Showing with 28 additions and 2 deletions.
  1. +6 −0 maintainers/maintainer-list.nix
  2. +22 −2 pkgs/os-specific/linux/busybox/default.nix
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -8022,6 +8022,12 @@
githubId = 26417242;
name = "Mikolaj Galkowski";
};
TethysSvensson = {
email = "freaken@freaken.dk";
github = "TethysSvensson";
githubId = 4294434;
name = "Tethys Svensson";
};
teto = {
email = "mcoudron@hotmail.com";
github = "teto";
24 changes: 22 additions & 2 deletions pkgs/os-specific/linux/busybox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, buildPackages, fetchurl
{ stdenv, lib, buildPackages, fetchurl, fetchzip
, enableStatic ? false
, enableMinimal ? false
# Allow forcing musl without switching stdenv itself, e.g. for our bootstrapping:
@@ -31,6 +31,14 @@ let
CONFIG_FEATURE_UTMP n
CONFIG_FEATURE_WTMP n
'';

debianName = "busybox_1.30.1-5";
debianTarball = fetchzip {
url = "http://deb.debian.org/debian/pool/main/b/busybox/${debianName}.debian.tar.xz";
sha256 = "03m4rvs2pd0hj0mdkdm3r4m1gh0bgwr0cvnqds297xnkfi5s01nx";
};
debianDispatcherScript = "${debianTarball}/tree/udhcpc/etc/udhcpc/default.script";
outDispatchPath = "$out/default.script";
in

stdenv.mkDerivation rec {
@@ -81,6 +89,9 @@ stdenv.mkDerivation rec {
# Bump from 4KB, much faster I/O
CONFIG_FEATURE_COPYBUF_KB 64
# Set the path for the udhcpc script
CONFIG_UDHCPC_DEFAULT_SCRIPT "${outDispatchPath}"
${extraConfig}
CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cc.targetPrefix}"
${libcConfig}
@@ -95,6 +106,15 @@ stdenv.mkDerivation rec {
makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}cc -isystem ${musl.dev}/include -B${musl}/lib -L${musl}/lib")
'';

postInstall = ''
sed -e '
1 a busybox() { '$out'/bin/busybox "$@"; }\
logger() { '$out'/bin/logger "$@"; }\
' ${debianDispatcherScript} > ${outDispatchPath}
chmod 555 ${outDispatchPath}
PATH=$out/bin patchShebangs ${outDispatchPath}
'';

depsBuildBuild = [ buildPackages.stdenv.cc ];

buildInputs = lib.optionals (enableStatic && !useMusl && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ];
@@ -107,7 +127,7 @@ stdenv.mkDerivation rec {
description = "Tiny versions of common UNIX utilities in a single small executable";
homepage = "https://busybox.net/";
license = licenses.gpl2;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ TethysSvensson ];
platforms = platforms.linux;
priority = 10;
};