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

rocmPackages_5: pin stdenv to GCC 12 #271954

Merged
1 commit merged into from
Dec 5, 2023
Merged

rocmPackages_5: pin stdenv to GCC 12 #271954

1 commit merged into from
Dec 5, 2023

Conversation

Madouura
Copy link
Contributor

@Madouura Madouura commented Dec 4, 2023

Description of changes

Lazy fix for the linked issue that I have not tested, as I do not have much time currently.
Only merge once #268097 is merged.

There is a lot more I can do here, there was a rocmPackages rework I was working on, which I think I accidentally just killed with this branch thankfully github is smart (https://github.com/Madouura/nixpkgs/tree/dev/rocm-rework). Oh well. Any further improvements/nitpicks should go to that, this is just a quick fix.

Fixes: #271943

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.05 Release Notes (or backporting 23.05 and 23.11 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.

@SuperSandro2000
Copy link
Member

@amjoseph-nixpkgs can we just cherry-pick this into your PR?

@ghost
Copy link

ghost commented Dec 4, 2023

Testing now...

@ghost
Copy link

ghost commented Dec 4, 2023

Could you switch the base branch to staging? Since the gcc13 upgrade is going to staging there isn't really any need for this on master.

Once my build finishes I'll merge this and rebase #268097

@Madouura Madouura changed the base branch from master to staging December 5, 2023 04:37
@ghost
Copy link

ghost commented Dec 5, 2023

Thanks, I got build failures in rocm-llvm-libc but I think the first commit in this PR fixes it:

The second commit in that PR might not be necessary; checking that right now.

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

This is 99% of the solution; the other 1% is in

@ghost
Copy link

ghost commented Dec 5, 2023

Will merge as soon as ofborg finishes CI.

@ghost
Copy link

ghost commented Dec 5, 2023

error: builder for '/nix/store/bgj8mchi88pzgs9c24xb0kivlmglfmhp-nix-2.3.17.drv' failed with exit code 2;
       last 10 log lines:
       > ran test tests/gc.sh... [PASS]
       > ran test tests/gc-runtime.sh... [PASS]
       > ran test tests/binary-cache.sh... [PASS]
       > ran test tests/user-envs.sh... [PASS]
       > ran test tests/remote-store.sh... [PASS]
       > ran test tests/lang.sh... [PASS]
       > ran test tests/fixed.sh... [PASS]
       > ran test tests/timeout.sh... [PASS]
       > ran test tests/gc-auto.sh... [PASS]
       > ran test tests/gc-concurrent.sh... [PASS]
       For full logs, run 'nix log /nix/store/bgj8mchi88pzgs9c24xb0kivlmglfmhp-nix-2.3.17.drv'.

wat.

@ghost

This comment was marked as resolved.

@ghost

This comment was marked as resolved.

Try reverting this on a future ROCm release.

Addresses: NixOS#271943
@ghost
Copy link

ghost commented Dec 5, 2023

Rebased in order to make ofborg re-eval.

@ghost
Copy link

ghost commented Dec 5, 2023

I have built both of these derivations locally:

/nix/store/bgj8mchi88pzgs9c24xb0kivlmglfmhp-nix-2.3.17.drv
/nix/store/c076ydrflsfx4p849f810mmidpzi6yq2-nixpkgs-lib-tests.drv

The first derivation is the one that @ofborg choked on. The second derivation is eval-lib-tests for this PR.

Therefore, I am going to merge this.

Good thing we can run CT locally!

@ghost ghost merged commit 93ebe44 into NixOS:staging Dec 5, 2023
7 of 9 checks passed
@Madouura Madouura deleted the pr/rocm branch December 5, 2023 20:45
This pull request was closed.
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.

rocm-runtime is still using gcc, is about to become broken by gcc13
4 participants