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.

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

*bsdCross: Remove these package sets #321538

Merged
merged 2 commits into from
Jun 21, 2024

Conversation

Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Jun 21, 2024

Description of changes

I realized what @rhelmot did in 6120256 (specify what packages just need stdenvNoLibc) is definitely the right approach for this, and adjusted NetBSD and OpenBSD to likewise use it. With that change, we don't need these confusing and ugly *bsdCross package sets at all!

We can get rid of a lot more libc-related *Cross, and I will do so soon, but this is the first step.

(adapted from commit 51f1eca)

Part of take 2 of #320852, without the infra changes. This, unlike the other, is safer to backport.

(They are still kept as deprecated aliases.)

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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 the 6.topic: stdenv Standard environment label Jun 21, 2024
This is the most upstream one, and so to avoid infinite recursion we
should get the things from it. This isn't needed per-se now, but will be
after the next commit.

(cherry picked from commit 4bd76be)
I realized what rhelmot did in 6120256
(specify what packages just need `stdenvNoLibc`) is definitely the right
approach for this, and adjusted NetBSD and OpenBSD to likewise use it.
With that change, we don't need these confusing and ugly `*bsdCross`
package sets at all!

We can get rid of a lot more libc-related `*Cross`, and I will do so
soon, but this is the first step.

(adapted from commit 51f1eca)
@Ericson2314
Copy link
Member Author

No more stdenv rebuild, and for what it's worth, most of the darwin changes are actually things that are marked unsupported on darwin.

@Ericson2314 Ericson2314 merged commit 88b6c9b into NixOS:master Jun 21, 2024
24 checks passed
@Ericson2314 Ericson2314 deleted the no-bsdCross-pkg-set branch June 21, 2024 20:45
@Ericson2314 Ericson2314 added the backport release-24.05 Backport PR automatically label Jun 21, 2024
Copy link
Contributor

Successfully created backport PR for release-24.05:

Copy link
Contributor

Git push to origin failed for release-24.05 with exitcode 1

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

Successfully merging this pull request may close these issues.

1 participant