Skip to content

Comments

lilypond: modernise, enable docs#393173

Merged
FliegendeWurst merged 6 commits intoNixOS:masterfrom
eclairevoyant:lily-doc
May 6, 2025
Merged

lilypond: modernise, enable docs#393173
FliegendeWurst merged 6 commits intoNixOS:masterfrom
eclairevoyant:lily-doc

Conversation

@eclairevoyant
Copy link
Contributor

@eclairevoyant eclairevoyant commented Mar 25, 2025

Things done

  • lilypond: modernise
  • lilypond: fix metadata
  • lilypond: enable strictDeps
  • lilypond-unstable: 2.25.24 -> 2.25.25; lilypond: switch to fetchzip

fixes #392943

  • 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: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Mar 25, 2025
@yurrriq
Copy link
Member

yurrriq commented Apr 22, 2025

Looking good so far, thanks! If you @ me when it's ready, I'll do my best to test on my NixOS machine in a timely manner.

@yurrriq yurrriq mentioned this pull request Apr 22, 2025
2 tasks
@eclairevoyant
Copy link
Contributor Author

Will do, currently it doesn't build, I have to make some time to understand why.

@FliegendeWurst
Copy link
Member

Probably you moved too much to nativeBuildInputs, boehmgc for example would be a runtime dependency I think.

@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. and removed 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. labels Apr 23, 2025
@eclairevoyant
Copy link
Contributor Author

eclairevoyant commented Apr 23, 2025

boehmgc for example would be a runtime dependency I think.

True, but unrelated to the error, I believe. When I remove --disable-documentation, some script is running a binary that doesn't exist.

Please check the logfile

  /build/source/Documentation/out-/nix/store/d0hciavqzqrhhyjwzjr34f5cn47zwdh0-lilypond-2.24.4/en/generate-documentation.log

for errors. Last 20 lines:

Making Documentation/out-/nix/store/d0hciavqzqrhhyjwzjr34f5cn47zwdh0-lilypond-2.24.4/snippets/keyboards.itely 
Command: /build/source/out/bin/lilypond    --verbose    /build/source/ly/generate-documentation.ly

Copy link
Contributor

@marcin-serwin marcin-serwin left a comment

Choose a reason for hiding this comment

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

The script generating documentation fails because the Makefile uses out variable for a purpose different than the nix builder. You can fix it by explicitly resetting it to empty for make:

  makeFlags = [ "out=" ];

Copy link
Contributor

Choose a reason for hiding this comment

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

The package comes with the configure scripts generated, this and autoreconfHook can be removed

Copy link
Member

@FliegendeWurst FliegendeWurst May 1, 2025

Choose a reason for hiding this comment

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

autoreconfHook is often useful if the configure scripts gets too outdated. Not sure if it is needed in this case however.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll leave this as-is for now.

@eclairevoyant eclairevoyant force-pushed the lily-doc branch 2 times, most recently from 6475223 to 3a3998f Compare May 4, 2025 16:44
@eclairevoyant eclairevoyant marked this pull request as ready for review May 4, 2025 16:50
@github-actions github-actions bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. and removed 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. labels May 4, 2025
@nix-owners nix-owners bot requested review from MarcWeber and yurrriq May 4, 2025 16:58
@yurrriq
Copy link
Member

yurrriq commented May 5, 2025

Thanks, @FliegendeWurst, @eclairevoyant, and reviewers. This is looking good to me. Would you agree, @FliegendeWurst, that this PR can now supersede #370259? I'm sorry we were so slow on that one. Thanks for your contributions and patience.

It seems we're good to merge this one now? Any lingering concerns?

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label May 5, 2025
@FliegendeWurst
Copy link
Member

The Darwin build seems to be broken due to texi2html. (Undefined subroutine &Locale::Messages::dgettext called at /nix/store/7gybx31jp45fvn9xpp5s2w0m17kkc1hf-texi2html-5.0/bin/texi2html line 29628.) #224761

So it would be good to add configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-documentation" ];

@FliegendeWurst
Copy link
Member

Nevermind, the texi2html issue is indeed fixed by the "workaround" shared in that issue (it is not a workaround).

So this is good to go. I'll take care of texi2html

@FliegendeWurst FliegendeWurst merged commit 3c202d0 into NixOS:master May 6, 2025
40 checks passed
@eclairevoyant eclairevoyant deleted the lily-doc branch July 5, 2025 16:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

LilyPond: Why is its documentation omitted?

5 participants