From 35954ae8bab6f50999766747d8239febb33cef72 Mon Sep 17 00:00:00 2001 From: zraexy Date: Fri, 8 Sep 2017 23:31:47 -0800 Subject: [PATCH 1/5] kproperty: init at 3.0.2 --- .../libraries/kproperty/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/kproperty/default.nix diff --git a/pkgs/development/libraries/kproperty/default.nix b/pkgs/development/libraries/kproperty/default.nix new file mode 100644 index 00000000000..52b5d944b41 --- /dev/null +++ b/pkgs/development/libraries/kproperty/default.nix @@ -0,0 +1,29 @@ +{ + mkDerivation, lib, fetchurl, + extra-cmake-modules, + qtbase, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons +}: + +mkDerivation rec { + pname = "kproperty"; + version = "3.0.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + sha256 = "1hzkvdap7dzpnxlp4rfg5f24fhqjpqm2hlvv88gj4c0scbp73ynm"; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + + buildInputs = [ kconfig kcoreaddons kwidgetsaddons kguiaddons ]; + + propagatedBuildInputs = [ qtbase ]; + + meta = with lib; { + description = "A property editing framework with editor widget similar to what is known from Qt Designer"; + license = licenses.lgpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ zraexy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d30e7f1fab..b0ef68de685 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10125,6 +10125,8 @@ with pkgs; kdiagram = callPackage ../development/libraries/kdiagram { }; + kproperty = callPackage ../development/libraries/kproperty { }; + kirigami = kirigami_1; libcommuni = callPackage ../development/libraries/libcommuni { }; From b3bbfd9fc49822c706b96d259920587b4e33d0d9 Mon Sep 17 00:00:00 2001 From: zraexy Date: Fri, 8 Sep 2017 23:33:41 -0800 Subject: [PATCH 2/5] kreport: init at 3.0.2 --- .../development/libraries/kreport/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/kreport/default.nix diff --git a/pkgs/development/libraries/kreport/default.nix b/pkgs/development/libraries/kreport/default.nix new file mode 100644 index 00000000000..561e964c961 --- /dev/null +++ b/pkgs/development/libraries/kreport/default.nix @@ -0,0 +1,27 @@ +{ + mkDerivation, lib, fetchurl, + extra-cmake-modules, + qtbase, qtdeclarative, qtwebkit, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons, kproperty, marble, python2 +}: + +mkDerivation rec { + pname = "kreport"; + version = "3.0.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + sha256 = "1zd3vhf26cyp8xrq11awm9pmhnk88ppyc0riyr0gxj8y703ahkp0"; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + + buildInputs = [ qtdeclarative qtwebkit kconfig kcoreaddons kwidgetsaddons kguiaddons kproperty marble python2 ]; + + meta = with lib; { + description = "A framework for creation and generation of reports in multiple formats"; + license = licenses.lgpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ zraexy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0ef68de685..67fc08c9d4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10127,6 +10127,8 @@ with pkgs; kproperty = callPackage ../development/libraries/kproperty { }; + kreport = callPackage ../development/libraries/kreport { }; + kirigami = kirigami_1; libcommuni = callPackage ../development/libraries/libcommuni { }; From 635c48de8f414ffa6a465f2cb5db29a87e4aabc9 Mon Sep 17 00:00:00 2001 From: zraexy Date: Fri, 8 Sep 2017 23:38:19 -0800 Subject: [PATCH 3/5] kdb: init at 3.0.2 --- pkgs/development/libraries/kdb/default.nix | 29 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/kdb/default.nix diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix new file mode 100644 index 00000000000..399d5914c2d --- /dev/null +++ b/pkgs/development/libraries/kdb/default.nix @@ -0,0 +1,29 @@ +{ + mkDerivation, lib, fetchurl, + extra-cmake-modules, + qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, libmysql +}: + +mkDerivation rec { + pname = "kdb"; + version = "3.0.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + sha256 = "1n11xhqk3sf4a5nzvnrnj7bj21yqqqkm2d1xzfx3q82fkyah8s49"; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + + buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql libmysql ]; + + propagatedBuildInputs = [ qtbase ]; + + meta = with lib; { + description = "A database connectivity and creation framework for various database vendors"; + license = licenses.lgpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ zraexy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67fc08c9d4d..84ffd202669 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10123,6 +10123,8 @@ with pkgs; kirigami_1 kirigami_2; + kdb = callPackage ../development/libraries/kdb { }; + kdiagram = callPackage ../development/libraries/kdiagram { }; kproperty = callPackage ../development/libraries/kproperty { }; From eb903ccc31d0ac99153893ab8d6483858a9fba8a Mon Sep 17 00:00:00 2001 From: zraexy Date: Fri, 15 Sep 2017 09:04:00 -0800 Subject: [PATCH 4/5] kexi: init at 3.0.2 --- pkgs/applications/office/kexi/default.nix | 47 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/office/kexi/default.nix diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix new file mode 100644 index 00000000000..66aee6bd962 --- /dev/null +++ b/pkgs/applications/office/kexi/default.nix @@ -0,0 +1,47 @@ +{ + mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, + boost, qttools, qtwebkit, + breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, + kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets, + kwidgetsaddons, kxmlgui, + kdb, kproperty, kreport, lcms2, libmysql, marble, postgresql +}: + +mkDerivation rec { + pname = "kexi"; + version = "3.0.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + sha256 = "1fjvjifi5ygx5gs2lzfg22j0x3r7kl4wk5jll09r8gc3dfxaiblf"; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + + buildInputs = [ + boost qttools qtwebkit + breeze-icons karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons + kcrash kguiaddons ki18n kiconthemes kitemviews kio ktexteditor ktextwidgets + kwidgetsaddons kxmlgui + kdb kproperty kreport lcms2 libmysql marble postgresql + ]; + + propagatedUserEnvPkgs = [ kproperty ]; + + meta = with lib; { + description = "A open source visual database applications creator, a long-awaited competitor for programs like MS Access or Filemaker"; + longDescription = '' + Kexi is a visual database applications creator. + It can be used for creating database schemas, + inserting data, performing queries, and processing data. + Forms can be created to provide a custom interface to your data. + All database objects - tables, queries and forms - are stored in the database, + making it easy to share data and design. + ''; + homepage = http://kexi-project.org/; + maintainers = with maintainers; [ zraexy ]; + platforms = platforms.linux; + license = with licenses; [ gpl2 lgpl2 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84ffd202669..31ff47663db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15019,6 +15019,8 @@ with pkgs; kermit = callPackage ../tools/misc/kermit { }; + kexi = libsForQt5.callPackage ../applications/office/kexi { }; + keyfinder = libsForQt5.callPackage ../applications/audio/keyfinder { }; keyfinder-cli = libsForQt5.callPackage ../applications/audio/keyfinder-cli { }; From 3f2a3d299bf47ec49e19e079e394438129b1c6c5 Mon Sep 17 00:00:00 2001 From: zraexy Date: Fri, 15 Sep 2017 09:06:49 -0800 Subject: [PATCH 5/5] calligra: 2.9.11 -> 3.0.1 --- pkgs/applications/office/calligra/2.nix | 55 ++++++++++++++++ pkgs/applications/office/calligra/default.nix | 66 +++++++++++-------- pkgs/top-level/all-packages.nix | 7 +- 3 files changed, 99 insertions(+), 29 deletions(-) create mode 100644 pkgs/applications/office/calligra/2.nix diff --git a/pkgs/applications/office/calligra/2.nix b/pkgs/applications/office/calligra/2.nix new file mode 100644 index 00000000000..76027f29a70 --- /dev/null +++ b/pkgs/applications/office/calligra/2.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs4, lcms2, libpng, eigen +, exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg +, libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql +, freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs +, kactivities, okular, git, oxygen-icons5, makeWrapper +# TODO: not found +#, xbase, openjpeg +# TODO: package libWPS, Spnav, m2mml, LibEtonyek +}: + +stdenv.mkDerivation rec { + name = "calligra-2.9.11"; + + src = fetchurl { + url = "mirror://kde/stable/${name}/${name}.tar.xz"; + sha256 = "02gaahp7a7m53n0hvrp3868s8w37b457isxir0z7b4mwhw7jv3di"; + }; + + nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ]; + + buildInputs = [ + kdelibs4 lcms2 libpng eigen + exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg + libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql + freetds fftw glew libkdcraw opencolorio kdepimlibs + kactivities okular git + ]; + + enableParallelBuilding = true; + + postInstall = '' + for i in $out/bin/*; do + wrapProgram $i \ + --prefix PATH ':' "${pstoedit.out}/bin" \ + --prefix XDG_DATA_DIRS ':' "${oxygen-icons5}/share" + done + ''; + + meta = with stdenv.lib; { + description = "A suite of productivity applications"; + longDescription = '' + Calligra Suite is a set of applications written to help + you to accomplish your work. Calligra includes efficient + and capable office components: Words for text processing, + Sheets for computations, Stage for presentations, Plan for + planning, Flow for flowcharts, Kexi for database creation, + Krita for painting and raster drawing, and Karbon for + vector graphics. + ''; + homepage = http://calligra.org; + maintainers = with maintainers; [ phreedom ebzzry ]; + inherit (kdelibs4.meta) platforms; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 76027f29a70..bec19d675cb 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,55 +1,65 @@ -{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs4, lcms2, libpng, eigen -, exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg -, libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql -, freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs -, kactivities, okular, git, oxygen-icons5, makeWrapper -# TODO: not found -#, xbase, openjpeg -# TODO: package libWPS, Spnav, m2mml, LibEtonyek +{ + mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper, + boost, qtwebkit, qtx11extras, shared_mime_info, + breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, + kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n, + kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross, + knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons, + kwindowsystem, kxmlgui, sonnet, threadweaver, + kcontacts, akonadi, akonadi-calendar, akonadi-contacts, + eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, libgit2, libodfgen, + librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon, + poppler, pstoedit, qca-qt5, vc +# TODO: package Spnav, m2mml LibEtonyek, Libqgit2 }: -stdenv.mkDerivation rec { - name = "calligra-2.9.11"; +mkDerivation rec { + pname = "calligra"; + version = "3.0.1"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${name}/${name}.tar.xz"; - sha256 = "02gaahp7a7m53n0hvrp3868s8w37b457isxir0z7b4mwhw7jv3di"; + url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz"; + sha256 = "1cjdd7sx1zhas6lhw0dzhrnki790jkf93f88wn6z9yrww32dsas5"; }; - nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; buildInputs = [ - kdelibs4 lcms2 libpng eigen - exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg - libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql - freetds fftw glew libkdcraw opencolorio kdepimlibs - kactivities okular git + boost qtwebkit qtx11extras shared_mime_info + kactivities karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons + kdbusaddons kdiagram kguiaddons khtml ki18n kiconthemes kitemviews + kjobwidgets kcmutils kdelibs4support kio kross knotifications knotifyconfig kparts + ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui sonnet threadweaver + kcontacts akonadi akonadi-calendar akonadi-contacts + eigen git gsl ilmbase kproperty kreport lcms2 marble libgit2 libodfgen librevenge + libvisio libwpd libwpg libwps okular openexr openjpeg phonon poppler qca-qt5 vc ]; - enableParallelBuilding = true; + propagatedUserEnvPkgs = [ kproperty ]; + + NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; postInstall = '' for i in $out/bin/*; do wrapProgram $i \ --prefix PATH ':' "${pstoedit.out}/bin" \ - --prefix XDG_DATA_DIRS ':' "${oxygen-icons5}/share" + --prefix XDG_DATA_DIRS ':' "${breeze-icons}/share" done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A suite of productivity applications"; longDescription = '' Calligra Suite is a set of applications written to help you to accomplish your work. Calligra includes efficient and capable office components: Words for text processing, - Sheets for computations, Stage for presentations, Plan for - planning, Flow for flowcharts, Kexi for database creation, - Krita for painting and raster drawing, and Karbon for + Sheets for computations, Plan for planning, and Karbon for vector graphics. ''; - homepage = http://calligra.org; - maintainers = with maintainers; [ phreedom ebzzry ]; - inherit (kdelibs4.meta) platforms; - license = licenses.gpl2; + homepage = https://www.calligra.org/; + maintainers = with maintainers; [ phreedom ebzzry zraexy ]; + platforms = platforms.linux; + license = with licenses; [ gpl2 lgpl2 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31ff47663db..6d4e514328a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13674,10 +13674,15 @@ with pkgs; calibre = libsForQt5.callPackage ../applications/misc/calibre { }; - calligra = kde4.callPackage ../applications/office/calligra { + calligra2 = kde4.callPackage ../applications/office/calligra/2.nix { vc = vc_0_7; }; + calligra = libsForQt5.callPackage ../applications/office/calligra { + inherit (kdeApplications) akonadi-calendar akonadi-contacts; + openjpeg = openjpeg_1; + }; + camlistore = callPackage ../applications/misc/camlistore { }; canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { };