nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 00:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #276174 from wegank/lilypond-guile-3

Browse Source 
lilypond, denemo: migrate to guile 3
This commit is contained in:
Weijia Wang 2024-01-07 01:51:52 +01:00 committed by GitHub
commit 98fc48b22d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2405.section.md
View File

@ -115,6 +115,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `libass` now uses the native CoreText backend on Darwin, which may fix subtitle rendering issues with `mpv`, `ffmpeg`, etc.
- [Lilypond](https://lilypond.org/index.html) and [Denemo](https://www.denemo.org) are now compiled with Guile 3.0.
- The following options of the Nextcloud module were moved into [`services.nextcloud.extraOptions`](#opt-services.nextcloud.extraOptions) and renamed to match the name from Nextcloud's `config.php`:
- `logLevel` -> [`loglevel`](#opt-services.nextcloud.extraOptions.loglevel),
- `logType` -> [`log_type`](#opt-services.nextcloud.extraOptions.log_type),

22
pkgs/applications/audio/denemo/default.nix
View File

@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl, pkg-config
, libjack2, gettext, intltool, guile_2_2, lilypond
{ lib, stdenv, fetchurl, fetchpatch, pkg-config
, libjack2, gettext, intltool, guile, lilypond
, glib, libxml2, librsvg, libsndfile, aubio
, gtk3, gtksourceview, evince, fluidsynth, rubberband
, autoreconfHook, gtk-doc
, portaudio, portmidi, fftw, wrapGAppsHook }:
stdenv.mkDerivation rec {
@ -13,8 +14,21 @@ stdenv.mkDerivation rec {
sha256 = "sha256-S+WXDGmEf5fx+HYnXJdE5QNOfJg7EqEEX7IMI2SUtV0=";
};
patches = [
(fetchpatch {
name = "allow-guile-3.patch";
url = "https://git.savannah.gnu.org/cgit/denemo.git/patch/?id=9de1c65e56a021925af532bb55336b0ce86d3084";
postFetch = ''
substituteInPlace $out \
--replace "2.6.8" "2.6.0" \
--replace "2.6.9" "2.6.0"
'';
hash = "sha256-Jj33k/KgvZgKG43MuLgjb4A2KNkm/z9ytzGKcXMAOI4=";
})
];
buildInputs = [
libjack2 guile_2_2 lilypond glib libxml2 librsvg libsndfile
libjack2 guile lilypond glib libxml2 librsvg libsndfile
aubio gtk3 gtksourceview evince fluidsynth rubberband portaudio fftw portmidi
];
@ -25,6 +39,8 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [
autoreconfHook
gtk-doc
wrapGAppsHook
intltool
gettext

4
pkgs/misc/lilypond/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile_2_2
{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile
, python3, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex
, fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff
, freefont_ttf, makeFontsConf
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook bison flex makeWrapper pkg-config ];
buildInputs =
[ ghostscript texinfo imagemagick texi2html guile_2_2 dblatex tex zip netpbm
[ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm
python3 gettext perl fontconfig freetype pango
fontforge help2man groff t1utils boehmgc rsync
];