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

discord: add aarch64-darwin to platforms #199695

Merged
merged 1 commit into from
Nov 6, 2022
Merged

discord: add aarch64-darwin to platforms #199695

merged 1 commit into from
Nov 6, 2022

Conversation

Azd325
Copy link
Member

@Azd325 Azd325 commented Nov 5, 2022 •
edited
Loading

The dmg includes the universal binary with ARM support now.

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.11 Release Notes (or backporting 22.05 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Nov 5, 2022
@Azd325 Azd325 force-pushed the master branch 2 times, most recently from e71fdbd to 26003ea Compare November 5, 2022 13:05
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Nov 5, 2022
@ofborg ofborg bot added 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 Nov 5, 2022
@wegank
Copy link
Member

wegank commented Nov 5, 2022 •
edited
Loading

Hi! To fit CONTRIBUTING.md, could you please rename the commit to discord: add aarch64-darwin to platforms? Thanks!

@Azd325 Azd325 force-pushed the master branch 2 times, most recently from 28d7e64 to a6be676 Compare November 5, 2022 13:26
@Azd325
Copy link
Member Author

Azd325 commented Nov 5, 2022

Result of nixpkgs-review pr 199695 run on aarch64-darwin 1

1 package built:
  • discord

@Azd325
Copy link
Member Author

Azd325 commented Nov 5, 2022 •
edited
Loading

Hi! To fit CONTRIBUTING.md, could you please rename the commit to discord: add aarch64-darwin to platforms? Thanks!

Yes, I updated the summary text.

wegank
wegank reviewed Nov 5, 2022
View reviewed changes
pkgs/applications/networking/instant-messengers/discord/default.nix Outdated
@@ -13,37 +13,38 @@ let
srcs = rec {
x86_64-linux = {
stable = fetchurl {
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
url =
Copy link
Member

Choose a reason for hiding this comment

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

These break lines seem unnecessary to me and also make diff bigger. Otherwise LGTM

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, you're right, it blows up the commit. It was auto formatted by nixfmt. Reverted these lines.
Are there any requirements to a default formatting?

Copy link
Member

Choose a reason for hiding this comment

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

nixpkgs-fmt is the most used one afaik

There's a rfc which will codify a formatter NixOS/rfcs#101

@Azd325
discord: add aarch64-darwin to platforms
be7eb48 
The dmg includes the universal binary with ARM support now.
@Azd325 Azd325 marked this pull request as ready for review November 5, 2022 13:59
@Azd325 Azd325 changed the title Add aarch64-darwin to platforms discord: add aarch64-darwin to platforms Nov 5, 2022
@Artturin Artturin merged commit 99801a5 into NixOS:master Nov 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wegank wegank wegank approved these changes

@devins2518 devins2518 Awaiting requested review from devins2518

@Infinidoge Infinidoge Awaiting requested review from Infinidoge

@MP2E MP2E Awaiting requested review from MP2E

@Artturin Artturin Awaiting requested review from Artturin

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 8.has: package (new) This PR adds a new package 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
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Azd325 @wegank @Artturin