[Backport release-24.05] teams-for-linux: 1.9.5 -> 1.11.2; electron 30 -> 32#351714
Merged
emilazy merged 5 commits intoNixOS:release-24.05from Oct 27, 2024
Merged
[Backport release-24.05] teams-for-linux: 1.9.5 -> 1.11.2; electron 30 -> 32#351714emilazy merged 5 commits intoNixOS:release-24.05from
emilazy merged 5 commits intoNixOS:release-24.05from
Conversation
Contributor
Author
|
Hmm cherry pick resolved weird, fixing it up real quick |
khaneliman
force-pushed
the
teams
branch
2 times, most recently
from
049e129 to
d674008
Compare
Contributor
Author
|
Pulling out the versionCheckProgramArg commit, we don't have the concept of versionCheckHook in 24.05 |
Member
|
Sorry to be a pain, but we prefer |
Contributor
Author
|
@emilazy np, updated with the link |
Member
|
Looks good to me, thank you! Did you test this? |
Contributor
Author
I think I need to tweak it again because of an electron derivation change, one sec |
Looks like upstream bumped electron version, already. (cherry picked from commit 0cf4af9)
Contributor
Author
|
Looked like we didn't have |
Contributor
Author
|
Alright, builds and opens for me. Looks like cherry-pick check failure is just due to the conflict resolution of that electron commit. |
khaneliman
changed the title
emilazy
approved these changes
Oct 27, 2024
21 tasks
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
3 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.
Follow up to #350497 for #350549
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.