Skip to content

Conversation

shymega
Copy link
Member

@shymega shymega commented Jul 2, 2025

buildstream: 2.4.1 -> 2.5.0

Applied two patches from upstream repository for Buildstrream, to fix
the Protobuf runtime warnings, and dependency constraints.

These patches can be removed once Buildstream v2.6.0 is released.

For now, it is important to get 2.5.0 landed, as it includes a new API
which is necessary for new releases of Buildstream plugins.

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/)
  • Nixpkgs 25.11 Release Notes (or backporting 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 25.05 NixOS Release notes)
    • (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, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

@shymega shymega changed the title Shymega/bump buildstream 2.5.0 buildstream: 2.4.1 -> 2.5.0 Jul 2, 2025
@nix-owners nix-owners bot requested a review from natsukium July 2, 2025 21:54
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 6.topic: python Python is a high-level, general-purpose programming language. labels Jul 2, 2025
@shymega shymega force-pushed the shymega/bump-buildstream-2.5.0 branch 2 times, most recently from 1ef8c1b to 8d030b4 Compare July 7, 2025 16:24
@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 26, 2025
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/5710

@shymega shymega force-pushed the shymega/bump-buildstream-2.5.0 branch from 8d030b4 to 8fd215a Compare July 28, 2025 11:04
@nixpkgs-ci nixpkgs-ci bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 28, 2025
@shymega shymega force-pushed the shymega/bump-buildstream-2.5.0 branch from 8fd215a to 5819389 Compare July 28, 2025 11:30
@shymega
Copy link
Member Author

shymega commented Jul 28, 2025

Merge conflict resolved, ran nix fmt. Ready for review.

@shymega shymega force-pushed the shymega/bump-buildstream-2.5.0 branch from 5819389 to b33d05b Compare July 28, 2025 14:42
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. and removed 6.topic: python Python is a high-level, general-purpose programming language. labels Jul 28, 2025
@shymega shymega force-pushed the shymega/bump-buildstream-2.5.0 branch from b33d05b to d024d32 Compare July 28, 2025 14:50
@shymega
Copy link
Member Author

shymega commented Jul 28, 2025

Rebased against master, the buildstream-plugins PR has been merged.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/5713

@shymega shymega force-pushed the shymega/bump-buildstream-2.5.0 branch from d024d32 to eb84e94 Compare August 9, 2025 15:57
@timbrown5
Copy link

I don't think buildstream supports darwin, is there a way to skip those checks?

@shymega
Copy link
Member Author

shymega commented Aug 15, 2025

@timbrown5 I've already specified meta.platform = lib.platforms.linux, so that's specified the package is only for Linux. Not sure why CI is running passthru tests for Darwin, or queued at least, but it's no biggie.

@shymega
Copy link
Member Author

shymega commented Aug 15, 2025

It would be great to get this merged though.

Applied two patches from upstream repository for Buildstrream, to fix
the Protobuf runtime warnings, and dependency constraints.

These patches can be removed once Buildstream v2.6.0 is released.
@shymega shymega force-pushed the shymega/bump-buildstream-2.5.0 branch from eb84e94 to c0d7f1f Compare August 20, 2025 17:53
@phaer phaer merged commit 5a4291f into NixOS:master Aug 20, 2025
25 of 27 checks passed
@shymega shymega added the backport release-25.05 Backport PR automatically label Aug 20, 2025
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Aug 20, 2025

Successfully created backport PR for release-25.05:

@github-actions github-actions bot added the 8.has: port to stable This PR already has a backport to the stable release. label Aug 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: port to stable This PR already has a backport to the stable release. 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. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. backport release-25.05 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants