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

[Backport release-24.05] teams-for-linux: 1.9.5 -> 1.11.2; electron 30 -> 32 #351714

Merged
merged 5 commits into from
Oct 27, 2024
Merged

[Backport release-24.05] teams-for-linux: 1.9.5 -> 1.11.2; electron 30 -> 32 #351714

merged 5 commits into from
Oct 27, 2024

Conversation

khaneliman
Copy link
Contributor

Follow up to #350497 for #350549

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.

@khaneliman
Copy link
Contributor Author

Hmm cherry pick resolved weird, fixing it up real quick

@khaneliman
Copy link
Contributor Author

Pulling out the versionCheckProgramArg commit, we don't have the concept of versionCheckHook in 24.05

@emilazy
Copy link
Member

emilazy commented Oct 27, 2024

Sorry to be a pain, but we prefer git cherry-pick -x, which links back to the original commit (and PR).

r-ryantm and others added 4 commits October 27, 2024 13:03
@r-ryantm @khaneliman
teams-for-linux: 1.9.5 -> 1.9.6
afdc6d0 
(cherry picked from commit 4d4bf95)
@r-ryantm @khaneliman
teams-for-linux: 1.9.6 -> 1.10.2
a2a75b0 
(cherry picked from commit 183a963)
@r-ryantm @khaneliman
teams-for-linux: 1.10.2 -> 1.11.0
0afbe27 
(cherry picked from commit c29703d)
@khaneliman
teams-for-linux: 1.11.0 -> 1.11.2
e2bb6f8 
(cherry picked from commit bce77b9)
@khaneliman
Copy link
Contributor Author

@emilazy np, updated with the link

@emilazy
Copy link
Member

emilazy commented Oct 27, 2024

Looks good to me, thank you! Did you test this?

@khaneliman
Copy link
Contributor Author

Looks good to me, thank you! Did you test this?

I think I need to tweak it again because of an electron derivation change, one sec

@khaneliman
teams-for-linux: electron 30 -> electron 32
e8ab03f 
Looks like upstream bumped electron version, already.

(cherry picked from commit 0cf4af9)
@khaneliman
Copy link
Contributor Author

Looked like we didn't have electron.dist in 24.05 either. Building to verify real quick

@khaneliman
Copy link
Contributor Author

khaneliman commented Oct 27, 2024 •
edited
Loading

Alright, builds and opens for me. Looks like cherry-pick check failure is just due to the conflict resolution of that electron commit.

@khaneliman khaneliman changed the title [Backport 24.05] teams-for-linux: 1.9.5 -> 1.11.2; electron 30 -> 32 [Backport release-24.05] teams-for-linux: 1.9.5 -> 1.11.2; electron 30 -> 32 Oct 27, 2024
@emilazy emilazy merged commit 2473202 into NixOS:release-24.05 Oct 27, 2024
12 of 14 checks passed
@khaneliman khaneliman deleted the teams branch October 27, 2024 20:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emilazy emilazy emilazy 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.
3 participants
@khaneliman @emilazy @r-ryantm