frescobaldi: 3.0.0 -> 3.1 (#76889)

This commit is contained in:
puzzlewolf 2020-01-03 18:24:59 +01:00 committed by Dmitry Kalinkin
parent 7c85d7db72
commit c5e72fa686
2 changed files with 14 additions and 6 deletions

View file

@ -1,24 +1,32 @@
{ lib, fetchFromGitHub, python3Packages, lilypond }:
{ lib, buildPythonApplication, fetchFromGitHub, python3Packages, pyqtwebengine, lilypond }:
python3Packages.buildPythonApplication rec {
buildPythonApplication rec {
name = "frescobaldi-${version}";
version = "3.0.0";
version = "3.1";
src = fetchFromGitHub {
owner = "wbsoft";
repo = "frescobaldi";
rev = "v${version}";
sha256 = "1yn18pwsjxpxz5j3yfysmaif8k0vqahj5c7ays9cxsylpg9hl7jd";
sha256 = "0sv6dc1l34rrhfbn1wqkl9zs9hiacmmbviw87d0d03987s1iirb1";
};
propagatedBuildInputs = with python3Packages; [
lilypond pygame python-ly sip
pyqt5_with_qtwebkit (poppler-qt5.override { pyqt5 = pyqt5_with_qtwebkit; })
pyqt5 poppler-qt5
pyqtwebengine
];
nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
# no tests in shipped with upstream
doCheck = false;
dontWrapQtApps = true;
makeWrapperArgs = [
"\${qtWrapperArgs[@]}"
];
meta = with lib; {
homepage = http://frescobaldi.org/;
description = ''Frescobaldi is a LilyPond sheet music text editor'';

View file

@ -3360,7 +3360,7 @@ in
freetds = callPackage ../development/libraries/freetds { };
frescobaldi = callPackage ../misc/frescobaldi {};
frescobaldi = python3Packages.callPackage ../misc/frescobaldi {};
frostwire = callPackage ../applications/networking/p2p/frostwire { };
frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { };