Merge master into staging-next

2021-03-12 12:25:52 +00:00
parent 121cc02fe8 ce2b28fbc7
commit c2eb9a753a
13 changed files with 129 additions and 67 deletions
@@ -1,21 +0,0 @@
-{ stdenv, fetchgit, lilypond, ghostscript, gyre-fonts }:
-
-let
-
-  version = "2.19.83";
-
-in
-
-lilypond.overrideAttrs (oldAttrs: {
-  inherit version;
-
-  src = fetchgit {
-    url = "https://git.savannah.gnu.org/r/lilypond.git";
-    rev = "release/${version}-1";
-    sha256 = "1ycyx9x76d79jh7wlwyyhdjkyrwnhzqpw006xn2fk35s0jrm2iz0";
-  };
-
-  meta = oldAttrs.meta // {
-    broken = stdenv.isDarwin;
-  };
-})