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: format, update discord-canary and discord-ptb, refactor meta #347313

Merged
merged 9 commits into from
Oct 13, 2024
Merged

discord: format, update discord-canary and discord-ptb, refactor meta #347313

merged 9 commits into from
Oct 13, 2024

Conversation

DontEatOreo
Copy link
Member

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.11 Release Notes (or backporting 23.11 and 24.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@DontEatOreo DontEatOreo added 6.topic: darwin Running or building packages on Darwin backport release-24.05 Backport PR automatically labels Oct 8, 2024
@DontEatOreo
Copy link
Member Author

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

4 packages built:
  • discord
  • discord-canary
  • discord-development
  • discord-ptb

@DontEatOreo
Copy link
Member Author

Result of nixpkgs-review pr 347313 run on x86_64-darwin 1

4 packages built:
  • discord
  • discord-canary
  • discord-development
  • discord-ptb

@DontEatOreo
Copy link
Member Author

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

@Scrumplex
Copy link
Member

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

Scrumplex
Scrumplex approved these changes Oct 9, 2024
View reviewed changes
Copy link
Member

@Scrumplex Scrumplex left a comment

Choose a reason for hiding this comment

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

Identical derivations as before on Linux

@gepbird
Copy link
Contributor

gepbird commented Oct 12, 2024

The update script was fixed in #347886, please rebase for the refactor changes

@DontEatOreo DontEatOreo changed the title discord: format, update darwin endpoints, update all darwin versions, refactor meta discord: format, update discord-canary and discord-ptb, refactor meta Oct 12, 2024
gepbird
gepbird approved these changes Oct 12, 2024
View reviewed changes
Copy link
Contributor

@gepbird gepbird left a comment

Choose a reason for hiding this comment

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

Changes LGTM

@DontEatOreo
Copy link
Member Author

Sorry for the extra force push; I realized I worded the update commits wrong fixed now

@DontEatOreo
Copy link
Member Author

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

2 packages built:
  • discord-canary
  • discord-ptb

@ofborg ofborg bot requested a review from Scrumplex October 13, 2024 02:14
@JohnRTitor JohnRTitor merged commit cf7b58f into NixOS:master Oct 13, 2024
28 of 29 checks passed
@github-actions GitHub Actions
Copy link
Contributor

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-347313-to-release-24.05 origin/release-24.05
cd .worktree/backport-347313-to-release-24.05
git switch --create backport-347313-to-release-24.05
git cherry-pick -x 84e88c59eebf2665681cb18226420d10b8bcd6ef b7248fa4ca43a9eab3cd38124715c76ac501d0f1 483b696bc35e5fc81d19f2ef1489172d89387b36 d7c3bc45e5fae125e1d8f13bd72c80cb12f960d7 ad01515d064125998ca2174d5ebc8beff18470c4 209450e50fc1e345d197ab5934fe2cc716b45ed0 403b09768a7376fff6a4861d94bb0a83591524d5 db661a422d8ed7a0a048850a185db62f69141770 f5627723fb1905c4da936a93fb16ea6ee0f648ba

@DontEatOreo DontEatOreo deleted the update-discord-macos branch October 13, 2024 08:56
@Artturin Artturin added backport release-24.05 Backport PR automatically and removed backport release-24.05 Backport PR automatically labels Oct 13, 2024
@github-actions GitHub Actions
Copy link
Contributor

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-347313-to-release-24.05 origin/release-24.05
cd .worktree/backport-347313-to-release-24.05
git switch --create backport-347313-to-release-24.05
git cherry-pick -x 84e88c59eebf2665681cb18226420d10b8bcd6ef b7248fa4ca43a9eab3cd38124715c76ac501d0f1 483b696bc35e5fc81d19f2ef1489172d89387b36 d7c3bc45e5fae125e1d8f13bd72c80cb12f960d7 ad01515d064125998ca2174d5ebc8beff18470c4 209450e50fc1e345d197ab5934fe2cc716b45ed0 403b09768a7376fff6a4861d94bb0a83591524d5 db661a422d8ed7a0a048850a185db62f69141770 f5627723fb1905c4da936a93fb16ea6ee0f648ba

@Artturin
Copy link
Member

Conflicts with the stdenv.isX to stdenv.hostPlatform.isX treewide

Please do the backport yourself.

@jopejoe1 jopejoe1 added the 9.needs: port to stable A PR needs a backport to the stable release. label Oct 13, 2024
@github-actions GitHub Actions
Copy link
Contributor

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-347313-to-release-24.05 origin/release-24.05
cd .worktree/backport-347313-to-release-24.05
git switch --create backport-347313-to-release-24.05
git cherry-pick -x 84e88c59eebf2665681cb18226420d10b8bcd6ef b7248fa4ca43a9eab3cd38124715c76ac501d0f1 483b696bc35e5fc81d19f2ef1489172d89387b36 d7c3bc45e5fae125e1d8f13bd72c80cb12f960d7 ad01515d064125998ca2174d5ebc8beff18470c4 209450e50fc1e345d197ab5934fe2cc716b45ed0 403b09768a7376fff6a4861d94bb0a83591524d5 db661a422d8ed7a0a048850a185db62f69141770 f5627723fb1905c4da936a93fb16ea6ee0f648ba

@DontEatOreo DontEatOreo mentioned this pull request Oct 13, 2024
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Scrumplex Scrumplex Scrumplex approved these changes

@gepbird gepbird gepbird approved these changes

@Artturin Artturin Awaiting requested review from Artturin

@Infinidoge Infinidoge Awaiting requested review from Infinidoge

@jopejoe1 jopejoe1 Awaiting requested review from jopejoe1

@JohnRTitor JohnRTitor Awaiting requested review from JohnRTitor

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 9.needs: port to stable A PR needs a backport to the stable release. 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer 12.approvals: 2 12.approved-by: package-maintainer backport release-24.05 Backport PR automatically
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@DontEatOreo @Scrumplex @gepbird @Artturin @jopejoe1 @JohnRTitor