diff options
| author | ajs124 <git@ajs124.de> | 2021-03-03 03:08:48 +0100 |
|---|---|---|
| committer | ajs124 <git@ajs124.de> | 2021-03-03 03:38:39 +0100 |
| commit | 5a0ba0fa880e726343bb3ec59b6c148bead7e93c (patch) | |
| tree | 9ae8aee1c8b33b9e3200527f0d31037c31ee3a8c /pkgs/misc/lilypond | |
| parent | 544139a32bd150cdca8ca0bfa35e8fb9c8aada19 (diff) | |
| download | nixpkgs-5a0ba0fa880e726343bb3ec59b6c148bead7e93c.tar nixpkgs-5a0ba0fa880e726343bb3ec59b6c148bead7e93c.tar.gz nixpkgs-5a0ba0fa880e726343bb3ec59b6c148bead7e93c.tar.bz2 nixpkgs-5a0ba0fa880e726343bb3ec59b6c148bead7e93c.tar.lz nixpkgs-5a0ba0fa880e726343bb3ec59b6c148bead7e93c.tar.xz nixpkgs-5a0ba0fa880e726343bb3ec59b6c148bead7e93c.tar.zst nixpkgs-5a0ba0fa880e726343bb3ec59b6c148bead7e93c.zip | |
lilypond: 2.20.0 -> 2.22.0
Diffstat (limited to 'pkgs/misc/lilypond')
| -rw-r--r-- | pkgs/misc/lilypond/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/misc/lilypond/findlib.patch | 24 |
2 files changed, 4 insertions, 37 deletions
diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index f005a59dbfa..d8db893f7d7 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/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 ]; diff --git a/pkgs/misc/lilypond/findlib.patch b/pkgs/misc/lilypond/findlib.patch deleted file mode 100644 index 30e130bc8ad..00000000000 --- a/pkgs/misc/lilypond/findlib.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/stepmake/stepmake/executable-vars.make b/stepmake/stepmake/executable-vars.make -index 3825101..bf37d16 100644 ---- a/stepmake/stepmake/executable-vars.make -+++ b/stepmake/stepmake/executable-vars.make -@@ -1,4 +1,4 @@ --MODULE_LIBES =$(addprefix $(outdir)/../, $(addsuffix /$(outbase)/library.a, $(MODULE_LIBS))) -+MODULE_LIBES =$(addprefix , $(addsuffix /$(outbase)/library.a, $(MODULE_LIBS))) - LOADLIBES = $(MODULE_LIBES) $($(PACKAGE)_LIBES) $(CONFIG_LIBS) - - EXECUTABLE = $(outdir)/$(NAME) - -diff --git a/make/stepmake.make b/make/stepmake.make -index 604341b..7f0d9d8 100644 ---- a/make/stepmake.make -+++ b/make/stepmake.make -@@ -87,7 +87,7 @@ outdir=$(outroot)/$(outbase) - config_h=$(top-build-dir)/config$(CONFIGSUFFIX).hh - - # The outdir that was configured for: best guess to find binaries --outconfbase=out$(CONFIGSUFFIX) -+outconfbase=$(outdir) - outconfdir=$(outroot)/$(outconfbase) - - # user package |