Skip to content

dockerTools: Replace bashInteractive with bash#453912

Merged
roberth merged 1 commit intoNixOS:masterfrom
jhol:docker-bash
Jan 6, 2026
Merged

dockerTools: Replace bashInteractive with bash#453912
roberth merged 1 commit intoNixOS:masterfrom
jhol:docker-bash

Conversation

@jhol
Copy link
Contributor

@jhol jhol commented Oct 20, 2025

bash has been interactive by default since this PR was merged. This commit simplifies dockerTools given that there is now no distinction between bash and bashInteractive.

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person. 8.has: documentation This PR adds or changes documentation labels Oct 20, 2025
@smancill
Copy link
Contributor

I don't know how to retrigger the failed build checks.

@commiterate
Copy link
Contributor

Not seeing the usual buttons on the jobs in the Checks tab either (I think job failures were due to the AWS us-east-1 outage). Not sure if we're missing permissions or something.

bash has been interactive by default since this PR [1] was merged. This
commit simplifies dockerTools given that there is now no distinction
between bash and bashInteractive.

  * [1] NixOS#379368

Co-authored-by: commiterate <111539270+commiterate@users.noreply.github.com>
Signed-off-by: Joel Holdsworth <joel@airwebreathe.org.uk>
@jhol
Copy link
Contributor Author

jhol commented Oct 21, 2025

I don't see buttons either. Never mind. I just re-pushed the branch with a trivial mod.

@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Oct 22, 2025
@jhol
Copy link
Contributor Author

jhol commented Jan 5, 2026

@roberth would you be able to take a look at this? This PR and #453923 are part of an effort to break #387173 into manageable atomic commits.

The remaining commits are blocked by these PRs.

I hoped that dividing the work into smaller PRs would make it easier to get these changes reviewed, but it seems this approach has also stalled. Please let me know if there's anything I can do to help get these changes through the review process.

@roberth roberth added this pull request to the merge queue Jan 6, 2026
Merged via the queue into NixOS:master with commit 7648a26 Jan 6, 2026
31 of 32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: documentation This PR adds or changes documentation 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants