Skip to content

Conversation

@rhelmot
Copy link
Contributor

@rhelmot rhelmot commented Mar 14, 2025

Hey gamers it's ya gal Audrey here with another episode of "we need some CI on this derivation". This episode's sponsor is the nix-community builders, who generously offered to set me up with a machine to make sure this build stays building!

Most of these changes are fallout from splitting freebsd.libc into freebsd.libcMinimal + several other derivations. The rest are simply the march of time, rot and let rot.

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/)
  • 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.

@github-actions github-actions bot added 6.topic: stdenv Standard environment 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related labels Mar 14, 2025
@rhelmot rhelmot force-pushed the freebsd-fix-again branch from 263f768 to 04ba72b Compare March 14, 2025 05:28
@github-actions github-actions bot added 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels Mar 14, 2025
Copy link
Member

@artemist artemist left a comment

Choose a reason for hiding this comment

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

Most of the changes seem reasonable, but keep-libc is a weird thing to add with no explanation

@rhelmot rhelmot force-pushed the freebsd-fix-again branch from 04ba72b to 8768016 Compare March 14, 2025 21:20
@artemist
Copy link
Member

Testing on my FreeBSD 14.2 VM, I'm still getting a test failure in diffutils (FAIL: test-time) when trying to build stdenv. I should be using a fairly recent version of our patched lix with sandboxing.

@nix-owners nix-owners bot requested review from dasJ and jcumming March 30, 2025 20:13
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 7, 2025
@rhelmot rhelmot force-pushed the freebsd-fix-again branch from 53ca6be to 9f3746c Compare May 28, 2025 23:44
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label May 28, 2025
rhelmot added 2 commits May 29, 2025 22:15
Pulls in a patch from freebsd-ports. This patch cannot be made unconditional
without a rework since it modifies the base behavior.
@rhelmot rhelmot force-pushed the freebsd-fix-again branch from d481b90 to 8cf96ba Compare May 30, 2025 05:17
@rhelmot
Copy link
Contributor Author

rhelmot commented May 31, 2025

I just built this on systems with both ZFS and UFS filesystems. Should be ready to go.

Copy link
Member

@artemist artemist left a comment

Choose a reason for hiding this comment

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

There's only one thing I'm confused about. I'm building now, if that works I think it should be good to merge.

rhelmot added 4 commits May 31, 2025 19:15
Copying instead of symlinking prevents leakage of the bootstrap FHS
into the 0->1 bootstrap stage. The symptom this addresses is libssh2
failing because it can't find libssl, since it is failing to use the
ld wrapper.
@rhelmot rhelmot force-pushed the freebsd-fix-again branch from 8cf96ba to 1a7421d Compare May 31, 2025 19:18
@artemist artemist merged commit 5ee26c5 into NixOS:staging May 31, 2025
14 checks passed
@github-project-automation github-project-automation bot moved this to Done in Stdenv May 31, 2025
@alyssais
Copy link
Member

alyssais commented Jun 1, 2025

The gdbm patch is actually upstream, so could probably have been applied unconditionally relatively safely.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: stdenv Standard environment 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants