-
-
Notifications
You must be signed in to change notification settings - Fork 14.3k
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
dotnet: november 2024 upgrades and infrastructure changes #355753
Conversation
05588c0
to
2aa6ff0
Compare
|
86bf1ba
to
87f12d1
Compare
@@ -8,22 +8,24 @@ | |||
{ package ? null | |||
, maintainer ? null | |||
, predicate ? null | |||
, get-script ? pkg: pkg.updateScript or null |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jtojnar would you mind taking a look at the update.nix changes?
I've used it to implement update-dotnet-lockfiles.nix
, which is quite similar but uses a different attribute. This way it benefits from parallel execution, log aggregation and all the other good stuff the python script does.
I was wondering if aliases should just be unconditionally disabled?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I would just disable aliases unconditionally.
But why not just rename the fetch-deps
to updateScript
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fetch-deps
just does lockfile generation. It's often called from updateScript
, but can be run on its own. Quite a few packages only have fetch-deps
.
I've been thinking it would be nice to have some sort of abstraction of lockfile generation, but I'm not exactly sure where to start. I noticed that nix-update
has --generate-lockfile
, but it looks like that might only understand cargo lockfiles.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I would just disable aliases unconditionally.
this is done now
87f12d1
to
1ab1328
Compare
|
However
|
This brings down the time needed to update one version from ~10min to ~20s for me
d566f47
to
9c88243
Compare
|
|
|
@GGG-KILLER do you have any logs for those failures?
|
This all seems to be a result of
Which in turn failed because of a test (perhaps flaky?):
I'll try again, didn't even notice it finished since I just left it running and left to do something else 😅 |
|
Yep, seems we indeed have a flaky test on |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Considering we've already confirmed that the cavalier
failure is caused by cava
(which doesn't use .NET), I think we can proceed with this.
cava
build logs
error: builder for '/nix/store/g0mjcanixacvsvn7zqlm4x9fvl30q0i9-cava-0.10.2.drv' failed with exit code 1;
last 23 log lines:
> Using versionCheckHook
> Running phase: unpackPhase
> unpacking source archive /nix/store/7n3i4i7mf29fwap22m4srqy73c8vv55n-source
> source root is source
> Running phase: patchPhase
> Running phase: autoreconfPhase
> autoreconf: export WARNINGS=
> autoreconf: Entering directory '.'
> autoreconf: configure.ac: not using Gettext
> autoreconf: running: aclocal --force -I m4
> aclocal: warning: couldn't open directory 'm4': No such file or directory
> configure.ac:306: error: _AX_CHECK_GL_MANUAL_LIBS_GENERIC: argument must not be empty
> lib/m4sugar/m4sh.m4:690: _AS_IF_ELSE is expanded from...
> lib/m4sugar/m4sh.m4:697: AS_IF is expanded from...
> /nix/store/fvdsb9i4vb8ca77s8lh60cil33m36dmk-autoconf-archive-2024.10.16/share/aclocal/ax_check_gl.m4:187: _AX_CHECK_GL_MANUAL_LIBS_GENERIC is expanded from...
> lib/m4sugar/m4sh.m4:595: AS_CASE is expanded from...
> /nix/store/fvdsb9i4vb8ca77s8lh60cil33m36dmk-autoconf-archive-2024.10.16/share/aclocal/ax_check_gl.m4:253: AX_CHECK_GL is expanded from...
> lib/m4sugar/m4sh.m4:697: AS_IF is expanded from...
> lib/m4sugar/m4sh.m4:697: AS_IF is expanded from...
> configure.ac:306: the top level
> autom4te: error: /nix/store/ab13djpkv4pyii8lvz4106bimy62db59-gnum4-1.4.19/bin/m4 failed with exit status: 1
> aclocal: error: /nix/store/wky99hgy2w2nb3a6hzgk96yqdbi95zsj-autoconf-2.72/bin/autom4te failed with exit status: 1
> autoreconf: error: aclocal failed with exit status: 1
For full logs, run 'nix log /nix/store/g0mjcanixacvsvn7zqlm4x9fvl30q0i9-cava-0.10.2.drv'.
error: 1 dependencies of derivation '/nix/store/1fv8pya4r4n8khk5s03bwg641ck54f39-cavalier-2024.1.0.drv' failed to build
error: 1 dependencies of derivation '/nix/store/f5n6amln3psrfyc9zw9amx3f0zv9ljbr-env.drv' failed to build
error: 1 dependencies of derivation '/nix/store/1nzw2k4kklivg8mj8yygafcv9abvffnl-review-shell.drv' failed to build
Probably a good idea. Do you have a log of the failure you could attach to it? |
Might have deleted it, but nothing |
|
Yeah, the thing is I usually delete that after I run it and everything passes it, but I can't remember if I did it or not. Will check though, thanks for reminding me 😅 |
Yeah, after 571 attempts I wasn't able to reproduce it. Might be something related to building multiple things in parallel as is usual with nixpkgs-review. If I run into this again I'll report it, but for now I don't think I have more time to spend on trying to reproduce this. |
Errors coming from PR 355753 See: NixOS/nixpkgs#355753 Had to pass the runtime to Global tools
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release-24.11
git worktree add -d .worktree/backport-355753-to-release-24.11 origin/release-24.11
cd .worktree/backport-355753-to-release-24.11
git switch --create backport-355753-to-release-24.11
git cherry-pick -x 06ac81f61c82ffa40d14ab48fe560bf7602033b4 ca2a33dfba1674e8f4278b24e78e16eea29c49b5 6bed24773e134d7427a48cfdb856665f5f4b3c05 ddd08e404f21d39ae6592ae359f416e7b0fd8462 42d69ab59a80edf0c79b112f7a9b6dd86858c2cd d2d56972fc89f280233f86184a69bc995866ae6a 003135da3224fc76cff37045891ef4b05712741d f9cb431d6d858665c2497eb58072d92e8eb871be 97318b96d6d093ba93b825b03b065fb3d07ad1c4 193378ead289f55648c17b84226827bfcc21e5e2 4219a941581cd45d1b86c6af974be51d041d10cd aa0289eda408174dc490a729ed77d6542ec2e49d d9f506c5c35456ea5e49a5ab91593e8c2caf0937 bcd669f23f863c223e8fabcf19c595cedcedf921 5b462ef57a789729df844667d5257044688c6686 6e919bf975ce6e43f2fcb1ef63a5ce565cfda50d 112a4c48c609b7d1ba72c4d3f9000a2e8cba93e4 bfaca46529ff6590600e6df3b376e88cf7c0c9e3 e3736259f7c94971d95f975f720bcb47e3a18a14 9fb173da9421094875609cd6fd5ec98a7d48da05 3d38ecca0ceadf29599b892ac556fb6602ca1892 845066f50e082bf13ee122bb209bd24e332708c8 aa319c6f1e150efc6c21326979d40088c28564a1 0a5c33f88babc47401cf68042b4b2cc8102e561a f2da78e1be67b0c3915c5a84c96fbcf7e104227c df4effe419dc16d02329973f1db97e10e5394d6f 24570a33b5021fe1f7df7a94502bd9865fb55b3f 9c88243f6dc7615153202e6b7202c241563787c1 fd3d60b2edbb0333c8ae925d053cf56d0438c379 |
Any ideas about this, which happens after pulling this in and attempting to upgrade to the net9 SDK? It only happens with a
(This is from Smaug123/WoofWare.Myriad#302 at commit 2712bf2.) |
Cc: @NixOS/dotnet
Fixes: #355500
Closes: #355642
The big breaking infrastructure changes are:
This allows the setup hooks for dotnet to be changed without sdk/runtime rebuilds (VMR etc).
This is consistent with packaging guidelines.
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.