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

default-gcc-version: Remove conditional for vc4 and relibc #343146

Merged
merged 1 commit into from
Sep 20, 2024

Conversation

Artturin
Copy link
Member

gcc6 was removed in a42d18b

relibc was removed in e6f33f4

pkgsCross.vc4.stdenv.cc is broken in the patching of binutils

Description of changes

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.

Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

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

LGTM; thanks! But this is being bumped to 14 in #340612, so maybe this should go to staging instead to avoid a merge conflict?

I wonder if this conditional in pkgs/development/compilers/gcc/common/dependencies.nix might be dubious for the same reason:

  ++ optionals (with stdenv.targetPlatform; isVc4 || isRedox && flex != null) [ flex ]

@Artturin
Copy link
Member Author

Will rebase.

Vc4 support hasn't been completely ripped out yet so let's not remove other conditionals

CC @cleverca22 who uses it in https://github.com/librerpi/lk-overlay/blob/f2a7f7497f36e0a05cfdd3c930305566c50771c2/default.nix#L29

@emilazy
Copy link
Member

emilazy commented Sep 20, 2024

Vc4 support hasn't been completely ripped out yet so let's not remove other conditionals

Right; was just wondering if it was somehow a proxy for a GCC 6‐specific thing considering the otherwise‐unlikely pairing of VC4 and Redox.

`gcc6` was removed in a42d18b

`relibc` was removed in e6f33f4

`pkgsCross.vc4.stdenv.cc` is broken in the patching of binutils
@Artturin Artturin marked this pull request as draft September 20, 2024 01:50
@Artturin Artturin changed the base branch from master to staging September 20, 2024 01:50
@Artturin Artturin marked this pull request as ready for review September 20, 2024 01:50
@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 Sep 20, 2024
@emilazy emilazy merged commit 8e51715 into NixOS:staging Sep 20, 2024
23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
Development

Successfully merging this pull request may close these issues.

3 participants