Skip to content

Revert "pkgs/top-level/stage.nix: add pkgsLLVMLibc"#401317

Merged
emilazy merged 1 commit intoNixOS:masterfrom
qowoz:llvmlibc
Apr 24, 2025
Merged

Revert "pkgs/top-level/stage.nix: add pkgsLLVMLibc"#401317
emilazy merged 1 commit intoNixOS:masterfrom
qowoz:llvmlibc

Conversation

@zowoq
Copy link
Contributor

@zowoq zowoq commented Apr 24, 2025

This reverts commit 41b1402.

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.

Copy link
Member

@RossComputerGuy RossComputerGuy left a comment

Choose a reason for hiding this comment

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

This shouldn't be a full revert of the commit but only drop pkgsLLVMLibc. We probably could just comment out the pkgsLLVMLibc and leave a comment explaining why it's commented out.

@zowoq
Copy link
Contributor Author

zowoq commented Apr 24, 2025

This shouldn't be a full revert of the commit but only drop pkgsLLVMLibc. We probably could just comment out the pkgsLLVMLibc and leave a comment explaining why it's commented out.

If this is how you want to handle it please open another PR.

@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-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Apr 24, 2025
@emilazy
Copy link
Member

emilazy commented Apr 24, 2025

Merging since the issue has been present since January, the fix in #375330 seems complicated to verify, and it doesn’t make sense to ship something broken in 25.05. Can always revert the revert if a more targeted adjustment is PR’d.

@emilazy emilazy merged commit b0a12b8 into NixOS:master Apr 24, 2025
26 of 29 checks passed
@RossComputerGuy
Copy link
Member

the fix in #375330 seems complicated to verify

Only requires eval, shouldn't be too complicated. I am hoping the fix gets approved soon.

@emilazy
Copy link
Member

emilazy commented Apr 24, 2025

I mean verify for correctness wrt LLVM – it’s unclear to me why we want to override libxml2, python3, and ninja in the general LLVM bulld. Bootstrapping concerns like that are usually handled in stdenv stage overlays, such as in the Darwin stdenv. python3.pkgs.pyyaml instead of python3Packages.pyyaml likely breaks splicing. etc.

@RossComputerGuy
Copy link
Member

Gotcha, I tested a build and it worked fine so it's not like nothing broke because of it.

@zowoq zowoq deleted the llvmlibc branch April 24, 2025 22:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: lib The Nixpkgs function library 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants