diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/office')
10 files changed, 26 insertions, 23 deletions
diff --git a/nixpkgs/pkgs/applications/office/fava/default.nix b/nixpkgs/pkgs/applications/office/fava/default.nix index cdef23cff4c5..92f48eb91b82 100644 --- a/nixpkgs/pkgs/applications/office/fava/default.nix +++ b/nixpkgs/pkgs/applications/office/fava/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "fava"; - version = "1.18"; + version = "1.19"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "21336b695708497e6f00cab77135b174c51feb2713b657e0e208282960885bf5"; + sha256 = "def7c0210bf0ce8dfffdb46ce21b3efcf71eba5a4e903565258419e4c53c2d43"; }; nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; diff --git a/nixpkgs/pkgs/applications/office/notes-up/default.nix b/nixpkgs/pkgs/applications/office/notes-up/default.nix index 8271b2974ce4..de09bc1c761c 100644 --- a/nixpkgs/pkgs/applications/office/notes-up/default.nix +++ b/nixpkgs/pkgs/applications/office/notes-up/default.nix @@ -1,9 +1,10 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , pantheon , pkg-config -, vala_0_46 +, vala , cmake , ninja , gtk3 @@ -12,27 +13,28 @@ , gtkspell3 , glib , libgee +, pcre , sqlite , discount , wrapGAppsHook -, withPantheon ? false }: +, withPantheon ? false +}: stdenv.mkDerivation rec { pname = "notes-up"; - version = "2.0.2"; + version = "unstable-2020-12-29"; src = fetchFromGitHub { owner = "Philip-Scott"; repo = "Notes-up"; - rev = version; - sha256 = "0bklgp8qrrj9y5m77xqbpy1ld2d9ya3rlxklgzx3alffq5312i4s"; + rev = "2ea9f35f588769758f5d2d4436d71c4059141a6f"; + sha256 = "sha256-lKOM9+s34xYB9bF9pgip9DFu+6AaxSE4HjFVhoWtttk="; }; nativeBuildInputs = [ cmake ninja - # fails with newer vala: https://github.com/Philip-Scott/Notes-up/issues/349 - vala_0_46 + vala pkg-config wrapGAppsHook ]; @@ -45,6 +47,7 @@ stdenv.mkDerivation rec { gtkspell3 libgee pantheon.granite + pcre sqlite webkitgtk ]; @@ -60,9 +63,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Markdown notes editor and manager designed for elementary OS" - + lib.optionalString withPantheon " - built with Contractor support"; + + lib.optionalString withPantheon " - built with Contractor support"; homepage = "https://github.com/Philip-Scott/Notes-up"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ davidak ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/applications/office/paperless/default.nix b/nixpkgs/pkgs/applications/office/paperless/default.nix index c2578696c688..68032ebe8497 100644 --- a/nixpkgs/pkgs/applications/office/paperless/default.nix +++ b/nixpkgs/pkgs/applications/office/paperless/default.nix @@ -122,7 +122,7 @@ let runtimePackages = with python.pkgs; [ dateparser - dateutil + python-dateutil django django-cors-headers django-crispy-forms diff --git a/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix b/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix index 8f1278d99266..16ee7733ed26 100644 --- a/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -122,7 +122,7 @@ python3Packages.buildPythonApplication rec { openpaperwork-core pypillowfight pyxdg - dateutil + python-dateutil setuptools ]; diff --git a/nixpkgs/pkgs/applications/office/pyspread/default.nix b/nixpkgs/pkgs/applications/office/pyspread/default.nix index 54d3b8f5c3e2..3c68c19aa97c 100644 --- a/nixpkgs/pkgs/applications/office/pyspread/default.nix +++ b/nixpkgs/pkgs/applications/office/pyspread/default.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python3.pkgs; [ - dateutil + python-dateutil markdown2 matplotlib numpy diff --git a/nixpkgs/pkgs/applications/office/softmaker/generic.nix b/nixpkgs/pkgs/applications/office/softmaker/generic.nix index 56a951919e36..3c139e1eead7 100644 --- a/nixpkgs/pkgs/applications/office/softmaker/generic.nix +++ b/nixpkgs/pkgs/applications/office/softmaker/generic.nix @@ -123,7 +123,7 @@ in stdenv.mkDerivation { description = "An office suite with a word processor, spreadsheet and presentation program"; homepage = "https://www.softmaker.com/"; license = licenses.unfree; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/applications/office/super-productivity/default.nix b/nixpkgs/pkgs/applications/office/super-productivity/default.nix index 7793db2138c8..7cb9a9b7e992 100644 --- a/nixpkgs/pkgs/applications/office/super-productivity/default.nix +++ b/nixpkgs/pkgs/applications/office/super-productivity/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { pname = "super-productivity"; - version = "6.5.2"; + version = "7.2.1"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "1ivl7chsv9axgk6nqkf580pav651hchi3di0mrp0pylpsqgk6f1f"; + sha256 = "93eeb56fe923c48a9384cde0633e98a9d9dc5c0869fce63b9724ff74bb400049"; name = "${pname}-${version}.AppImage"; }; diff --git a/nixpkgs/pkgs/applications/office/timedoctor/default.nix b/nixpkgs/pkgs/applications/office/timedoctor/default.nix index f4ce436e963b..e6d3186578a4 100644 --- a/nixpkgs/pkgs/applications/office/timedoctor/default.nix +++ b/nixpkgs/pkgs/applications/office/timedoctor/default.nix @@ -15,7 +15,7 @@ appimageTools.wrapType2 { url = "https://repo2.timedoctor.com/td-desktop-hybrid/prod/v${version}/timedoctor-desktop_${version}_linux-x86_64.AppImage"; }; multiPkgs = _: with _; [ - alsaLib + alsa-lib atk at-spi2-atk at-spi2-core diff --git a/nixpkgs/pkgs/applications/office/trilium/default.nix b/nixpkgs/pkgs/applications/office/trilium/default.nix index d6b7e08b4be9..a1be66c56f12 100644 --- a/nixpkgs/pkgs/applications/office/trilium/default.nix +++ b/nixpkgs/pkgs/applications/office/trilium/default.nix @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.47.4"; + version = "0.47.5"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "0hvp6rpvgda12ficzqkj7kllgmpzc8n4rvpgv0zi6fa5alkr944x"; + sha256 = "16sm93vzlsqmrykbzdvgwszbhq79brd74zp9n9q5wrf4s44xizzv"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "01bbg7ssszrq27zk7xzil2mawk1659h1hw68yvk8lbgc4n9phkqk"; + sha256 = "0jk9pf3ljzfdv7d91wxda8z9qz653qas58wsrx42gnf7zxn1l648"; }; in { diff --git a/nixpkgs/pkgs/applications/office/tryton/default.nix b/nixpkgs/pkgs/applications/office/tryton/default.nix index b3a5ae44c936..ff4835411ef5 100644 --- a/nixpkgs/pkgs/applications/office/tryton/default.nix +++ b/nixpkgs/pkgs/applications/office/tryton/default.nix @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ - dateutil + python-dateutil pygobject3 goocalendar pycairo |