From f167ba637dfeac6f5acfae01fad357fcdd218630 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Fri, 13 Mar 2020 11:54:07 -0400 Subject: [PATCH] lilypond: fix broken meta.homepage The `src.meta` attribute does not exist, and even if it did the derivation does not have a `rec` to reference it. This appears to be breaking all ofBorg meta evaluation checks: ``` while evaluating the attribute 'homepage' at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/eval-0-gleber.ewr1.nix.ci/pkgs/misc/lilypond/fonts.nix:34:27: undefined variable 'src' at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/eval-0-gleber.ewr1.nix.ci/pkgs/misc/lilypond/fonts.nix:34:18 ``` https://gist.github.com/GrahamcOfBorg/cd87009bfee1a9c0d4f0d828b82ee09a --- pkgs/misc/lilypond/default.nix | 2 +- pkgs/misc/lilypond/fonts.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index e9f8d6984af9..a740323b47f3 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Music typesetting system"; - homepage = http://lilypond.org/; + homepage = "http://lilypond.org/"; license = licenses.gpl3; maintainers = with maintainers; [ marcweber yurrriq ]; platforms = platforms.all; diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/misc/lilypond/fonts.nix index 00335eddce86..deeedf679954 100644 --- a/pkgs/misc/lilypond/fonts.nix +++ b/pkgs/misc/lilypond/fonts.nix @@ -7,7 +7,6 @@ let inherit version; pname = "openlilypond-font-${fontName}"; - src = fetchFromGitHub { inherit rev sha256; owner = "OpenLilyPondFonts"; @@ -31,8 +30,7 @@ let ''; meta = with stdenv.lib; { - inherit (src.meta) homepage; - inherit (lilypond.meta) platforms; + inherit (lilypond.meta) homepage platforms; description = "${fontName} font for LilyPond"; license = licenses.ofl; maintainers = with maintainers; [ yurrriq ];