Skip to content

android-studio: 2024.2.1.9 -> 2024.2.1.11#356454

Closed
captainepoch wants to merge 1 commit intoNixOS:masterfrom
captainepoch:android-studio-ladybug
Closed

android-studio: 2024.2.1.9 -> 2024.2.1.11#356454
captainepoch wants to merge 1 commit intoNixOS:masterfrom
captainepoch:android-studio-ladybug

Conversation

@captainepoch
Copy link

@captainepoch captainepoch commented Nov 16, 2024 •
edited
Loading

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@NixOSInfra NixOSInfra added the 12.first-time contribution This PR is the author's first one; please be gentle! label Nov 16, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Nov 17, 2024
FliegendeWurst
FliegendeWurst approved these changes Nov 25, 2024
View reviewed changes
Copy link
Member

@FliegendeWurst FliegendeWurst left a comment

Choose a reason for hiding this comment

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

LGTM. It is a bit odd that our stable version is newer than the beta.

@captainepoch
Copy link
Author

captainepoch commented Nov 25, 2024

LGTM. It is a bit odd that our stable version is newer than the beta.

It is. I can open another PR updating those to the latest versions.

@FliegendeWurst
Copy link
Member

FliegendeWurst commented Nov 25, 2024

It is. I can open another PR updating those to the latest versions.

In this PR would also be okay.

@captainepoch
Copy link
Author

captainepoch commented Nov 25, 2024

In this PR would also be okay.

I could do it tomorrow or on thursday, I'll update the PR.

Thanks for the approval!

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 26, 2024
@captainepoch
Copy link
Author

captainepoch commented Dec 1, 2024

Please, don't close this PR. I'll make the changes I promised, I'm at this moment with some health issues and couldn't attend it.

@captainepoch captainepoch force-pushed the android-studio-ladybug branch 2 times, most recently from 3e07b6e to 403dd62 Compare December 2, 2024 15:45
@FliegendeWurst
Copy link
Member

FliegendeWurst commented Dec 2, 2024

Please, don't close this PR. I'll make the changes I promised, I'm at this moment with some health issues and couldn't attend it.

No worries :)
I estimate there are currently ~4k open PRs waiting on their authors..

@captainepoch
Copy link
Author

captainepoch commented Dec 2, 2024

I hope this satisfies the requirements for merging it, let me know if anything else must be done!

@FliegendeWurst
Copy link
Member

FliegendeWurst commented Dec 3, 2024

The CI is currently failing due to #354738

Other than that it's good to go.

@captainepoch captainepoch force-pushed the android-studio-ladybug branch from 403dd62 to cc3037f Compare December 4, 2024 14:45
@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one person. label Dec 4, 2024
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Dec 5, 2024
@captainepoch captainepoch force-pushed the android-studio-ladybug branch from cc3037f to b5014bf Compare December 5, 2024 08:07
@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one person. label Dec 5, 2024
@FliegendeWurst FliegendeWurst added the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 30, 2024
@FliegendeWurst
Copy link
Member

FliegendeWurst commented Dec 30, 2024

stable was updated in #363548, please rebase

@captainepoch
Copy link
Author

captainepoch commented Dec 30, 2024 via email

@captainepoch captainepoch force-pushed the android-studio-ladybug branch from b5014bf to ba87311 Compare January 5, 2025 07:10
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 5, 2025
@captainepoch
Copy link
Author

captainepoch commented Jan 5, 2025

stable was updated in #363548, please rebase

Happy new year!

Sorry for the delay, I updated this PR with the latest master as today.

Thank you for your time!

@github-actions github-actions bot removed the 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. label Jan 5, 2025
@github-actions github-actions bot added the 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. label Jan 5, 2025
@FliegendeWurst
Copy link
Member

FliegendeWurst commented Jan 5, 2025

And a happy new year to you!

It seems all variants already got updated in the meantime #366708. I would suggest checking for further updates, and if there are none to close the PR.

@captainepoch
Copy link
Author

captainepoch commented Jan 5, 2025

That commit only updated the beta version, not the other two, and it's the same as I pushed in this PR.

@FliegendeWurst
Copy link
Member

FliegendeWurst commented Jan 5, 2025

For canary #369320

@captainepoch
Copy link
Author

captainepoch commented Jan 5, 2025

You're totally right, my bad.

This PR can be closed. I'll try to be more diligent in the next one.

Thank you very much!

@captainepoch captainepoch deleted the android-studio-ladybug branch January 5, 2025 11:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@FliegendeWurst FliegendeWurst FliegendeWurst approved these changes

Assignees

No one assigned

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 12.first-time contribution This PR is the author's first one; please be gentle!

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@captainepoch @FliegendeWurst @wegank @NixOSInfra