diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-04-09 18:28:16 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-04-12 18:46:15 +0000 |
commit | fd2e737e0678ee7d8081baef05b305146a2c0034 (patch) | |
tree | ac3e9b27576a0382335532d126f9a66d486bc638 /nixpkgs/pkgs/misc/lilypond/default.nix | |
parent | cc207d720b6aa836e256c1ee9842bc739e630a8a (diff) | |
parent | 9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2 (diff) | |
download | nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.gz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.bz2 nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.lz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.xz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.zst nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/misc/lilypond/default.nix')
-rw-r--r-- | nixpkgs/pkgs/misc/lilypond/default.nix | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/misc/lilypond/default.nix b/nixpkgs/pkgs/misc/lilypond/default.nix index f005a59dbfab..d8db893f7d70 100644 --- a/nixpkgs/pkgs/misc/lilypond/default.nix +++ b/nixpkgs/pkgs/misc/lilypond/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile -, python2, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex +, python3, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff , makeWrapper, t1utils , texlive, tex ? texlive.combine { @@ -9,22 +9,13 @@ stdenv.mkDerivation rec { pname = "lilypond"; - version = "2.20.0"; + version = "2.22.0"; src = fetchurl { url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "0qd6pd4siss016ffmcyw5qc6pr2wihnvrgd4kh1x725w7wr02nar"; + sha256 = "0khg9dlm1b02mm9w54xqc9ydj416xkikn6p08g1asiyjf4qx1pb4"; }; - patches = [ - ./findlib.patch - (fetchurl { - name = "CVE-2020-17353.patch"; - url = "https://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commitdiff_plain;h=b84ea4740f3279516905c5db05f4074e777c16ff;hp=b97bd35ac99efd68569327f62f3c8a19511ebe43"; - sha256 = "1i79gy3if070rdgj7j6inw532j0f6ya5qc6kgcnlkbx02rqrhr7v"; - }) - ]; - postInstall = '' for f in "$out/bin/"*; do # Override default argv[0] setting so LilyPond can find @@ -51,7 +42,7 @@ stdenv.mkDerivation rec { buildInputs = [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm - python2 gettext perl fontconfig freetype pango + python3 gettext perl fontconfig freetype pango fontforge help2man groff t1utils ]; |