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.

Sign up for GitHub

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

Jump to bottom

stdenvAdapters: fix condition #244403

Merged
merged 2 commits into from
Jul 21, 2023
Merged

stdenvAdapters: fix condition #244403

merged 2 commits into from
Jul 21, 2023

Conversation

Artturin
Copy link
Member

@Artturin Artturin commented Jul 19, 2023 •
edited
Loading

Fixes #244403

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.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.

@Artturin Artturin mentioned this pull request Jul 19, 2023
Merged
11 tasks
@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Jul 19, 2023
@Artturin Artturin mentioned this pull request Jul 19, 2023
Closed
ghost
ghost approved these changes Jul 20, 2023
View reviewed changes
Copy link

@ghost ghost left a comment •
edited by ghost
Loading

Choose a reason for hiding this comment

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

Rebuilt:

  • x86_64-linux workstation (native, no eval change)
  • mips64el-linux-gnuabi64 router (cross from x86_64-linux)
  • aarch64-multiplatform laptop (cross from x86_64-linux) (still running)
  • test.cross.sanity cross-compilation tests (still running)

@ghost
Copy link

ghost commented Jul 20, 2023 •
edited by ghost
Loading

BTW ofborg-eval left for vacation this morning, hasn't been seen since.

Edit: I just got a telephone call from Hydra, who's in Las Vegas right now with OfBorg; they're getting married and aren't coming back. Said they gambled away the Nix Foundation's bankroll at the blackjack tables. ☹️

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jul 20, 2023
@Artturin
stdenvAdapters: Fix condition
cb29bc6 
Fixes issue 244232
@Artturin
stdenvAdapters: Remove 6 year old comment
29b4a92 
Comment was added in 3c36dcc and hasn't been needed because makeStaticBinaries already adds glibc.static
@ghost ghost linked an issue Jul 20, 2023 that may be closed by this pull request
Static link failure with LLVM, RISCV cross-compilation #244232
Closed
@Artturin Artturin merged commit f5c8c3c into NixOS:master Jul 21, 2023
@Artturin Artturin deleted the fixadapter3 branch July 21, 2023 18:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjornfor bjornfor bjornfor left review comments

@sternenseemann sternenseemann sternenseemann approved these changes

@roberth roberth Awaiting requested review from roberth

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

Assignees
No one assigned
Labels
6.topic: stdenv Standard environment 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Static link failure with LLVM, RISCV cross-compilation
3 participants
@Artturin @bjornfor @sternenseemann