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

Brave: add arm64 support #298042

Merged
merged 1 commit into from
Apr 10, 2024
Merged

Brave: add arm64 support #298042

merged 1 commit into from
Apr 10, 2024

Conversation

thedaringdev
Copy link
Contributor

Description of changes

Accidentally closed original pr after rebasing to fix merge conflicts. This resolves issue #278278.

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.

@ofborg ofborg bot added 2.status: merge conflict This PR has merge conflicts with the target branch and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Mar 22, 2024
@ofborg ofborg bot added 2.status: merge conflict This PR has merge conflicts with the target branch and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Mar 30, 2024
@ofborg ofborg bot added 8.has: clean-up 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 0 This PR does not cause any packages to rebuild labels Mar 30, 2024
AndersonTorres
AndersonTorres suggested changes Mar 31, 2024
View reviewed changes
Copy link
Member

@AndersonTorres AndersonTorres left a comment

Choose a reason for hiding this comment

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

Now it looks good to go.

Please squash everything and fix possible problems.

AndersonTorres
AndersonTorres suggested changes Mar 31, 2024
View reviewed changes
Copy link
Member

@AndersonTorres AndersonTorres left a comment

Choose a reason for hiding this comment

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

Hum, let's reword the commit message:

brave: add aarch64-linux support

- Refactor update.sh to deal with both x86_64-linux and aarch64-linux packages.

Besides, LGTM.

@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/1568

@thedaringdev
Copy link
Contributor Author

Hum, let's reword the commit message:

brave: add aarch64-linux support

- Refactor update.sh to deal with both x86_64-linux and aarch64-linux packages.

Besides, LGTM.

Done.

@AndersonTorres
Copy link
Member

AndersonTorres commented Apr 1, 2024 •
edited
Loading

Delete the gibberish in the commit message.

@thedaringdev
Copy link
Contributor Author

Delete the gibberish on the commit message.

Sorry didnt realize. We should be all set now.

AndersonTorres
AndersonTorres approved these changes Apr 1, 2024
View reviewed changes
Copy link
Member

@AndersonTorres AndersonTorres left a comment

Choose a reason for hiding this comment

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

LGTM. Waiting an Armlinux user.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Apr 1, 2024
@wegank
Copy link
Member

wegank commented Apr 1, 2024

Result of nixpkgs-review pr 298042 run on aarch64-linux 1

@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Apr 2, 2024
@thedaringdev thedaringdev requested a review from wegank April 3, 2024 23:50
@wegank
Copy link
Member

wegank commented Apr 3, 2024

Result of nixpkgs-review pr 298042 run on aarch64-linux 1

wegank
wegank reviewed Apr 4, 2024
View reviewed changes
pkgs/applications/networking/browsers/brave/default.nix Outdated
};
# Expression generated by update.sh; do not edit it by hand!
{ hostPlatform, callPackage }: {
brave = if hostPlatform.isAarch64
Copy link
Member

@wegank wegank Apr 4, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

This moves brave to brave.brave (so brave.meta doesn't exist, and the clean-up label is still there). Could something like let brave = something; in brave be done here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm going to need some help on this one.

Copy link
Member

Choose a reason for hiding this comment

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

Try to find something like brave = callPackage <path> { }; in all-packages.nix and replace it with inherit (callPackages <path> { }) brave;.

AndersonTorres
AndersonTorres suggested changes Apr 5, 2024
View reviewed changes
pkgs/applications/networking/browsers/brave/default.nix Outdated
};
# Expression generated by update.sh; do not edit it by hand!
{ hostPlatform, callPackage }: {
brave = if hostPlatform.isAarch64
Copy link
Member

Choose a reason for hiding this comment

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

Try

Suggested change
brave = if hostPlatform.isAarch64
if hostPlatform.isAarch64

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If I remove brave i get a the following linting error Expecting a binding like 'path = value;' or 'inherit attr;'. When building the package I get error: syntax error, unexpected IF.

AndersonTorres
AndersonTorres reviewed Apr 5, 2024
View reviewed changes
pkgs/applications/networking/browsers/brave/default.nix Outdated
Comment on lines 2 to 3
{ hostPlatform, callPackage }: {
brave = if hostPlatform.isAarch64
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
{ hostPlatform, callPackage }: {
brave = if hostPlatform.isAarch64
{ hostPlatform, callPackage }:
if hostPlatform.isAarch64

I believe it should help, but I can't test.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That doesn't work I get the same error as mentioned prior. Is there anything else we can do to get rid of clean up label. I have successfully built the package on both systems.

Copy link
Member

Choose a reason for hiding this comment

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

I'll have a try later today.

@ofborg ofborg bot added 2.status: merge conflict This PR has merge conflicts with the target branch and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Apr 10, 2024
@thedaringdev @wegank
brave: add aarch64-linux support
321f340 
Refactor update.sh to deal with both x86_64-linux and aarch64-linux
packages.
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Apr 10, 2024
@ofborg ofborg bot requested review from buckley310, uskudnik and rht April 10, 2024 08:31
@ofborg ofborg bot added 10.rebuild-linux: 1-10 10.rebuild-linux: 1 and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild labels Apr 10, 2024
@wegank
Copy link
Member

wegank commented Apr 10, 2024

Result of nixpkgs-review pr 298042 run on aarch64-linux 1

1 package built:
  • brave

@wegank wegank merged commit 5cb7527 into NixOS:master Apr 10, 2024
27 checks passed
@thedaringdev thedaringdev deleted the brave branch April 10, 2024 15:58
@spitulax spitulax mentioned this pull request Apr 12, 2024
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wegank wegank wegank left review comments

@AndersonTorres AndersonTorres AndersonTorres requested changes

@buckley310 buckley310 Awaiting requested review from buckley310

@uskudnik uskudnik Awaiting requested review from uskudnik

@rht rht Awaiting requested review from rht

Assignees
No one assigned
Labels
8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@thedaringdev @nixos-discourse @AndersonTorres @wegank