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

discord: add a script to disable breaking updates #197248

Merged
merged 1 commit into from
Oct 22, 2022

Conversation

Artturin
Copy link
Member

@Artturin Artturin commented Oct 22, 2022

Check the docstring

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.

@Artturin Artturin force-pushed the discord-disable-breaking-updates branch from 14166e7 to c223efc Compare October 22, 2022 17:37
@ofborg ofborg bot requested review from Infinidoge, MP2E and devins2518 October 22, 2022 17:48
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Oct 22, 2022
@Artturin
Copy link
Member Author

i don't know if the script will work on darwin

@Infinidoge
Copy link
Contributor

At a glance, this looks good to me, but testing it is slightly annoying so I haven't done that yet.

@Artturin
Copy link
Member Author

To test check the settings.json ex .config/discordcanary/settings.json before and after running NIXPKGS_ALLOW_UNFREE=1 nix run --impure "github:Artturin/nixpkgs/discord-disable-breaking-updates#discord-canary.disableBreakingUpdates"

Copy link
Member

@benley benley left a comment

Choose a reason for hiding this comment

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

This is awesome, I was getting really tired of discord self-destructing so frequently when they push updates.

@benley benley merged commit cdde640 into NixOS:master Oct 22, 2022
@Infinidoge
Copy link
Contributor

To test check the settings.json ex .config/discordcanary/settings.json before and after running NIXPKGS_ALLOW_UNFREE=1 nix run --impure "github:Artturin/nixpkgs/discord-disable-breaking-updates#discord-canary.disableBreakingUpdates"

I was more so referring to testing that older host versions then run properly, however yeah that should be good enough.

@Artturin
Copy link
Member Author

Artturin commented Oct 22, 2022

To test check the settings.json ex .config/discordcanary/settings.json before and after running NIXPKGS_ALLOW_UNFREE=1 nix run --impure "github:Artturin/nixpkgs/discord-disable-breaking-updates#discord-canary.disableBreakingUpdates"

I was more so referring to testing that older host versions then run properly, however yeah that should be good enough.

# verify that there's no SKIP_HOST_UPDATE in settings.json and if there is then remove it and the last ','
# 7b38cb118ce is one commit before discord-canary: 0.0.139 -> 0.0.140
NIXPKGS_ALLOW_UNFREE=1 nix run "github:nixos/nixpkgs/7b38cb118ce#discord-canary" --impure
# observe that discord cannot start
NIXPKGS_ALLOW_UNFREE=1 nix run --impure "github:Artturin/nixpkgs/discord-disable-breaking-updates#discord-canary.disableBreakingUpdates"
NIXPKGS_ALLOW_UNFREE=1 nix run "github:nixos/nixpkgs/7b38cb118ce#discord-canary" --impure
# observe that discord starts

@github-actions
Copy link
Contributor

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

Please cherry-pick the changes locally.

git fetch origin release-22.05
git worktree add -d .worktree/backport-197248-to-release-22.05 origin/release-22.05
cd .worktree/backport-197248-to-release-22.05
git checkout -b backport-197248-to-release-22.05
ancref=$(git merge-base 4752722090be8e7fd4ecceb12bee492851837d3d c223efc36b39e4b88a5ac4f79dcb95881ed58d18)
git cherry-pick -x $ancref..c223efc36b39e4b88a5ac4f79dcb95881ed58d18

@Artturin
Copy link
Member Author

backport #197266

@Artturin Artturin deleted the discord-disable-breaking-updates branch October 22, 2022 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants