Brave: add arm64 support by thedaringdev · Pull Request #298042 · NixOS/nixpkgs

thedaringdev · 2024-03-22T13:25:26Z

Description of changes

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

Things done

Add a 👍 reaction to pull requests you find important.

pkgs/applications/networking/browsers/brave/default.nix

pkgs/applications/networking/browsers/brave/generic.nix

pkgs/applications/networking/browsers/brave/default.nix

pkgs/applications/networking/browsers/brave/generic.nix

pkgs/applications/networking/browsers/brave/update.sh

pkgs/applications/networking/browsers/brave/make-brave.nix

pkgs/applications/networking/browsers/brave/update.sh

pkgs/applications/networking/browsers/brave/default.nix

pkgs/applications/networking/browsers/brave/update.sh

AndersonTorres

Now it looks good to go.

Please squash everything and fix possible problems.

AndersonTorres

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 · 2024-03-31T15:31:35Z

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 · 2024-03-31T19:42:16Z

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 · 2024-04-01T18:06:20Z

Delete the gibberish in the commit message.

thedaringdev · 2024-04-01T21:25:00Z

Delete the gibberish on the commit message.

Sorry didnt realize. We should be all set now.

AndersonTorres

LGTM. Waiting an Armlinux user.

wegank · 2024-04-01T23:14:10Z

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

pkgs/applications/networking/browsers/brave/make-brave.nix

wegank · 2024-04-03T23:59:06Z

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

wegank · 2024-04-04T00:04:24Z

pkgs/applications/networking/browsers/brave/default.nix

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?

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

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

AndersonTorres · 2024-04-05T11:59:32Z

pkgs/applications/networking/browsers/brave/default.nix

Try

Suggested change

brave = if hostPlatform.isAarch64

if hostPlatform.isAarch64

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 · 2024-04-05T16:11:24Z

pkgs/applications/networking/browsers/brave/default.nix

Suggested change

{ hostPlatform, callPackage }: {

brave = if hostPlatform.isAarch64

{ hostPlatform, callPackage }:

if hostPlatform.isAarch64

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

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.

I'll have a try later today.

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

wegank · 2024-04-10T10:36:41Z

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

1 package built:

brave

AndersonTorres suggested changes Mar 22, 2024

View reviewed changes

pkgs/applications/networking/browsers/brave/default.nix Outdated Show resolved Hide resolved

pkgs/applications/networking/browsers/brave/generic.nix Outdated Show resolved Hide resolved

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

AndersonTorres reviewed Mar 24, 2024

View reviewed changes

AndersonTorres reviewed Mar 26, 2024

View reviewed changes

pkgs/applications/networking/browsers/brave/update.sh Outdated Show resolved Hide resolved

AndersonTorres reviewed Mar 26, 2024

View reviewed changes

AndersonTorres reviewed Mar 29, 2024

View reviewed changes

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

AndersonTorres suggested changes Mar 30, 2024

View reviewed changes

pkgs/applications/networking/browsers/brave/default.nix Outdated Show resolved Hide resolved

pkgs/applications/networking/browsers/brave/update.sh Outdated Show resolved Hide resolved

pkgs/applications/networking/browsers/brave/update.sh Outdated Show resolved Hide resolved

AndersonTorres suggested changes Mar 30, 2024

View reviewed changes

pkgs/applications/networking/browsers/brave/update.sh Outdated Show resolved Hide resolved

ofborg bot added 8.has: clean-up This PR removes packages or removes other cruft 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Mar 30, 2024

AndersonTorres suggested changes Mar 31, 2024

View reviewed changes

thedaringdev force-pushed the brave branch 2 times, most recently from a8e2088 to 3fec0ac Compare March 31, 2024 14:27

AndersonTorres suggested changes Mar 31, 2024

View reviewed changes

thedaringdev force-pushed the brave branch from 3fec0ac to 5292d37 Compare March 31, 2024 18:32

thedaringdev force-pushed the brave branch from 5292d37 to bd518ad Compare April 1, 2024 21:24

AndersonTorres approved these changes Apr 1, 2024

View reviewed changes

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

wegank reviewed Apr 1, 2024

View reviewed changes

pkgs/applications/networking/browsers/brave/make-brave.nix Outdated Show resolved Hide resolved

thedaringdev force-pushed the brave branch from b1ea647 to bae2442 Compare April 2, 2024 13:43

wegank removed the 12.approvals: 1 This PR was reviewed and approved by one person. label Apr 2, 2024

thedaringdev requested a review from wegank April 3, 2024 23:50

wegank reviewed Apr 4, 2024

View reviewed changes

AndersonTorres suggested changes Apr 5, 2024

View reviewed changes

AndersonTorres reviewed Apr 5, 2024

View reviewed changes

thedaringdev force-pushed the brave branch from bae2442 to 7546bf6 Compare April 10, 2024 01:37

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

brave: add aarch64-linux support

321f340

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

wegank force-pushed the brave branch from b97f3df to 321f340 Compare April 10, 2024 08:07

ofborg bot added the 8.has: package (new) This PR adds a new package label Apr 10, 2024

ofborg bot requested review from buckley310, rht and uskudnik April 10, 2024 08:31

ofborg bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Apr 10, 2024

wegank merged commit 5cb7527 into NixOS:master Apr 10, 2024

thedaringdev deleted the brave branch April 10, 2024 15:58

spitulax mentioned this pull request Apr 12, 2024

brave: fix overriding and update 1.64.116 -> 1.64.122 #303570

Merged

13 tasks

-{ hostPlatform, callPackage }: {
-  brave = if hostPlatform.isAarch64
+{ hostPlatform, callPackage }:
+if hostPlatform.isAarch64

Uh oh!

Conversation

thedaringdev commented Mar 22, 2024

Description of changes

Things done

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AndersonTorres left a comment

Choose a reason for hiding this comment

Uh oh!

AndersonTorres left a comment

Choose a reason for hiding this comment

Uh oh!

nixos-discourse commented Mar 31, 2024

Uh oh!

thedaringdev commented Mar 31, 2024

Uh oh!

AndersonTorres commented Apr 1, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

thedaringdev commented Apr 1, 2024

Uh oh!

AndersonTorres left a comment

Choose a reason for hiding this comment

Uh oh!

wegank commented Apr 1, 2024

Uh oh!

Uh oh!

wegank commented Apr 3, 2024

Uh oh!

wegank Apr 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

thedaringdev Apr 4, 2024

Choose a reason for hiding this comment

Uh oh!

wegank Apr 5, 2024

Choose a reason for hiding this comment

Uh oh!

AndersonTorres Apr 5, 2024

Choose a reason for hiding this comment

Uh oh!

thedaringdev Apr 5, 2024

Choose a reason for hiding this comment

Uh oh!

AndersonTorres Apr 5, 2024

Choose a reason for hiding this comment

Uh oh!

thedaringdev Apr 10, 2024

Choose a reason for hiding this comment

Uh oh!

wegank Apr 10, 2024

Choose a reason for hiding this comment

Uh oh!

wegank commented Apr 10, 2024

Uh oh!

Reviewers

Assignees

Labels

AndersonTorres commented Apr 1, 2024 •

edited

Loading

wegank Apr 4, 2024 •

edited

Loading