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

Overriding the componentized build (backport #12503) #12519

Merged
merged 7 commits into from
Feb 19, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 18, 2025

Motivation

Changes

This adds

  • overrideSource, switching to Nixpkgs-style packaging with a fetched source
  • appendPatches, which applies patches to all components
  • overrideAllMesonComponents to do arbitrary stuff to the meson-based builds (can be used to target individual derivations as well, with a conditional on prevAttrs.name)

Context


Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.


This is an automatic backport of pull request #12503 done by [Mergify](https://mergify.com).

@mergify mergify bot added the automatic backport This PR is a backport produced by automation (does not trigger backporting) label Feb 18, 2025
@mergify mergify bot requested a review from edolstra as a code owner February 18, 2025 23:45
Copy link
Contributor Author

mergify bot commented Feb 18, 2025

Cherry-pick of cca0140 has failed:

On branch mergify/bp/2.26-maintenance/pr-12503
Your branch is up to date with 'origin/2.26-maintenance'.

You are currently cherry-picking commit cca01407a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   flake.nix
	modified:   packaging/components.nix

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   packaging/dependencies.nix

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

roberth and others added 7 commits February 19, 2025 01:32
This makes it easier to implement batch overriding for the components.

(cherry picked from commit cca0140)
(cherry picked from commit 0dbe28a)
This makes `nix.version` quicker to evaluate, which should speed up
package listing operations.

If you want an accurate count, use `lib.optionals` in your override
instead of `null` values.

(cherry picked from commit d47e3c9)
... from nixpkgs, my bad.

(cherry picked from commit f0bdb65)
@roberth roberth force-pushed the mergify/bp/2.26-maintenance/pr-12503 branch from 80749db to 2447352 Compare February 19, 2025 00:33
@mergify mergify bot merged commit dae4dac into 2.26-maintenance Feb 19, 2025
23 checks passed
@mergify mergify bot deleted the mergify/bp/2.26-maintenance/pr-12503 branch February 19, 2025 00:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant