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 release-24.11] lib.extendMkDerivation: init #390950

Merged

Conversation

philiptaron
Copy link
Contributor

BotHuman-based backport to release-24.11, triggered by a label comment in #389635.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

The merge conflicts were a result of nixfmt being applied on lib and the evolution of the Nixpkgs manual's redirects.json functionality. Nothing major.

Things done

Add function extendMkDerivation to lib.customisation.

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Lin Jian <me@linj.tech>
Co-authored-by: Philip Taron <philip.taron@gmail.com>
(cherry picked from commit 2439ead)
Adds "Fixed-point arguments of build helpers" chapter to the "Build helpers" section.

Co-authored-by: nicoo <nicoo@mur.at>
Co-authored-by: Silvan Mosberger <github@infinisil.com>
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Lin Jian <me@linj.tech>
Co-authored-by: Philip Taron <philip.taron@gmail.com>
(cherry picked from commit bbdf860)
@github-actions github-actions bot added 8.has: documentation This PR adds or changes documentation 6.topic: lib The Nixpkgs function library labels Mar 18, 2025
@philiptaron philiptaron mentioned this pull request Mar 18, 2025
12 tasks
@nix-owners nix-owners bot requested a review from infinisil March 18, 2025 12:23
@JohnRTitor
Copy link
Contributor

I certify that this backport is acceptable for NixOS 24.11 release.

As a member of the honorary judiciary, I also direct the commiter in action
(CIA) to also backport commits that enable finalAttrs support in individual builders.

Signed--
Dated with Seal--

@philiptaron
Copy link
Contributor Author

You can see my manual conflict resolution in the cherry-pick failure.

@philiptaron
Copy link
Contributor Author

As a member of the honorary judiciary, I also direct the commiter in action (CIA) to also backport commits that enable finalAttrs support in individual builders.

Your righteous honor, the humble committer in action finds that multiple PRs allow the risk profile to be distributed and understood in ways that a single PR might not be, and so humbly defers to the ones who have the power to edit or merge this PR as to the right course of action.

Copy link
Contributor

@JohnRTitor JohnRTitor left a comment

Choose a reason for hiding this comment

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

Your wisdom and prudence are duly noted. The council of commiters (COC) acknowledges the merit of distributing risk across multiple PRs. With due respect to the esteemed council, I shall now take it upon myself to merge this PR, wielding the power entrusted to me. May the repository remain ever stable and just!

@JohnRTitor JohnRTitor merged commit 9c13a53 into NixOS:release-24.11 Mar 18, 2025
26 of 30 checks passed
@philiptaron philiptaron deleted the backport-extendMkDerivation branch March 18, 2025 13:07
@drupol
Copy link
Contributor

drupol commented Mar 18, 2025

Hark! Ye noble scribes and valiant stewards of the code, verily doth mine heart swell with mirth at the discourse here inscribed. Lo, the council of commiters hath spoken, and the weighty matter of backporting hath been debated with the wisdom of yore.

Prithee, let not thine hands be idle nor thine resolve waver, for in these scrolls of GitHub doth lie the fate of stable builds and righteous derivations! May the merges be swift, the conflicts be few, and the CI ever merciful!

Signed in good faith, A humble observer of these digital annals.

@philiptaron
Copy link
Contributor Author

philiptaron commented Mar 18, 2025

Hear ye, hear ye: let us, august assembly of committers, scribes, ne'er-do-wells, stewards, and johnny-come-latelys, here determine the list of PRs to backport to release 24.11.

Doth any other renown works come to thy mind? Inscribe them in the space above.

@drupol
Copy link
Contributor

drupol commented Mar 18, 2025

Lo! I may find myself in need of aid for yonder scroll: #390220. Who amongst thee shall lend their wisdom, ere I be ensnared in the vexing tangles of code?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: lib The Nixpkgs function library 8.has: documentation This PR adds or changes documentation 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants