diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-03-12 10:36:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-12 10:36:20 +0100 |
| commit | 05c4e04b93e64ddd6cdac54d86a8d1c18cc1787f (patch) | |
| tree | dc32d7e6078d4c685617b53f380562abd308fdaf | |
| parent | 7f339fcd6ec29fbea44f52888720b731658f0602 (diff) | |
| parent | 389c7cf0a82de3a6de9d1832a4d99fa66d16d91d (diff) | |
Merge pull request #115998 from SuperSandro2000/lilypond
lilypond-unstable: drop because lilypond is newer and it does not build
| -rw-r--r-- | pkgs/misc/lilypond/unstable.nix | 21 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 1 insertions, 23 deletions
diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix deleted file mode 100644 index 68f48a2db64f7..0000000000000 --- a/pkgs/misc/lilypond/unstable.nix +++ /dev/null @@ -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; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6036e42168365..c654b1437f1da 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -357,6 +357,7 @@ mapAliases ({ libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10 libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22 libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09 + lilypond-unstable = lilypond; # added 2021-03-11 links = links2; # added 2016-01-31 linux_rpi0 = linux_rpi1; linuxPackages_rpi0 = linuxPackages_rpi1; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6f8762abcb99..1a6d2052d3479 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29141,8 +29141,6 @@ in lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; - lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { }; - lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { }; openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { }; |