From 6e7740fb0cca900330532d77e6dfdffe7645272e Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Mon, 22 Mar 2021 14:29:01 +0100 Subject: watson: 1.10.0 -> 2.0.0 Co-authored-by: Sandro --- pkgs/applications/office/watson/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'pkgs/applications/office') diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index 18c1b9469e7..c305c771417 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -4,26 +4,22 @@ with pythonPackages; buildPythonApplication rec { pname = "watson"; - version = "1.10.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "TailorDev"; repo = "Watson"; rev = version; - sha256 = "1s0k86ldqky6avwjaxkw1y02wyf59qwqldcahy3lhjn1b5dgsb3s"; + sha256 = "1yxqjirv7cpg4hqj4l3a53p3p3kl82bcx6drgvl9v849vcc3l7s0"; }; - checkPhase = '' - pytest -vs tests - ''; - postInstall = '' installShellCompletion --bash --name watson watson.completion installShellCompletion --zsh --name _watson watson.zsh-completion ''; - checkInputs = [ py pytest pytest-datafiles pytest-mock pytestrunner ]; - propagatedBuildInputs = [ arrow click click-didyoumean requests ]; + checkInputs = [ pytestCheckHook pytest-mock mock pytest-datafiles ]; + propagatedBuildInputs = [ arrow_1 click click-didyoumean requests ]; nativeBuildInputs = [ installShellFiles ]; meta = with lib; { -- cgit 1.4.1 From a2db6d1c9f26c052f9a9e62bcfd836cd7be37956 Mon Sep 17 00:00:00 2001 From: Moritz Scheuren Date: Tue, 6 Apr 2021 22:27:53 +0200 Subject: gtg: unstable-2020-10-22 -> 0.5 --- pkgs/applications/office/gtg/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/office') diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index 4c892b2605b..3b7052dff7f 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -16,13 +16,13 @@ python3Packages.buildPythonApplication rec { pname = "gtg"; - version = "unstable-2020-10-22"; + version = "0.5"; src = fetchFromGitHub { owner = "getting-things-gnome"; repo = "gtg"; - rev = "144814c16723fa9d00e17e047df5d79ab443fc5f"; - sha256 = "1lpanfbj8y8b6cqp92lgbvfs8irrc5bsdffzcjcycazv19qm7z2n"; + rev = "v${version}"; + sha256 = "0b2slm7kjq6q8c7v4m7aqc8m1ynjxn3bl7445srpv1xc0dilq403"; }; @@ -56,6 +56,10 @@ python3Packages.buildPythonApplication rec { xvfb_run ]; + preBuild = '' + export HOME="$TMP" + ''; + format = "other"; strictDeps = false; # gobject-introspection does not run with strictDeps (https://github.com/NixOS/nixpkgs/issues/56943) -- cgit 1.4.1 From 8d75eaf225deb277a70bfb091b51dde52c0cfac9 Mon Sep 17 00:00:00 2001 From: gspia Date: Sat, 6 Mar 2021 17:52:57 +0200 Subject: kitsas: init at 2.3 Add kitsas, an accounting application This commit adds an accounting application called kitsas to the set of packages. Kitsas is suitable for Finnish associations and small business. Change meta maintainers Change the meta license line Add newlines Change the top level caller Start using qmakeFlags Second review round changes Change license to non-deprecated one Typo in the license constant --- pkgs/applications/office/kitsas/default.nix | 51 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 53 insertions(+) create mode 100644 pkgs/applications/office/kitsas/default.nix (limited to 'pkgs/applications/office') diff --git a/pkgs/applications/office/kitsas/default.nix b/pkgs/applications/office/kitsas/default.nix new file mode 100644 index 00000000000..0adfa748c01 --- /dev/null +++ b/pkgs/applications/office/kitsas/default.nix @@ -0,0 +1,51 @@ +{ lib, mkDerivation, fetchFromGitHub, qmake, qtsvg, qtcreator, poppler, libzip, pkg-config }: + +mkDerivation rec { + pname = "kitsas"; + version = "2.3"; + + src = fetchFromGitHub { + owner = "artoh"; + repo = "kitupiikki"; + rev = "v${version}"; + sha256 = "1qac6cxkb45rs5pschsf2rvpa789g27shmrwpshwahqzhw42xvgl"; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ qmake qtsvg poppler libzip ]; + + # We use a separate build-dir as otherwise ld seems to get confused between + # directory and executable name on buildPhase. + preConfigure = '' + mkdir build-linux + cd build-linux + ''; + + qmakeFlags = [ + "../kitsas/kitsas.pro" + "-spec" + "linux-g++" + "CONFIG+=release" + ]; + + preFixup = '' + make clean + rm Makefile + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/applications + cp kitsas $out/bin + cp $src/kitsas.png $out/share/applications + cp $src/kitsas.desktop $out/share/applications + ''; + + meta = with lib; { + homepage = "https://github.com/artoh/kitupiikki"; + description = "An accounting tool suitable for Finnish associations and small business"; + maintainers = with maintainers; [ gspia ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74ec2651b48..e9a746db241 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23796,6 +23796,8 @@ in ffmpeg = ffmpeg_2; }; + kitsas = libsForQt5.callPackage ../applications/office/kitsas { }; + kiwix = libsForQt5.callPackage ../applications/misc/kiwix { }; klayout = libsForQt5.callPackage ../applications/misc/klayout { }; -- cgit 1.4.1 From 773cfbf027f2937dacedf69ce82d488e48f7a056 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Sat, 10 Apr 2021 15:52:36 +0200 Subject: qownnotes: 21.3.2 -> 21.4.0 --- pkgs/applications/office/qownnotes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/office') diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index e397743b22d..451e4b92185 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "21.3.2"; + version = "21.4.0"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Can grab official version like so: - # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-21.3.2.tar.xz.sha256 - sha256 = "a8e8ab2ca1ef6684407adeb8fc63abcafff407a367471e053c583a1c4215e5ee"; + # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-21.4.0.tar.xz.sha256 + sha256 = "bda454031a79a768b472677036ada7501ea430482277f1694757066922428eec"; }; nativeBuildInputs = [ qmake qttools ]; -- cgit 1.4.1 From eba83c89474bde0ea3433e8e5f54b2c7e0bbc2de Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 11 Apr 2021 10:25:51 -0400 Subject: fava: update maintainers As discussed in #118355 --- pkgs/applications/office/fava/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'pkgs/applications/office') diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 4f32486ffe1..cdef23cff4c 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -13,17 +13,17 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ Babel + beancount cheroot - flaskbabel + click flask + flaskbabel + jaraco_functools jinja2 - beancount - click markdown2 ply simplejson werkzeug - jaraco_functools ]; checkInputs = with python3.pkgs; [ @@ -39,10 +39,11 @@ python3.pkgs.buildPythonApplication rec { "test_cli" ]; - meta = { - homepage = "https://beancount.github.io/fava"; + meta = with lib; { description = "Web interface for beancount"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ matthiasbeyer ]; + homepage = "https://beancount.github.io/fava"; + changelog = "https://beancount.github.io/fava/changelog.html"; + license = licenses.mit; + maintainers = with maintainers; [ bhipple ]; }; } -- cgit 1.4.1 From a2cfa9a5155c5e013e47e4e59e5f503c6c18fc9d Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 12 Apr 2021 04:22:34 +0200 Subject: foliate: init at 2.6.3 (#119001) --- pkgs/applications/office/foliate/default.nix | 45 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/office/foliate/default.nix (limited to 'pkgs/applications/office') diff --git a/pkgs/applications/office/foliate/default.nix b/pkgs/applications/office/foliate/default.nix new file mode 100644 index 00000000000..8226e8e38cc --- /dev/null +++ b/pkgs/applications/office/foliate/default.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, fetchFromGitHub, meson, gettext, glib, gjs, ninja, python3, gtk3 +, webkitgtk, gsettings-desktop-schemas, wrapGAppsHook, desktop-file-utils +, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "foliate"; + version = "2.6.3"; + + src = fetchFromGitHub { + owner = "johnfactotum"; + repo = pname; + rev = version; + sha256 = "0ribqaxl8g1i83fxbn288afwbzzls48ni57xqi07d19p9ka892mr"; + }; + + nativeBuildInputs = [ meson ninja python3 wrapGAppsHook ]; + + postPatch = '' + patchShebangs build-aux/meson/postinstall.py + ''; + + postFixup = '' + echo "fixing wrapper" + sed -i "1 a imports.package._findEffectiveEntryPointName = () => 'com.github.johnfactotum.Foliate';" $out/bin/.com.github.johnfactotum.Foliate-wrapped + ln -s $out/bin/com.github.johnfactotum.Foliate $out/bin/foliate + ''; + + buildInputs = [ + gettext + glib + gjs + gtk3 + webkitgtk + desktop-file-utils + gobject-introspection + gsettings-desktop-schemas + ]; + + meta = with lib; { + description = "A simple and modern GTK eBook reader"; + homepage = "https://johnfactotum.github.io/foliate/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bf5e7d10ef..45086fceb03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22693,6 +22693,8 @@ in focuswriter = libsForQt5.callPackage ../applications/editors/focuswriter { }; + foliate = callPackage ../applications/office/foliate { }; + fondo = callPackage ../applications/graphics/fondo { }; font-manager = callPackage ../applications/misc/font-manager { }; -- cgit 1.4.1