From 79478b8369469ecdb0649d799e5acd994d584a1b Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Mon, 10 Jun 2019 03:08:09 -0500
Subject: lilypond: rework

- fetchurl -> fetchgit
- urwfonts -> ghostscript/share/fonts
- Add me as maintainer
---
 pkgs/misc/lilypond/default.nix | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix
index fb17e5e5a2d7..e9f8d6984af9 100644
--- a/pkgs/misc/lilypond/default.nix
+++ b/pkgs/misc/lilypond/default.nix
@@ -1,26 +1,26 @@
-{ stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile
+{ stdenv, fetchgit, ghostscript, texinfo, imagemagick, texi2html, guile
 , python2, gettext, flex, perl, bison, pkgconfig, autoreconfHook, dblatex
 , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff
-, fetchsvn, makeWrapper, t1utils
+, makeWrapper, t1utils
 , texlive, tex ? texlive.combine {
     inherit (texlive) scheme-small lh metafont epsf;
   }
 }:
 
-stdenv.mkDerivation rec{
-  majorVersion="2.18";
-  minorVersion="2";
-  version="${majorVersion}.${minorVersion}";
-  name = "lilypond-${version}";
+let
 
-  urwfonts = fetchsvn {
-    url = "http://svn.ghostscript.com/ghostscript/tags/urw-fonts-1.0.7pre44";
-    sha256 = "0al5vdsb66db6yzwi0qgs1dnd1i1fb77cigdjxg8zxhhwf6hhwpn";
-  };
+  version = "2.18.2";
+
+in
+
+stdenv.mkDerivation {
+  pname = "lilypond";
+  inherit version;
 
-  src = fetchurl {
-    url = "http://download.linuxaudio.org/lilypond/sources/v${majorVersion}/lilypond-${version}.tar.gz";
-    sha256 = "01xs9x2wjj7w9appaaqdhk15r1xvvdbz9qwahzhppfmhclvp779j";
+  src = fetchgit {
+    url = "https://git.savannah.gnu.org/r/lilypond.git";
+    rev = "release/${version}-1";
+    sha256 = "0fk045fmmb6fcv7jdvkbqr04qlwnxzwclr2gzx3gja714xy6a76x";
   };
 
   postInstall = ''
@@ -33,7 +33,10 @@ stdenv.mkDerivation rec{
     done
   '';
 
-  configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${urwfonts}"];
+  configureFlags = [
+    "--disable-documentation"
+    "--with-ncsb-dir=${ghostscript}/share/ghostscript/fonts"
+  ];
 
   preConfigure = ''
     sed -e "s@mem=mf2pt1@mem=$PWD/mf/mf2pt1@" -i scripts/build/mf2pt1.pl
@@ -56,7 +59,7 @@ stdenv.mkDerivation rec{
     description = "Music typesetting system";
     homepage = http://lilypond.org/;
     license = licenses.gpl3;
-    maintainers = [ maintainers.marcweber ];
+    maintainers = with maintainers; [ marcweber yurrriq ];
     platforms = platforms.all;
   };
 
-- 
cgit 1.4.1


From 287ab732d941115a86e1fd08db7faf1dda21d0fe Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Mon, 10 Jun 2019 03:09:41 -0500
Subject: lilypond: mark broken on darwin

---
 pkgs/misc/lilypond/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkgs')

diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix
index e9f8d6984af9..7738c9b1c091 100644
--- a/pkgs/misc/lilypond/default.nix
+++ b/pkgs/misc/lilypond/default.nix
@@ -61,6 +61,7 @@ stdenv.mkDerivation {
     license = licenses.gpl3;
     maintainers = with maintainers; [ marcweber yurrriq ];
     platforms = platforms.all;
+    broken = stdenv.isDarwin;
   };
 
   patches = [ ./findlib.patch ];
-- 
cgit 1.4.1


From 54e8c673757e22ee77103d7ea96791a1eb6d79b8 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Mon, 10 Jun 2019 03:11:20 -0500
Subject: lilypond-unstable: rework, 2.19.65 -> 2.19.83

- fetchurl -> fetchgit
- urw-fonts -> ghostscript/share/fonts
- overrideDerivation -> overrideAttrs
---
 pkgs/misc/lilypond/unstable.nix | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix
index df83502aa88a..ce72c1fdfee8 100644
--- a/pkgs/misc/lilypond/unstable.nix
+++ b/pkgs/misc/lilypond/unstable.nix
@@ -1,26 +1,23 @@
-{ stdenv, fetchurl, fetchgit, rsync, lilypond, gyre-fonts }:
+{ stdenv, fetchgit, lilypond, ghostscript, gyre-fonts }:
 
-with stdenv.lib;
+let
 
-let urw-fonts = fetchgit {
-  url = "http://git.ghostscript.com/urw-core35-fonts.git";
-  rev = "1f28a6fcd2176256a995db907d9ffe6e1b9b83e9";
-  sha256 = "1nlx95l1pw5lxqp2v0rn9a7lqrsbbhzr0dy3cybk55r4a8awbr2a";
-}; in
+  version = "2.19.83";
 
-overrideDerivation lilypond (p: rec {
-  majorVersion = "2.19";
-  minorVersion = "65";
-  version="${majorVersion}.${minorVersion}";
-  name = "lilypond-${version}";
+in
 
-  src = fetchurl {
-    url = "http://download.linuxaudio.org/lilypond/sources/v${majorVersion}/lilypond-${version}.tar.gz";
-    sha256 = "0k2jy7z58j62c5cv1308ac62d6jri17wip76xrbq8s6jq6jl7phd";
-  };
-
-  configureFlags = [ "--disable-documentation" "--with-urwotf-dir=${urw-fonts}" "--with-texgyre-dir=${gyre-fonts}/share/fonts/truetype/"];
+lilypond.overrideAttrs (oldAttrs: {
+  inherit version;
 
-  buildInputs = p.buildInputs ++ [ rsync ];
+  src = fetchgit {
+    url = "https://git.savannah.gnu.org/r/lilypond.git";
+    rev = "release/${version}-1";
+    sha256 = "1ycyx9x76d79jh7wlwyyhdjkyrwnhzqpw006xn2fk35s0jrm2iz0";
+  };
 
+  configureFlags = [
+    "--disable-documentation"
+    "--with-urwotf-dir=${ghostscript}/share/ghostscript/fonts"
+    "--with-texgyre-dir=${gyre-fonts}/share/fonts/truetype/"
+  ];
 })
-- 
cgit 1.4.1


From 859db732601d0e67b4984795de5db108c9d2e10d Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Mon, 10 Jun 2019 04:48:52 -0500
Subject: lilypond-with-fonts: rework

- Use symlinkJoin
- Cleanup quoting
- Inherit meta and version from lilypond
---
 pkgs/misc/lilypond/with-fonts.nix | 42 ++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix
index 5bc74cb65ddf..c8657298e44d 100644
--- a/pkgs/misc/lilypond/with-fonts.nix
+++ b/pkgs/misc/lilypond/with-fonts.nix
@@ -1,35 +1,31 @@
-{ stdenv
-, lndir
-, lilypond
-, openlilylib-fonts
+{ stdenv, lndir, symlinkJoin, makeWrapper
+, lilypond, openlilylib-fonts
 , fonts ? openlilylib-fonts.all
 }:
 
-stdenv.lib.appendToName "with-fonts" (stdenv.mkDerivation {
-  inherit (lilypond) name;
-  phases = "installPhase";
-  buildInputs = fonts;
-  nativeBuildInputs = [ lndir ];
-  installPhase = ''
-    local fontsdir=$out/share/lilypond/${lilypond.version}/fonts
+stdenv.lib.appendToName "with-fonts" (symlinkJoin {
+  inherit (lilypond) name version;
 
-    install -m755 -d $fontsdir/otf
-    install -m755 -d $fontsdir/svg
+  paths = [ lilypond ];
 
-    ${stdenv.lib.concatMapStrings (font: ''
-        lndir -silent ${font}/otf $fontsdir/otf
-        lndir -silent ${font}/svg $fontsdir/svg
-      '') fonts}
+  buildInputs = [ makeWrapper lndir ];
+
+  postBuild = ''
+    local datadir="$out/share/lilypond/${lilypond.version}"
+    local fontsdir="$datadir/fonts"
 
-      install -m755 -d $out/lib
-      lndir -silent ${lilypond}/lib $out/lib
-      install -m755 -d $out/share
-      lndir -silent ${lilypond}/share $out/share
+    install -m755 -d "$fontsdir/otf"
+    install -m755 -d "$fontsdir/svg"
 
-      install -m755 -Dt $out/bin ${lilypond}/bin/*
+    ${stdenv.lib.concatMapStrings (font: ''
+          lndir -silent "${font}/otf" "$fontsdir/otf"
+          lndir -silent "${font}/svg" "$fontsdir/svg"
+      '') fonts}
 
       for p in $out/bin/*; do
-        substituteInPlace $p --replace "exec -a \"${lilypond}" "exec -a \"$out"
+          wrapProgram "$p" --set LILYPOND_DATADIR "$datadir"
       done
   '';
+
+  inherit (lilypond) meta;
 })
-- 
cgit 1.4.1


From d013602d78b9f7a42c25022f22e2100f6a27eebf Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Mon, 10 Jun 2019 04:49:35 -0500
Subject: openlilylib-fonts: update lilyjazz

---
 pkgs/misc/lilypond/fonts.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/misc/lilypond/fonts.nix
index bb3487cd0a88..d416d73d4eec 100644
--- a/pkgs/misc/lilypond/fonts.nix
+++ b/pkgs/misc/lilypond/fonts.nix
@@ -86,8 +86,8 @@ rec {
   };
   lilyjazz = olpFont {
     fontName = "lilyjazz";
-    rev = "8f1f2dd";
-    sha256 = "0k44dl5hfcn7wn2b6c51mbw6hsb1sprmx95xiabvcbpxnkplbmac";
+    rev = "8fa7d554";
+    sha256 = "1z7px7k2sn7snnj7yfjv0p9axwbn452vn9ww9icmb1249b0d1qry";
   };
   lv-goldenage = olpFont {
     fontName = "lv-goldenage";
-- 
cgit 1.4.1


From 900be274039176ac60daa100156014440375b9e9 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Mon, 10 Jun 2019 12:21:05 -0500
Subject: openlilylib-fonts: rework

- Install to lilypond fonts dir
- Use lilypond-unstable by default
---
 pkgs/misc/lilypond/fonts.nix      | 40 +++++++++++++++++++--------------------
 pkgs/misc/lilypond/with-fonts.nix | 21 ++++----------------
 pkgs/top-level/all-packages.nix   |  6 +++++-
 3 files changed, 28 insertions(+), 39 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/misc/lilypond/fonts.nix
index d416d73d4eec..00335eddce86 100644
--- a/pkgs/misc/lilypond/fonts.nix
+++ b/pkgs/misc/lilypond/fonts.nix
@@ -1,45 +1,43 @@
 { stdenv, fetchFromGitHub, lilypond }:
 
-with stdenv.lib;
-
 let
-  olpFont = a@{
-    fontName,
-    rev,
-    sha256,
-    version ? rev,
-    ...
-  }:
-    stdenv.mkDerivation (a // rec {
+
+  olpFont = { fontName, rev, sha256, version ? rev, ... }:
+    stdenv.mkDerivation {
       inherit version;
-      name = "openlilypond-font-${fontName}-${version}";
+      pname = "openlilypond-font-${fontName}";
+
 
       src = fetchFromGitHub {
         inherit rev sha256;
         owner = "OpenLilyPondFonts";
-        repo = a.fontName;
+        repo = fontName;
       };
 
       phases = [ "unpackPhase" "installPhase" ];
 
       installPhase = ''
-        for f in {otf,supplementary-fonts}/**.{o,t}tf; do
-          install -Dt $out/otf -m755 $f
+        local fontsdir="$out/share/lilypond/${lilypond.version}/fonts"
+
+        install -m755 -d "$fontsdir/otf"
+        for font in {otf,supplementary-fonts}/**.{o,t}tf; do
+          install -Dt "$fontsdir/otf" -m755 "$font"
         done
 
-        for f in svg/**.{svg,woff}; do
-          install -Dt $out/svg -m755 $f
+        install -m755 -d "$fontsdir/svg"
+        for font in svg/**.{svg,woff}; do
+          install -Dt "$fontsdir/svg" -m755 "$font"
         done
       '';
 
-      meta = {
+      meta = with stdenv.lib; {
         inherit (src.meta) homepage;
+        inherit (lilypond.meta) platforms;
         description = "${fontName} font for LilyPond";
-        license = a.license or licenses.ofl;
-        platforms = lilypond.meta.platforms;
-        maintainers = (a.meta.maintainers or []) ++ [ maintainers.yurrriq ];
+        license = licenses.ofl;
+        maintainers = with maintainers; [ yurrriq ];
       };
-    });
+    };
 
 in
 
diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix
index c8657298e44d..829d2d4e02e4 100644
--- a/pkgs/misc/lilypond/with-fonts.nix
+++ b/pkgs/misc/lilypond/with-fonts.nix
@@ -4,28 +4,15 @@
 }:
 
 stdenv.lib.appendToName "with-fonts" (symlinkJoin {
-  inherit (lilypond) name version;
+  inherit (lilypond) meta name version ;
 
   paths = [ lilypond ];
 
   buildInputs = [ makeWrapper lndir ];
 
   postBuild = ''
-    local datadir="$out/share/lilypond/${lilypond.version}"
-    local fontsdir="$datadir/fonts"
-
-    install -m755 -d "$fontsdir/otf"
-    install -m755 -d "$fontsdir/svg"
-
-    ${stdenv.lib.concatMapStrings (font: ''
-          lndir -silent "${font}/otf" "$fontsdir/otf"
-          lndir -silent "${font}/svg" "$fontsdir/svg"
-      '') fonts}
-
-      for p in $out/bin/*; do
-          wrapProgram "$p" --set LILYPOND_DATADIR "$datadir"
-      done
+    for p in $out/bin/*; do
+        wrapProgram "$p" --set LILYPOND_DATADIR "$datadir"
+    done
   '';
-
-  inherit (lilypond) meta;
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6963debd91e8..c54052dd3edf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23320,12 +23320,16 @@ in
   lguf-brightness = callPackage ../misc/lguf-brightness { };
 
   lilypond = callPackage ../misc/lilypond { guile = guile_1_8; };
+
   lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { };
+
   lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix {
     lilypond = lilypond-unstable;
   };
 
-  openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { };
+  openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix {
+    lilypond = lilypond-unstable;
+  };
 
   loop = callPackage ../tools/misc/loop { };
 
-- 
cgit 1.4.1