Skip to content

[staging-next] adr-tools: fix build#382539

Merged
adamcstephens merged 1 commit intoNixOS:staging-nextfrom
leona-ya:push-kzsskprmzplr
Feb 16, 2025
Merged

[staging-next] adr-tools: fix build#382539
adamcstephens merged 1 commit intoNixOS:staging-nextfrom
leona-ya:push-kzsskprmzplr

Conversation

@leona-ya
Copy link
Member

bash doesn't appear in the wrapper anymore, but only bashInteractive

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

`bash` doesn't appear in the wrapper anymore, but only `bashInteractive`
@github-actions github-actions bot added 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Feb 16, 2025
@nix-owners nix-owners bot requested a review from adamcstephens February 16, 2025 11:26
@adamcstephens
Copy link
Contributor

Is this against staging because of another fix there?

@leona-ya
Copy link
Member Author

This is against staging-next, as it's newly broken there.

hydra staging-next job: https://hydra.nixos.org/job/nixpkgs/staging-next/adr-tools.aarch64-linux
hydra trunk job: https://hydra.nixos.org/job/nixpkgs/trunk/adr-tools.aarch64-linux

@leona-ya
Copy link
Member Author

leona-ya commented Feb 16, 2025

More exactly, it's broken by #379368 (i.e. the substitute is not necessary anymore).

@adamcstephens
Copy link
Contributor

Makes sense. Thanks!

@adamcstephens adamcstephens merged commit 6af4a7a into NixOS:staging-next Feb 16, 2025
26 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants