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

Update lilypond* #62937

Merged
merged 6 commits into from Jun 11, 2019
Merged

Update lilypond* #62937

merged 6 commits into from Jun 11, 2019

Conversation

yurrriq
Copy link
Member

@yurrriq yurrriq commented Jun 10, 2019

Motivation for this change
  • Rework both to use fetchgit
  • Use rsync in lilypond build
  • Add me as maintainer of lilypond (and by extension lilypond-unstable)
  • Mark lilypond broken on darwin (segfault on my machine, been failing on hydra awhile)
  • Upgrade lilypond-stable from 2.19.65 to 2.19.83
  • Prefer overrideAttrs to overrideDerivation in lilypond-unstable
  • Use fonts from ghostscript instead of pointing to a nonexistent urw-fonts repo
  • Install fonts to the lilypond datadir
  • Update LilyJAZZ font
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@7c6f434c
Copy link
Member

Hm, nice

@yurrriq
Copy link
Member Author

yurrriq commented Jun 10, 2019

@GrahamcOfBorg build lilypond
@GrahamcOfBorg build lilypond-unstable
@GrahamcOfBorg build lilypond-with-fonts

@7c6f434c
Copy link
Member

Any comments on how it uses rsync?

@yurrriq
Copy link
Member Author

yurrriq commented Jun 10, 2019

I added it blindly because the logs suggested it, but it looks like it's used when building documentation. http://lilypond.org/doc/v2.19/Documentation/contributor/requirements-for-building-documentation

We could make it optional with the default null, if we want.

Edit: I've removed it. Maybe later we should add an argument like enableDocs and include rsync conditionally.

@yurrriq
Copy link
Member Author

yurrriq commented Jun 10, 2019

@GrahamcOfBorg build lilypond

@yurrriq
Copy link
Member Author

yurrriq commented Jun 10, 2019

@GrahamcOfBorg build lilypond-unstable

- fetchurl -> fetchgit
- urwfonts -> ghostscript/share/fonts
- Add me as maintainer
- fetchurl -> fetchgit
- urw-fonts -> ghostscript/share/fonts
- overrideDerivation -> overrideAttrs
- Use symlinkJoin
- Cleanup quoting
- Inherit meta and version from lilypond
- Install to lilypond fonts dir
- Use lilypond-unstable by default
@yurrriq yurrriq changed the title Update lilypond and lilypond-unstable Update lilypond* Jun 10, 2019
@yurrriq
Copy link
Member Author

yurrriq commented Jun 10, 2019

@GrahamcOfBorg build lilypond-with-fonts

@yurrriq yurrriq marked this pull request as ready for review June 11, 2019 04:58
@7c6f434c 7c6f434c merged commit a3e2cb2 into NixOS:master Jun 11, 2019
@yurrriq
Copy link
Member Author

yurrriq commented Jun 11, 2019

🎉 Thanks, @7c6f434c! Let me know if you have any on how to improve the with-fonts expression. I'd love to be able to replace usage like this:

self: super {
  lilypond-with-improviso = super.lilypond-with-fonts.override {
    fonts = with super.openlilylib-fonts; [ improviso ];
  };
}

with this:

self: super {
  lilypond-with-improviso = super.lilypond-with-fonts [ improviso ];
}

...but I don't know how to support it. It seems like haskellPackages and idrisPackages do something similar.

@7c6f434c
Copy link
Member

7c6f434c commented Jun 11, 2019 via email

@yurrriq
Copy link
Member Author

yurrriq commented Jun 11, 2019

Ah, I see. It actually works like this:

self: super {
  my-idris = super.idrisPackages.with-packages (with super.idrisPackages; [ contrib pruviloj ]);
}

So maybe this would be a feasible goal:

self: super {
  lilypond-with-improviso = super.lilypond-with-fonts (with super.openlilylib-fonts; [ improviso ]);
}

@7c6f434c
Copy link
Member

7c6f434c commented Jun 11, 2019 via email


install -m755 -d $fontsdir/otf
install -m755 -d $fontsdir/svg
paths = [ lilypond ];
Copy link
Member Author

Choose a reason for hiding this comment

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

I forgot ++ fonts here...

@veprbl veprbl mentioned this pull request Feb 1, 2020
10 tasks
bdesham added a commit to bdesham/nixpkgs that referenced this pull request Feb 2, 2020
jpgu-epam pushed a commit to jpgu-epam/nixpkgs that referenced this pull request Feb 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants