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.

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

[20.03] discord: 0.0.11 -> 0.0.12 #97708

Merged
merged 3 commits into from Sep 10, 2020
Merged

[20.03] discord: 0.0.11 -> 0.0.12 #97708

merged 3 commits into from Sep 10, 2020

Conversation

TethysSvensson
Copy link
Contributor

Motivation for this change

Backport of #97694.

CC: @jonringer

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@TethysSvensson TethysSvensson mentioned this pull request Sep 10, 2020
Merged
10 tasks
@jonringer
Copy link
Contributor

When backporting changes, please follow https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes.

Namely, you should be doing git cherry-pick -x <rev> from a commit that has already landed in master. If the branches have diverged, you may alter the commit or add another commit to ensure that the package is able to still evaluate and build

@TethysSvensson
Copy link
Contributor Author

@jonringer: Alright, I will update the PR now.

@TethysSvensson
discord: 0.0.11 -> 0.0.12
a163e2b 
(cherry picked from commit 977147b)
@TethysSvensson
discord-ptb: 0.0.21 -> 0.0.22
8b63973 
(cherry picked from commit 3ca40ee)
@TethysSvensson
discord-canary: 0.0.111 -> 0.0.112
f26b05f 
(cherry picked from commit 1937fd3)
@TethysSvensson
Copy link
Contributor Author

@jonringer: Please take another look

@TethysSvensson TethysSvensson changed the title discord: 0.0.11 -> 0.0.12 [20.03] discord: 0.0.11 -> 0.0.12 Sep 10, 2020
jonringer
jonringer approved these changes Sep 10, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

Result of nixpkgs-review pr 97708 1

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

@jonringer jonringer merged commit c291195 into NixOS:release-20.03 Sep 10, 2020
@TethysSvensson TethysSvensson deleted the discord-update-20.03 branch September 10, 2020 21:28
@moyamo moyamo mentioned this pull request Sep 12, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@TethysSvensson @jonringer