buildDotnetModule: fix structured attributes support#313005
buildDotnetModule: fix structured attributes support#313005corngood merged 1 commit intoNixOS:masterfrom
Conversation
1503383 to
88df5d2
Compare
|
Result of 1 package marked as broken and skipped:
61 packages built:
|
6fc0934 to
5cfab6d
Compare
This change refactors internal hooks used by buildDotnetModule to support derivations with structured attributes. Note that this changes variable names that the internal hooks expect.
|
This all looks okay to me, but it's a big change. Anyone else in @NixOS/dotnet want to review? |
|
Result of 80 packages built:
|
siraben
left a comment
There was a problem hiding this comment.
LGTM, but would like someone who works with dotnet to approve.
GGG-KILLER
left a comment
There was a problem hiding this comment.
Looks good to me as well
|
Result of 1 package marked as broken and skipped:
3 packages failed to build:
36 packages built:
EDIT:
Starting test execution, please wait...
A total of 1 test files matched the specified pattern.
System.Net.Sockets.SocketException (13): Permission denied
at System.Net.Sockets.Socket.DoBind(EndPoint endPointSnapshot, SocketAddress socketAddress)
at System.Net.Sockets.Socket.Bind(EndPoint localEP)
at System.Net.Sockets.TcpListener.Start(Int32 backlog)
at Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketServer.Start(String endPoint) in /_/src/Microsoft.TestPlatform.CommunicationUtilities/SocketServer.cs:line 65
at Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestSender.InitializeCommunication() in /_/src/Microsoft.TestPlatform.CommunicationUtilities/TestRequestSender.cs:line 168
at Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager.SetupChannel(IEnumerable`1 sources, String runSettings) in /_/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyOperationManager.cs:line 204
at Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyExecutionManager.InitializeTestRun(TestRunCriteria testRunCriteria, IInternalTestRunEventsHandler eventHandler) in /_/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyExecutionManager.cs:line 182
Test Run Aborted. |
The error in |
|
Sorry, I merged this because I thought all those failures were pre-existing, but you might be right about |
|
Actually I just tested |
|
I was able to build nix run nixpkgs#nixpkgs-review -- rev HEAD -p azure-functions-core-tool
$ git -c fetch.prune=false fetch --no-tags --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0
remote: Enumerating objects: 195, done.
remote: Counting objects: 100% (131/131), done.
remote: Compressing objects: 100% (54/54), done.
remote: Total 71 (delta 43), reused 41 (delta 14), pack-reused 0
Unpacking objects: 100% (71/71), 14.87 KiB | 80.00 KiB/s, done.
From https://github.com/NixOS/nixpkgs
219bc27bcfea..2e2f30243165 master -> refs/nixpkgs-review/0
$ git worktree add /Users/DontEatOreo/.cache/nixpkgs-review/rev-683aa7c4e385509ca651d49eeb35e58c7a1baad6/nixpkgs 2e2f30243165b1acd638ef09bf79430b7aad802a
Preparing worktree (detached HEAD 2e2f30243165)
Updating files: 100% (41698/41698), done.
HEAD is now at 2e2f30243165 Merge pull request #320521 from GaetanLepage/insightface
$ nix-env --extra-experimental-features no-url-literals --option system aarch64-darwin -f <nixpkgs> --nix-path nixpkgs=/Users/DontEatOreo/.cache/nixpkgs-review/rev-683aa7c4e385509ca651d49eeb35e58c7a1baad6/nixpkgs nixpkgs-overlays=/tmp/tmpcim2jiwp -qaP --xml --out-path --show-trace --no-allow-import-from-derivation
$ git merge --no-commit --no-ff 683aa7c4e385509ca651d49eeb35e58c7a1baad6
Already up to date.
$ nix-env --extra-experimental-features no-url-literals --option system aarch64-darwin -f <nixpkgs> --nix-path nixpkgs=/Users/DontEatOreo/.cache/nixpkgs-review/rev-683aa7c4e385509ca651d49eeb35e58c7a1baad6/nixpkgs nixpkgs-overlays=/tmp/tmpcim2jiwp -qaP --xml --out-path --show-trace --no-allow-import-from-derivation --meta
These packages do not exist:
azure-functions-core-tool
$ git worktree remove -f /Users/DontEatOreo/.cache/nixpkgs-review/rev-683aa7c4e385509ca651d49eeb35e58c7a1baad6/nixpkgs |
|
W.r.t. azure-functions-core-tools, is the failure specific to the sandboxed darwin builds? FWIW builds from cache.nixos.org do not use sandbox for Darwin builders, and |
|
@DontEatOreo, could it be that Nix substituted the derivation output from cache.nixos.org for you? I can’t build azure-functions-core-tools on 683aa7c with sandbox enabled on aarch64-darwin. Did you pass |
|
I just tested on master, and it's broken in the sandbox, but builds with @DontEatOreo in your example above you were using I think it's just: NixOS/nix#4119 |
I didn't, but after running
Oh, right. My bad. Sorry about that! 😅 Running the command again with proper package name still fails building: nix run nixpkgs#nixpkgs-review -- rev HEAD -p azure-functions-core-tools
$ git -c fetch.prune=false fetch --no-tags --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0
remote: Enumerating objects: 375, done.
remote: Counting objects: 100% (341/341), done.
remote: Compressing objects: 100% (180/180), done.
remote: Total 375 (delta 219), reused 235 (delta 150), pack-reused 34
Receiving objects: 100% (375/375), 992.53 KiB | 5.06 MiB/s, done.
Resolving deltas: 100% (225/225), completed with 54 local objects.
From https://github.com/NixOS/nixpkgs
be79f03572ad..36bd9a0872ad master -> refs/nixpkgs-review/0
$ git worktree add /Users/DontEatOreo/.cache/nixpkgs-review/rev-683aa7c4e385509ca651d49eeb35e58c7a1baad6/nixpkgs 36bd9a0872ad6fbe2312f6f4b67902cc66739dd3
Preparing worktree (detached HEAD 36bd9a0872ad)
Updating files: 100% (41700/41700), done.
HEAD is now at 36bd9a0872ad Merge pull request #315140 from alexfmpe/ispc-1.24
$ nix-env --extra-experimental-features no-url-literals --option system aarch64-darwin -f <nixpkgs> --nix-path nixpkgs=/Users/DontEatOreo/.cache/nixpkgs-review/rev-683aa7c4e385509ca651d49eeb35e58c7a1baad6/nixpkgs nixpkgs-overlays=/tmp/tmpfvgw0_uq -qaP --xml --out-path --show-trace --no-allow-import-from-derivation
$ git merge --no-commit --no-ff 683aa7c4e385509ca651d49eeb35e58c7a1baad6
Already up to date.
$ nix-env --extra-experimental-features no-url-literals --option system aarch64-darwin -f <nixpkgs> --nix-path nixpkgs=/Users/DontEatOreo/.cache/nixpkgs-review/rev-683aa7c4e385509ca651d49eeb35e58c7a1baad6/nixpkgs nixpkgs-overlays=/tmp/tmpfvgw0_uq -qaP --xml --out-path --show-trace --no-allow-import-from-derivation --meta
The following packages specified with `-p` are not rebuilt by the pull request
azure-functions-core-tools
$ git worktree remove -f /Users/DontEatOreo/.cache/nixpkgs-review/rev-683aa7c4e385509ca651d49eeb35e58c7a1baad6/nixpkgs |
|
This regressed Jellyfin, fix is #320711 |
jellyfin: fix makeWrapperArgs after #313005
|
@K900, I’m sorry I missed this regression, I’ve created a PR with a fix. Apparently nixpkgs-review and ofborg didn’t run |
@tie Yeah, that's annoying. You might want to track this: Mic92/nixpkgs-review#77 In the meantime I've been running this from the nixpkgs-review shell: It runs the tests from changed packages, but not all changed tests. |
(cherry picked from commit 8e4c724)
[Backport release-24.05] jellyfin: fix makeWrapperArgs after #313005
Description of changes
This PR contains 3 commits from #291640 that refactor buildDotnetModule internal implementation (and should potentially make it easier to expose hooks for standalone use in the future).
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-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.