discord: enable aarch64-darwin support for discord-canary#179379
Merged
Artturin merged 1 commit intoNixOS:masterfrom Jul 17, 2022
Merged
discord: enable aarch64-darwin support for discord-canary#179379Artturin merged 1 commit intoNixOS:masterfrom
Artturin merged 1 commit intoNixOS:masterfrom
Conversation
ofborg
bot
added
6.topic: darwin
ofborg
bot
added
10.rebuild-darwin: 0
devins2518
approved these changes
Jun 28, 2022
Contributor
devins2518
left a comment
devins2518
left a comment
There was a problem hiding this comment.
Result of nixpkgs-review pr 179379 run on aarch64-darwin 1
1 package built:
- discord-canary
bobby285271
added
12.approvals: 1
13 tasks
IvarWithoutBones
added a commit
to IvarWithoutBones/nixpkgs
that referenced
this pull request
Jul 10, 2022
This also enables aarch64-darwin support for both Canary and the new Development branch, based on NixOS#179379. Thanks :)
Sciencentistguy
force-pushed
the
discord-canary-aarch64-darwin
branch
from
6e40fec to
3348245
Compare
Member
Author
|
Rebased on master |
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
pkgs/applications/networking/instant-messengers/discord/default.nix
Outdated
Show resolved
Hide resolved
pkgs/applications/networking/instant-messengers/discord/default.nix
Outdated
Show resolved
Hide resolved
pkgs/applications/networking/instant-messengers/discord/default.nix
Outdated
Show resolved
Hide resolved
Sciencentistguy
force-pushed
the
discord-canary-aarch64-darwin
branch
from
3348245 to
c1e25ba
Compare
Member
Author
|
Reverted formatting. Apologies, my editor uses alejandra as a nix formatter by default. |
SuperSandro2000
added
the
2.status: merge conflict
Member
|
Please rebase on master |
Sciencentistguy
force-pushed
the
discord-canary-aarch64-darwin
branch
from
c1e25ba to
b86abe5
Compare
Member
Author
|
@SuperSandro2000 done 🙂 |
ofborg
bot
removed
the
2.status: merge conflict
SuperSandro2000
approved these changes
Jul 15, 2022
Contributor
|
Backport failed for Please cherry-pick the changes locally. git fetch origin release-22.05
git worktree add -d .worktree/backport-179379-to-release-22.05 origin/release-22.05
cd .worktree/backport-179379-to-release-22.05
git checkout -b backport-179379-to-release-22.05
ancref=$(git merge-base b4093a24a868708c06d93e9edf13de0b3228b9c7 b86abe5cf424b9ea6ae5a550489b17e6cc42a06e)
git cherry-pick -x $ancref..b86abe5cf424b9ea6ae5a550489b17e6cc42a06e |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
Previous comment stated that only
discord-ptbsupportedaarch64-darwin. This may have been correct at the time, but currently-canarysupportsaarch64-darwinas well.Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes