Skip to content

Comments

[staging 24.11]: libical: 3.0.18 -> 3.0.20#389004

Closed
matthiasbeyer wants to merge 1 commit intoNixOS:staging-24.11from
matthiasbeyer:update-libical
Closed

[staging 24.11]: libical: 3.0.18 -> 3.0.20#389004
matthiasbeyer wants to merge 1 commit intoNixOS:staging-24.11from
matthiasbeyer:update-libical

Conversation

@matthiasbeyer
Copy link
Contributor

@matthiasbeyer matthiasbeyer commented Mar 11, 2025

Not sure whether this is the right branch to target... 👀

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: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels Mar 11, 2025
@vcunat
Copy link
Member

vcunat commented Mar 19, 2025

The branch is correct, but cherry-picking for backports should be done with -x, so that you record from which commit the backport happened. That's documented in
https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#manually-backporting-changes

@matthiasbeyer
Copy link
Contributor Author

meh, good catch. I normally do that.

@matthiasbeyer
Copy link
Contributor Author

Updated.

@vcunat
Copy link
Member

vcunat commented Mar 21, 2025

Where's the libical 3.0.20 from? I fail to see it on open nixpkgs PRs or staging branch. And you used commit hashes that don't exist in the nixpkgs repo. By the way, the CI is also complaining about the same.

The reference in the first commit should be 4a22717 (but it's easy to find at least).

@matthiasbeyer
Copy link
Contributor Author

That's really interesting. AFAICR, I git log master -- path/to/libbicaled and cherry-picked these commits. I will recreate this next week and we'll see.

@vcunat vcunat marked this pull request as draft March 22, 2025 18:00
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@matthiasbeyer
Copy link
Contributor Author

Hm, I fail to see what I messed up here, really.

I rebased the PR and removed the 3.0.18 -> 3.0.19 patch, which already landed. Now this only contains one commit that updates the package to 3.0.20, which is the latest version.

@vcunat
Copy link
Member

vcunat commented Mar 23, 2025

Well, but we first want the update to staging and after that pick it to staging-24.11, right?

@matthiasbeyer
Copy link
Contributor Author

You're right. PR here: #392708

@wolfgangwalther wolfgangwalther added the 4.workflow: backport This targets a stable branch label May 4, 2025
@wolfgangwalther
Copy link
Contributor

With 25.05 released and 24.11 on its way out, do we still need this backport?

@matthiasbeyer
Copy link
Contributor Author

Probably not 😉

@vcunat
Copy link
Member

vcunat commented May 24, 2025

I forgot about this.

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

Labels

4.workflow: backport This targets a stable branch 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants