Skip to content

Reapply: rav1e: remove build-time dependency on libgit2#360999

Merged
getchoo merged 3 commits intoNixOS:stagingfrom
paparodeo:rav1e-devendor-better
Dec 5, 2024
Merged

Reapply: rav1e: remove build-time dependency on libgit2#360999
getchoo merged 3 commits intoNixOS:stagingfrom
paparodeo:rav1e-devendor-better

Conversation

@paparodeo
Copy link
Contributor

@paparodeo paparodeo commented Dec 2, 2024

re-apply #355325 which is a better way to de-vendor libgit2 but had to be reverted on master due to mass-builds.

files are identical after this PR and #355325

$ curl -sL https://raw.githubusercontent.com/NixOS/nixpkgs/fab8f4325c0534d7d63d46a2fafe89cee5e29e46/pkgs/by-name/ra/rav1e/package.nix | md5sum
9804aef983596bd180816aef52172c28  -
$ curl -sL https://raw.githubusercontent.com/NixOS/nixpkgs/c4a4f958cb5af702f61f88d0e762af1700c6a705/pkgs/by-name/ra/rav1e/package.nix|md5sum
9804aef983596bd180816aef52172c28  -

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.

@emilazy
@tjni

@github-actions github-actions bot added 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Dec 2, 2024
@ofborg ofborg bot requested a review from getchoo December 2, 2024 21:48
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels Dec 2, 2024
Copy link
Member

@getchoo getchoo left a comment

Choose a reason for hiding this comment

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

Built against nixos-unstable and everything works as expected. Thanks!

@getchoo getchoo added the 12.approvals: 1 This PR was reviewed and approved by one person. label Dec 2, 2024
@paparodeo
Copy link
Contributor Author

paparodeo commented Dec 3, 2024

eval breakage seems due to #354738
@ofborg eval

@ofborg ofborg bot requested a review from getchoo December 3, 2024 21:20
@wegank wegank added the 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. label Dec 4, 2024
Copy link
Contributor

@tjni tjni left a comment

Choose a reason for hiding this comment

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

Thank you for following up on this!

@getchoo getchoo added 12.approvals: 2 This PR was reviewed and approved by two persons. backport staging-24.11 and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Dec 5, 2024
@getchoo getchoo merged commit b80ae99 into NixOS:staging Dec 5, 2024
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Dec 5, 2024

Backport failed for staging-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin staging-24.11
git worktree add -d .worktree/backport-360999-to-staging-24.11 origin/staging-24.11
cd .worktree/backport-360999-to-staging-24.11
git switch --create backport-360999-to-staging-24.11
git cherry-pick -x b80ae990684936b8c84825e27929cb5b11483dec

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

Labels

10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. 12.approvals: 2 This PR was reviewed and approved by two persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants