From 5304a065ed1edda0b766d12c3ea80ab7c671902d Mon Sep 17 00:00:00 2001 From: Raffael Mancini Date: Fri, 24 Oct 2014 15:34:52 +0200 Subject: [PATCH 1/6] Added: poppler-qt4 to python-packages.nix --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 809e648e910..c7cd3af43eb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2600,6 +2600,29 @@ let }; }; + poppler-qt4 = buildPythonPackage rec { + name = "poppler-qt4-${version}"; + version = "0.18.1"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/python-poppler-qt4/python-poppler-qt4-${version}.tar.gz"; + md5 = "9c4c5a59b878aed78e96a6ae58c6c185"; + }; + + propagatedBuildInputs = [ pyqt4 sip pkgs.pkgconfig pkgs.popplerQt4 ]; + + preBuild = "${python}/bin/${python.executable} setup.py build_ext --include-dirs=${pkgs.popplerQt4}/include/poppler/"; + + meta = with stdenv.lib; { + description = "A Python binding to Poppler-Qt4"; + longDescription = '' + A Python binding to Poppler-Qt4 that aims for completeness + and for being actively maintained. + ''; + license = licenses.lgpl; + platforms = platforms.all; + }; + }; pudb = buildPythonPackage rec { name = "pudb-2013.3.6"; From 027de5a0d631b7c2dddb6b3c8414c91a1267cd1c Mon Sep 17 00:00:00 2001 From: Raffael Mancini Date: Fri, 24 Oct 2014 15:35:30 +0200 Subject: [PATCH 2/6] New package: frescobaldi --- pkgs/misc/frescobaldi/default.nix | 34 +++++++++++++++++++++++++ pkgs/misc/frescobaldi/python-path.patch | 11 ++++++++ pkgs/misc/frescobaldi/setup.cfg.patch | 13 ++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 60 insertions(+) create mode 100644 pkgs/misc/frescobaldi/default.nix create mode 100644 pkgs/misc/frescobaldi/python-path.patch create mode 100644 pkgs/misc/frescobaldi/setup.cfg.patch diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix new file mode 100644 index 00000000000..55842004364 --- /dev/null +++ b/pkgs/misc/frescobaldi/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, pythonPackages, lilypond, pyqt4 }: + +pythonPackages.buildPythonPackage rec { + name = "frescobaldi-${version}"; + version = "2.0.16"; + + src = fetchurl { + url = "https://github.com/wbsoft/frescobaldi/releases/download/v2.0.16/${name}.tar.gz"; + sha256 = "12pabvq5b2lq84q3kx8lh02zh6ali6v4wnin2k2ycnm45mk9ms6q"; + }; + + propagatedBuildInputs = with pythonPackages; [ lilypond + pyqt4 poppler-qt4 ]; + + patches = [ ./setup.cfg.patch ./python-path.patch ]; + + meta = { + homepage = http://frescobaldi.org/; + description = ''Frescobaldi is a LilyPond sheet music text editor''; + longDescription = '' + Powerful text editor with syntax highlighting and automatic completion, + Music view with advanced Point & Click, Midi player to proof-listen + LilyPond-generated MIDI files, Midi capturing to enter music, + Powerful Score Wizard to quickly setup a music score, Snippet Manager + to store and apply text snippets, templates or scripts, Use multiple + versions of LilyPond, automatically selects the correct version, Built-in + LilyPond documentation browser and built-in User Guide, Smart + layout-control functions like coloring specific objects in the PDF, + MusicXML import, Modern user iterface with configurable colors, + fonts and keyboard shortcuts + ''; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/misc/frescobaldi/python-path.patch b/pkgs/misc/frescobaldi/python-path.patch new file mode 100644 index 00000000000..6c54d9f208e --- /dev/null +++ b/pkgs/misc/frescobaldi/python-path.patch @@ -0,0 +1,11 @@ +diff -u frescobaldi-2.0.16.old/frescobaldi frescobaldi-2.0.16/frescobaldi +--- frescobaldi-2.0.16/frescobaldi 2014-10-24 11:29:28.705687224 +0200 ++++ frescobaldi-2.0.16.new/frescobaldi 2014-10-24 11:31:08.086444793 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python + import sys + import frescobaldi_app.main + import app +Common subdirectories: frescobaldi-2.0.16/frescobaldi_app and frescobaldi-2.0.16.new/frescobaldi_app +Common subdirectories: frescobaldi-2.0.16/macosx and frescobaldi-2.0.16.new/macosx diff --git a/pkgs/misc/frescobaldi/setup.cfg.patch b/pkgs/misc/frescobaldi/setup.cfg.patch new file mode 100644 index 00000000000..502cdd61966 --- /dev/null +++ b/pkgs/misc/frescobaldi/setup.cfg.patch @@ -0,0 +1,13 @@ +Common subdirectories: frescobaldi-2.0.16.old/build and frescobaldi-2.0.16/build +Common subdirectories: frescobaldi-2.0.16.old/frescobaldi_app and frescobaldi-2.0.16/frescobaldi_app +Common subdirectories: frescobaldi-2.0.16.old/macosx and frescobaldi-2.0.16/macosx +diff -u frescobaldi-2.0.16.old/setup.cfg frescobaldi-2.0.16/setup.cfg +--- frescobaldi-2.0.16.old/setup.cfg 2012-02-05 07:08:24.000000000 +0100 ++++ frescobaldi-2.0.16/setup.cfg 2014-10-24 15:08:48.141335620 +0200 +@@ -1,6 +1,2 @@ +-[bdist_wininst] +-bitmap=frescobaldi-wininst.bmp +-install-script=frescobaldi-wininst.py +- + [sdist] + force-manifest=1 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a1f1baedf0..9dc74f7c20c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1177,6 +1177,8 @@ let freetds = callPackage ../development/libraries/freetds { }; + frescobaldi = callPackage ../misc/frescobaldi {}; + ftgl = callPackage ../development/libraries/ftgl { }; ftgl212 = callPackage ../development/libraries/ftgl/2.1.2.nix { }; From b6c7f6c2e4e5390279e23718fbd655604353c7f9 Mon Sep 17 00:00:00 2001 From: Raffael Mancini Date: Fri, 24 Oct 2014 16:13:20 +0200 Subject: [PATCH 3/6] frescobaldi: Improved meta and formatting --- pkgs/misc/frescobaldi/default.nix | 29 ++++++++++++++++------------- pkgs/top-level/python-packages.nix | 13 ++++++++----- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index 55842004364..36b6b770bda 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -5,7 +5,8 @@ pythonPackages.buildPythonPackage rec { version = "2.0.16"; src = fetchurl { - url = "https://github.com/wbsoft/frescobaldi/releases/download/v2.0.16/${name}.tar.gz"; + url = "https://github.com/wbsoft/frescobaldi/releases/download/" + + "v2.0.16/${name}.tar.gz"; sha256 = "12pabvq5b2lq84q3kx8lh02zh6ali6v4wnin2k2ycnm45mk9ms6q"; }; @@ -14,21 +15,23 @@ pythonPackages.buildPythonPackage rec { patches = [ ./setup.cfg.patch ./python-path.patch ]; - meta = { + meta = with stdenv.lib; { homepage = http://frescobaldi.org/; description = ''Frescobaldi is a LilyPond sheet music text editor''; longDescription = '' - Powerful text editor with syntax highlighting and automatic completion, - Music view with advanced Point & Click, Midi player to proof-listen - LilyPond-generated MIDI files, Midi capturing to enter music, - Powerful Score Wizard to quickly setup a music score, Snippet Manager - to store and apply text snippets, templates or scripts, Use multiple - versions of LilyPond, automatically selects the correct version, Built-in - LilyPond documentation browser and built-in User Guide, Smart - layout-control functions like coloring specific objects in the PDF, - MusicXML import, Modern user iterface with configurable colors, - fonts and keyboard shortcuts + Powerful text editor with syntax highlighting and automatic completion, + Music view with advanced Point & Click, Midi player to proof-listen + LilyPond-generated MIDI files, Midi capturing to enter music, + Powerful Score Wizard to quickly setup a music score, Snippet Manager + to store and apply text snippets, templates or scripts, Use multiple + versions of LilyPond, automatically selects the correct version, Built-in + LilyPond documentation browser and built-in User Guide, Smart + layout-control functions like coloring specific objects in the PDF, + MusicXML import, Modern user iterface with configurable colors, + fonts and keyboard shortcuts ''; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2Plus; + maintainers = [ maintainers.sepi ]; + platforms = platforms.all; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c7cd3af43eb..9195982ada9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2604,14 +2604,16 @@ let name = "poppler-qt4-${version}"; version = "0.18.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/python-poppler-qt4/python-poppler-qt4-${version}.tar.gz"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/python-poppler-qt4/" + + "python-poppler-qt4-${version}.tar.gz"; md5 = "9c4c5a59b878aed78e96a6ae58c6c185"; }; - propagatedBuildInputs = [ pyqt4 sip pkgs.pkgconfig pkgs.popplerQt4 ]; + propagatedBuildInputs = [ pkgs.pyqt4 pkgs.sip pkgs.pkgconfig pkgs.popplerQt4 ]; - preBuild = "${python}/bin/${python.executable} setup.py build_ext --include-dirs=${pkgs.popplerQt4}/include/poppler/"; + preBuild = "${python}/bin/${python.executable} setup.py build_ext" + + " --include-dirs=${pkgs.popplerQt4}/include/poppler/"; meta = with stdenv.lib; { description = "A Python binding to Poppler-Qt4"; @@ -2619,7 +2621,8 @@ let A Python binding to Poppler-Qt4 that aims for completeness and for being actively maintained. ''; - license = licenses.lgpl; + license = licenses.lgpl31Plus; + maintainers = [ maintainers.sepi ]; platforms = platforms.all; }; }; From e597ab15b35f95e06dfc10160c76d1a45aecbc2f Mon Sep 17 00:00:00 2001 From: Raffael Mancini Date: Fri, 24 Oct 2014 16:25:50 +0200 Subject: [PATCH 4/6] Fixed typo --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9195982ada9..2ceca39dde7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2621,7 +2621,7 @@ let A Python binding to Poppler-Qt4 that aims for completeness and for being actively maintained. ''; - license = licenses.lgpl31Plus; + license = licenses.lgpl21Plus; maintainers = [ maintainers.sepi ]; platforms = platforms.all; }; From 84bda2b8a1330fc58bb95c2d690ff8d8ad221f37 Mon Sep 17 00:00:00 2001 From: Raffael Mancini Date: Sun, 26 Oct 2014 21:31:09 +0100 Subject: [PATCH 5/6] Disabled package for python 3.4 because it's not ported yet. --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ceca39dde7..d338b21e388 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2603,6 +2603,7 @@ let poppler-qt4 = buildPythonPackage rec { name = "poppler-qt4-${version}"; version = "0.18.1"; + disabled = isPy3k; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/python-poppler-qt4/" + From 90c6a38abebeb954a4e5f3234a7a8f2e0ac69f2e Mon Sep 17 00:00:00 2001 From: Raffael Mancini Date: Tue, 28 Oct 2014 11:01:28 +0100 Subject: [PATCH 6/6] Disabled python-poppler-qt4 for PyPy --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d338b21e388..7b039e6c671 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2603,7 +2603,7 @@ let poppler-qt4 = buildPythonPackage rec { name = "poppler-qt4-${version}"; version = "0.18.1"; - disabled = isPy3k; + disabled = isPy3k || isPyPy; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/python-poppler-qt4/" +