summaryrefslogtreecommitdiffstats
path: root/pkgs/misc/frescobaldi/default.nix
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2018-03-31 17:03:17 +0200
committerMaximilian Bosch <maximilian@mbosch.me>2018-03-31 17:03:17 +0200
commit545495b132882053e399b1b96628132240ddc7a3 (patch)
tree1bffeb6efb0dfa15d9b54f3fb687912caee6d499 /pkgs/misc/frescobaldi/default.nix
parent8446cd9c3202f7016d14af25ea4a3a6e58ce32b4 (diff)
frescobaldi: 2.0.16 -> 3.0.0; fix build
3.0.0 works with Python 3 and QT5 (proivded by pyqt5). These fixes are another step towards #32883 by getting rid of the unused poppler-qt4. See https://hydra.nixos.org/build/71816154/log See ticket #36453
Diffstat (limited to 'pkgs/misc/frescobaldi/default.nix')
-rw-r--r--pkgs/misc/frescobaldi/default.nix25
1 files changed, 13 insertions, 12 deletions
diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix
index 84272992f2bb..af4c54d9d0d8 100644
--- a/pkgs/misc/frescobaldi/default.nix
+++ b/pkgs/misc/frescobaldi/default.nix
@@ -1,21 +1,22 @@
-{ stdenv, fetchurl, pythonPackages, lilypond}:
+{ lib, fetchFromGitHub, python3Packages, lilypond }:
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
name = "frescobaldi-${version}";
- version = "2.0.16";
+ version = "3.0.0";
- src = fetchurl {
- url = "https://github.com/wbsoft/frescobaldi/releases/download/"
- + "v2.0.16/${name}.tar.gz";
- sha256 = "12pabvq5b2lq84q3kx8lh02zh6ali6v4wnin2k2ycnm45mk9ms6q";
+ src = fetchFromGitHub {
+ owner = "wbsoft";
+ repo = "frescobaldi";
+ rev = "v${version}";
+ sha256 = "1yn18pwsjxpxz5j3yfysmaif8k0vqahj5c7ays9cxsylpg9hl7jd";
};
- propagatedBuildInputs = with pythonPackages; [ lilypond
- pyqt4 poppler-qt4 pygame ];
+ propagatedBuildInputs = with python3Packages; [ lilypond pygame python-ly poppler-qt5 ];
- patches = [ ./setup.cfg.patch ./python-path.patch ];
+ # no tests in shipped with upstream
+ doCheck = false;
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://frescobaldi.org/;
description = ''Frescobaldi is a LilyPond sheet music text editor'';
longDescription = ''
@@ -31,7 +32,7 @@ pythonPackages.buildPythonApplication rec {
fonts and keyboard shortcuts
'';
license = licenses.gpl2Plus;
- maintainers = [ maintainers.sepi ];
+ maintainers = with maintainers; [ sepi ma27 ];
platforms = platforms.all;
};
}