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.

Sign up for GitHub

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

Jump to bottom

staging-next 2023-04-05 #224806

Merged
merged 663 commits into from
Apr 12, 2023
Merged

staging-next 2023-04-05 #224806

merged 663 commits into from
Apr 12, 2023

Conversation

mweinelt
Copy link
Member

@mweinelt mweinelt commented Apr 5, 2023 •
edited by vcunat
Loading

Helpful links
Mass breakages

@uninsane
Copy link
Contributor

regression for sequoia: it builds on master (01e82e9) but errors when compiling tests on staging-next: https://hydra.nixos.org/build/215044201/nixlog/4

@vcunat
Copy link
Member

vcunat commented Apr 11, 2023

Yes, rustc upgrade caused a few packages to fail to build. As always, as far as I remember.

@uninsane
Copy link
Contributor

sequoia upstream has a patch which seems to fix this. our sequoia package is already one version behind, so i'll throw up a PR against master later today to update it in a way which also unbreaks it for staging-next.

@uninsane
sequoia: 0.27.0 -> 0.28.0
718abd3 
upstream changelog:
<https://gitlab.com/sequoia-pgp/sequoia/-/compare/sq%2Fv0.27.0...sq%2Fv0.28.0>

changes to the nix package:
- removes the cherry-picked 7916f90421 patch that made it into 0.28.0
- cherry-picks upstream commit 4dc6e624c2 which adds support for newer
  rust versions but didn't make the 0.28.0 release. see
  <#224806>
- adds an update script. future routine updates can be automated with
  `nix-shell maintainers/scripts/update.nix --argstr package sequoia`
@uninsane uninsane mentioned this pull request Apr 11, 2023
Merged
12 tasks
github-actions bot and others added 7 commits April 12, 2023 00:02
@github-actions
Merge master into staging-next
4715733
@github-actions
Merge master into staging-next
4d4fee1
@vcunat
cc-wrapper: add optional temporary hack for -B
ac3acd9 
This fixes parts in llvmPackages_{13,rocm}
e.g. build .clang for testing.
Longterm mass-rebuild fix should come in PR #225846
@vcunat
llvmPackages_13.compiler-rt-libc: also apply tmp hack
9bf18e0 
This part got forgotten in commit ac3acd9.
@vcunat
Merge #225823: sequoia: 0.27.0 -> 0.28.0
4bcb462 
...into staging-next
In particular, this fixes build after rustc upgrade.
@vcunat
grafana: skip a test that started failing
cdefbd2 
It's weird but this single test started failing in this staging-next
iteration, on all four 64-bit platforms.
I thought this will be better than not having any grafana,
as it's only a single test and our .tests still build.
@vcunat
rocm-thunk: hack-fix failing to find libgcc_s.so
d0bb9ed 
https://hydra.nixos.org/build/215504721/nixlog/2
/cc PR #209870
@vcunat vcunat merged commit 2a32918 into master Apr 12, 2023
@vcunat
Copy link
Member

vcunat commented Apr 12, 2023

I think all major issues were resolved, even though some just in a temporary hacky way.

pennae
pennae reviewed Apr 12, 2023
View reviewed changes
pkgs/development/libraries/rocm-thunk/default.nix
@@ -31,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
libdrm
numactl
valgrind
gcc.cc.libgcc # TODO: unhack this?
Copy link
Contributor

Choose a reason for hiding this comment

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

this seems to have broken ofborg: https://gist.github.com/GrahamcOfBorg/40ca8430db607680613622feb27f7d4d#file-output-path-comparison-L222

Copy link
Member

Choose a reason for hiding this comment

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

Oh, I'm sorry. Some people run into this unexpected strictness (evaluating even on platforms that are unsupported/broken for the package). Hopefully it will be OK now.

Copy link

Choose a reason for hiding this comment

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

Please try #225846 it is the proper fix for this.

@ghost
Copy link

ghost commented Apr 12, 2023

Fixed by:

@ghost
Copy link

ghost commented Apr 12, 2023

d0bb9ed is causing CI to fail for all PRs targeting staging. Please revert it.

@ghost ghost mentioned this pull request Apr 12, 2023
Merged
@vcunat
Copy link
Member

vcunat commented Apr 12, 2023

For reference, that commit was amended in fe2ecaf which should fix the CI.

@LostAttractor LostAttractor mentioned this pull request Apr 13, 2023
Merged
12 tasks
@sternenseemann sternenseemann mentioned this pull request Apr 13, 2023
Merged
@vcunat vcunat mentioned this pull request Apr 18, 2023
Merged
3 tasks
@lblasc
Copy link
Contributor

lblasc commented Apr 19, 2023

Binaries generated by crate2nix (buildRustCrate) are much bigger after this staging iteration, debug and release are affected.

I've tested on some internal crate.

Commit before merge bf839a4b2031557eb43e77d39d343b7ecc84c692:

150M    result/bin

After merge:

1.2G    result/bin

@vcunat
Copy link
Member

vcunat commented Apr 19, 2023 •
edited
Loading

Perhaps bring that up on more specific places, e.g. PR #220373
(seems to be the most likely culprit, at a quick glance)

@ghost
Copy link

ghost commented Apr 20, 2023 •
edited by ghost
Loading

Before #210843 buildRustCrate was unconditionally stripping all builds, including debug builds. That was fixed by #210843. Maybe you're doing a debug build? If so, either switch to doing a release build or else strip manually.

I've tested on some internal crate.

Please post a complete reproducer in #210843 if it was the cause; if not, please open a new issue and reference it here. Because github is still stuck in the 1970s, before the world discovered threaded discussions.

@trofi

This comment was marked as outdated.

Sign in to view
@trofi

This comment was marked as outdated.

Sign in to view
@trofi trofi mentioned this pull request Aug 22, 2023
Closed
12 tasks
@ghost
Copy link

ghost commented Aug 23, 2023

@trofi this staging-next cycle closed over four months ago; I think you posted your comments in the wrong thread? Also they appear to be exact duplicates of comments you posted elsewhere, and you then immediately marked them as outdated. Are you using some kind of git-hub API client that is doing this?

@trofi
Copy link
Contributor

trofi commented Aug 23, 2023

I posted the comment in the wring branch as github UI shown only this branch as a source branch. I realized it too late and re-posted comment to the intended branch that I suspect caused the regression.

I marked comments here as hidden as Obsolete because they are not directly relevant to this PR.

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

@vcunat vcunat vcunat left review comments

@pennae pennae pennae left review comments

@kalbasit kalbasit Awaiting requested review from kalbasit kalbasit is a code owner

@Mic92 Mic92 Awaiting requested review from Mic92 Mic92 is a code owner

@zowoq zowoq Awaiting requested review from zowoq zowoq is a code owner

@adisbladis adisbladis Awaiting requested review from adisbladis adisbladis is a code owner

@ttuegel ttuegel Awaiting requested review from ttuegel ttuegel is a code owner

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@winterqt winterqt Awaiting requested review from winterqt winterqt is a code owner

@figsoda figsoda Awaiting requested review from figsoda figsoda is a code owner

@marsam marsam Awaiting requested review from marsam

@stigtsp stigtsp Awaiting requested review from stigtsp stigtsp is a code owner

@zakame zakame Awaiting requested review from zakame zakame is a code owner

@dasJ dasJ Awaiting requested review from dasJ

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314 Ericson2314 is a code owner

@jtojnar jtojnar Awaiting requested review from jtojnar jtojnar is a code owner

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
1.severity: security 6.topic: emacs 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang 6.topic: lua 6.topic: nixos 6.topic: pantheon The Pantheon desktop environment 6.topic: python 6.topic: qt/kde 6.topic: ruby 6.topic: rust 6.topic: stdenv Standard environment 6.topic: systemd 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: vim 8.has: changelog 8.has: clean-up 8.has: documentation 8.has: module (update) 8.has: package (new) 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 10.rebuild-linux-stdenv
Projects
Nix documentation
Status: ✅ Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet