Skip to content

Comments

discord-development: init at {0.0.216,0.0.8778}#226632

Merged
Artturin merged 3 commits intoNixOS:masterfrom
jopejoe1:discord-development
May 5, 2023
Merged

discord-development: init at {0.0.216,0.0.8778}#226632
Artturin merged 3 commits intoNixOS:masterfrom
jopejoe1:discord-development

Conversation

@jopejoe1
Copy link
Member

@jopejoe1 jopejoe1 commented Apr 17, 2023

Description of changes

Updates #179212 to latest version and resolve merge conflicts.

Closes #179212

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/)
  • 23.05 Release Notes (or backporting 22.11 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.

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Apr 17, 2023
@ofborg ofborg bot requested review from Artturin, Infinidoge and MP2E April 17, 2023 12:36
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Apr 17, 2023
@jopejoe1 jopejoe1 force-pushed the discord-development branch from 26568bf to b0c3a60 Compare April 17, 2023 15:53
@ofborg ofborg bot requested a review from Infinidoge April 17, 2023 16:09
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/2098

@jopejoe1 jopejoe1 force-pushed the discord-development branch from b0c3a60 to 9756efd Compare April 30, 2023 08:09
@jopejoe1 jopejoe1 changed the title discord-development: init at {0.0.215,0.0.877} discord-development: init at {0.0.216,0.0.8778} Apr 30, 2023
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 30, 2023
@Artturin
Copy link
Member

Artturin commented May 1, 2023

will have to be backported to ease the backporting of other versions

@jopejoe1 jopejoe1 force-pushed the discord-development branch from 9756efd to 72bf1b5 Compare May 2, 2023 10:48
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label May 2, 2023
@Artturin Artturin merged commit 8c05c47 into NixOS:master May 5, 2023
@github-actions
Copy link
Contributor

github-actions bot commented May 5, 2023

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

Please cherry-pick the changes locally.

git fetch origin release-22.11
git worktree add -d .worktree/backport-226632-to-release-22.11 origin/release-22.11
cd .worktree/backport-226632-to-release-22.11
git checkout -b backport-226632-to-release-22.11
ancref=$(git merge-base 826418fc35e4cd6e85a88edd389cb249a7aa9671 72bf1b54e557d45ed0633e2f91b38371b3e12fed)
git cherry-pick -x $ancref..72bf1b54e557d45ed0633e2f91b38371b3e12fed

@Artturin
Copy link
Member

Artturin commented May 5, 2023

Please do the backport

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants