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

[BACKPORT]bilibili: 1.15.2-2 -> 1.16.1-3 #372922

Conversation

Bot-wxt1221
Copy link
Member

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.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jan 11, 2025
@wolfgangwalther
Copy link
Contributor

This seems to involve 3 PRs - please cherry-pick as separate commits and with -x. This will allow the cherry-pick CI job to confirm the contents. Too much patch for me to check manually.

Alternatively, remove and add the label again in the first of those PRs with the bulk of changes. This should be possible to backport without conflict now, I guess.

@Bot-wxt1221
Copy link
Member Author

Bot-wxt1221 commented Jan 12, 2025

@wolfgangwalther It is only a backport.

#367029
#368956

@Bot-wxt1221 Bot-wxt1221 changed the title bilibili: 1.15.2-2 -> 1.16.1-3 [BACKPORT]bilibili: 1.15.2-2 -> 1.16.1-3 Jan 12, 2025
@wolfgangwalther
Copy link
Contributor

It is only a backport.

I know. My comment specifically targets a backport.

Also read the contributing guide about backports: https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#manually-backporting-changes

The git cherry-pick -x ... is mentioned there explicitly.

You have content of 3 PRs squashed into a single commit - that makes it incredibly hard to verify.

@Bot-wxt1221 Bot-wxt1221 force-pushed the backport-371441-to-release-24.11 branch from 20f38a6 to c5d8929 Compare January 12, 2025 11:14
Bot-wxt1221 and others added 3 commits January 12, 2025 19:15
(cherry picked from commit 0d0f0be)
(cherry picked from commit cac0e6e)
(cherry picked from commit e57dd56)
@Bot-wxt1221 Bot-wxt1221 force-pushed the backport-371441-to-release-24.11 branch from c5d8929 to c264a10 Compare January 12, 2025 11:15
@wolfgangwalther
Copy link
Contributor

Thanks. Because you used -x, the check cherry picks job is now confirming for us, that the changes in here match the changes in the PRs:

https://github.com/NixOS/nixpkgs/actions/runs/12733005376/job/35488853134?pr=372922

The job succeeds, so I don't even need to look at the code - the changes will be the same as on master.

@nix-owners nix-owners bot requested review from kashw2 and Jedsek January 12, 2025 11:21
@wolfgangwalther
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 372922


x86_64-linux

✅ 1 package built:
  • bilibili

aarch64-linux

✅ 1 package built:
  • bilibili

@wolfgangwalther wolfgangwalther merged commit dee7a47 into NixOS:release-24.11 Jan 12, 2025
23 checks passed
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants