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

Arcan updates #310831

Merged
merged 6 commits into from
Jun 28, 2024
Merged

Arcan updates #310831

merged 6 commits into from
Jun 28, 2024

Conversation

AndersonTorres
Copy link
Member

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.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.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3934

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3977

@lucasew
Copy link
Contributor

lucasew commented May 23, 2024

Result of nixpkgs-review pr 310831 run on x86_64-linux 1

10 packages built:
  • arcan
  • arcan-all-wrapped
  • arcan-wrapped
  • cat9
  • cat9-wrapped
  • durden
  • durden-wrapped
  • pipeworld-wrapped
  • prio-wrapped
  • xarcan

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/1704

@useranon350
Copy link
Contributor

I am curious why this is still using the upstream Tracy and not the forked one currently referenced in the arcan clone.sh. Is the clone.sh out of date?

@AndersonTorres
Copy link
Member Author

AndersonTorres commented Jun 2, 2024

TBH i did not notice it is now using an in-house copy.
Tomorrow I will fix this.

@useranon350
Copy link
Contributor

tracy worked for me by disabling libunwind using TRACY_LIBUNWIND_BACKTRACE.

@AndersonTorres
Copy link
Member Author

AndersonTorres commented Jun 7, 2024

It looks like a workaround rather than a real fixup.
I will keep it this way.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/1719

@useranon350
Copy link
Contributor

It looks like a workaround rather than a real fixup. I will keep it this way.

Yes, but it allows keeping Tracy support mostly functional, with only the libunwind backtraces not working. It should also be solvable by correctly adding libunwind to the build/runtime dependencies, but I don't know enough about Nix to debug why the obvious approach was not working.

@AndersonTorres
Copy link
Member Author

Is there any serious lack of functionality by not building it with Tracy support?

@useranon350
Copy link
Contributor

You cannot use Tracy to debug problems and have to recompile it with print-logging to get equivalent information.

@AndersonTorres
Copy link
Member Author

For now I will revert (?) to the older GitHub.

@pbsbot
Copy link

pbsbot commented Jun 28, 2024

Result of nixpkgs-review pr 310831 run on x86_64-linux 1

5 packages failed to build:
  • arcan-all-wrapped
  • cat9
  • cat9-wrapped
  • durden
  • durden-wrapped
5 packages built:
  • arcan
  • arcan-wrapped
  • pipeworld-wrapped
  • prio-wrapped
  • xarcan

@AndersonTorres
Copy link
Member Author

cat9 and durden: I forgot them!

@pbsds
Copy link
Contributor

pbsds commented Jun 28, 2024

It also seems to include some WIP commit, please ping me when you consider the PR ready :)

@AndersonTorres
Copy link
Member Author

@ofborg build arcan-all-wrapped

@AndersonTorres
Copy link
Member Author

Now it's fine! @pbsds

@pbsds
Copy link
Contributor

pbsds commented Jun 28, 2024

where is letoram-tracy used?

@pbsbot
Copy link

pbsbot commented Jun 28, 2024

Result of nixpkgs-review pr 310831 run on x86_64-linux 1

10 packages built:
  • arcan
  • arcan-all-wrapped
  • arcan-wrapped
  • cat9
  • cat9-wrapped
  • durden
  • durden-wrapped
  • pipeworld-wrapped
  • prio-wrapped
  • xarcan

@AndersonTorres
Copy link
Member Author

AndersonTorres commented Jun 28, 2024

where is letoram-tracy used?

It can be optionally used as an alternative to tracy.
Should it be more explicit, e.g. a flag?

@pbsds
Copy link
Contributor

pbsds commented Jun 28, 2024

Perhaps make the sources import a default in the callPackage args which thus in turn can leverage the .override interface? Then arcan.override (old: { sources = old.sources // { tracy = old.sources.letoram-tracy; }) becomes possible

It is easier to control them this way, in order to not pollute the master
package file.

Also, let's put them on passthru.
@AndersonTorres
Copy link
Member Author

sources as an argument? Nice!

@pbsbot
Copy link

pbsbot commented Jun 28, 2024

Result of nixpkgs-review pr 310831 run on x86_64-linux 1

13 packages built:
  • arcan
  • arcan-all-wrapped
  • arcan-wrapped
  • arcan.dev
  • arcan.lib
  • arcan.man
  • cat9
  • cat9-wrapped
  • durden
  • durden-wrapped
  • pipeworld-wrapped
  • prio-wrapped
  • xarcan

@pbsds pbsds merged commit e001103 into NixOS:master Jun 28, 2024
23 of 24 checks passed
@AndersonTorres AndersonTorres self-assigned this Jun 28, 2024
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.

None yet

6 participants