Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

{ed,gzip,gawk,gnugrep}: Add bash to buildInputs #314660

Merged
merged 4 commits into from
May 27, 2024

Conversation

rhelmot
Copy link
Contributor

@rhelmot rhelmot commented May 25, 2024

Description of changes

part of #296581

These packages distribute shell scripts in /bin. Their shebangs are always patched to a /nix/store bash, but by default, they are patched to use the stdenv's shell, which during bootstrap is build in the previous stdenv. By using bash from the current stdenv, we can shorten the FreeBSD bootstrap process significantly.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
    • x86_64-freebsd
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@AndersonTorres
Copy link
Member

AndersonTorres commented May 25, 2024

You are modifying four different packages kept by different people.

Please, do one commit per package (no need for a new PR), so we can know what to bisect in a future bisection adventure.

P.S.: why the hell so many bootstrap packages has literally no maintainers?

We are forcing new contributors to be maintainers of the leaf packages they want to add, but for something literally fundamental as the system bootstrap, maintainers list is empty?

@rhelmot rhelmot force-pushed the freebsd-minimal3/various-shell branch from bdf747e to cb543d7 Compare May 25, 2024 23:38
@rhelmot
Copy link
Contributor Author

rhelmot commented May 25, 2024

I've split up the commit. Do you need me to take ownership of any of these packages?

@AndersonTorres
Copy link
Member

For now there is no need to keep maintainership of them. I will create a Nixpkgs team later this week to formalize this.

Copy link
Member

@Ericson2314 Ericson2314 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it make sense to use runtimeShell for this, or must these scripts use bash in particular?

@rhelmot rhelmot force-pushed the freebsd-minimal3/various-shell branch from cb543d7 to cd9de46 Compare May 26, 2024 22:17
@rhelmot
Copy link
Contributor Author

rhelmot commented May 26, 2024

I didn't know about runtimeShell! I've changed it.

rhelmot added 4 commits May 26, 2024 23:23
This package distributes shell scripts in /bin. Its shebangs are
always patched to a /nix/store shell, but by default, they are patched to
use the stdenv's shell, which during bootstrap is build in the previous
stdenv. By using runtimeShell from the current stdenv, we can shorten the
FreeBSD bootstrap process significantly.
This package distributes shell scripts in /bin. Its shebangs are
always patched to a /nix/store shell, but by default, they are patched to
use the stdenv's shell, which during bootstrap is build in the previous
stdenv. By using runtimeShell from the current stdenv, we can shorten the
FreeBSD bootstrap process significantly.
This package distributes shell scripts in /bin. Its shebangs are
always patched to a /nix/store shell, but by default, they are patched to
use the stdenv's shell, which during bootstrap is build in the previous
stdenv. By using runtimeShell from the current stdenv, we can shorten the
FreeBSD bootstrap process significantly.
This package distributes shell scripts in /bin. Its shebangs are
always patched to a /nix/store shell, but by default, they are patched to
use the stdenv's shell, which during bootstrap is build in the previous
stdenv. By using runtimeShell from the current stdenv, we can shorten the
FreeBSD bootstrap process significantly.
@rhelmot rhelmot force-pushed the freebsd-minimal3/various-shell branch from cd9de46 to 125d947 Compare May 27, 2024 06:26
@ofborg ofborg bot requested a review from AndersonTorres May 27, 2024 08:29
@Ericson2314 Ericson2314 merged commit 80ff741 into NixOS:staging May 27, 2024
23 of 24 checks passed
@Ericson2314 Ericson2314 deleted the freebsd-minimal3/various-shell branch May 27, 2024 14:24
@tie tie mentioned this pull request May 30, 2024
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants