diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/office')
10 files changed, 88 insertions, 74 deletions
diff --git a/nixpkgs/pkgs/applications/office/appflowy/default.nix b/nixpkgs/pkgs/applications/office/appflowy/default.nix index 197a2096e04b..a8d0f7566c8e 100644 --- a/nixpkgs/pkgs/applications/office/appflowy/default.nix +++ b/nixpkgs/pkgs/applications/office/appflowy/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { version = "0.4.1"; src = fetchzip { - url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-x86_64-unknown-linux-gnu-x86_64.tar.gz"; + url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz"; hash = "sha256-9wv7/3wtR1xiOHRYXP29Qbom1Xl9xZbhCFEPf0LJitg="; stripRoot = false; }; diff --git a/nixpkgs/pkgs/applications/office/foliate/default.nix b/nixpkgs/pkgs/applications/office/foliate/default.nix index 80b6122fa7b6..0ca0f87a073a 100644 --- a/nixpkgs/pkgs/applications/office/foliate/default.nix +++ b/nixpkgs/pkgs/applications/office/foliate/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "foliate"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "johnfactotum"; repo = pname; - rev = version; - hash = "sha256-ksjd/H62c9dhoOXQtrKqexAjLMGd/adP/fL78fYRi/Y="; + rev = "refs/tags/${version}"; + hash = "sha256-6cymAqQxHHoTgzEyUKXC7zV/lUEJfIG+54+tLsc9iHo="; fetchSubmodules = true; }; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple and modern GTK eBook reader"; - homepage = "https://johnfactotum.github.io/foliate/"; + homepage = "https://johnfactotum.github.io/foliate"; license = licenses.gpl3Only; maintainers = with maintainers; [ onny ]; }; diff --git a/nixpkgs/pkgs/applications/office/gnucash/default.nix b/nixpkgs/pkgs/applications/office/gnucash/default.nix index 7c378bc52a90..b7929dbf9e44 100644 --- a/nixpkgs/pkgs/applications/office/gnucash/default.nix +++ b/nixpkgs/pkgs/applications/office/gnucash/default.nix @@ -28,13 +28,12 @@ stdenv.mkDerivation rec { pname = "gnucash"; - version = "5.4"; + version = "5.5"; # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { - # Upstream uploaded a -1 tarball on the same release, remove on next release - url = "https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}-1.tar.bz2"; - hash = "sha256-d0EWXW1lLqe0oehJjPQ5pWuBpcyLZTKRpZBU8jYqv8w="; + url = "https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}.tar.bz2"; + hash = "sha256-tNr2e7iStwYyP2Lp+pckIDnX3QouHhB3HgwlgX3Q7Ts="; }; nativeBuildInputs = [ @@ -77,12 +76,6 @@ stdenv.mkDerivation rec { ./0003-remove-valgrind.patch # this patch makes gnucash exec the Finance::Quote wrapper directly ./0004-exec-fq-wrapper.patch - # this patch fixes a test that fails due to a type error, remove on next release - (fetchpatch { - name = "0005-utest-gnc-pricedb-fix.patch"; - url = "https://github.com/Gnucash/gnucash/commit/0bd556c581ac462ca41b3cb533323fc3587051e1.patch"; - hash = "sha256-k0ANZuOkWrtU4q380oDu/hC9PeGmujF49XEFQ8eCLGM="; - }) ]; # this needs to be an environment variable and not a cmake flag to suppress @@ -106,7 +99,7 @@ stdenv.mkDerivation rec { owner = "Gnucash"; repo = "gnucash-docs"; rev = version; - hash = "sha256-aPxQEcpo8SPv8lPQbxMl1wg8ijH9Rz0oo4K5lp3C/bw="; + hash = "sha256-ilDh4PH+tdrJReIpgvEd0Gvs8Xvt5Q43XM5r7Bn+5IM="; }; nativeBuildInputs = [ cmake ]; @@ -138,6 +131,8 @@ stdenv.mkDerivation rec { --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ JSONParse FinanceQuote ]}" ''; + passthru.updateScript = ./update.sh; + meta = with lib; { homepage = "https://www.gnucash.org/"; description = "Free software for double entry accounting"; diff --git a/nixpkgs/pkgs/applications/office/gnucash/update.sh b/nixpkgs/pkgs/applications/office/gnucash/update.sh new file mode 100755 index 000000000000..b339fd4a7c7c --- /dev/null +++ b/nixpkgs/pkgs/applications/office/gnucash/update.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env nix-shell +#! nix-shell -I nixpkgs=./. -i bash -p curl jq nix-prefetch-github + +set -euo pipefail + +latest_version=$(curl -s https://api.github.com/repos/Gnucash/gnucash/releases/latest | jq -r '.tag_name') + +if [[ "$latest_version" = "$UPDATE_NIX_OLD_VERSION" ]]; then + echo "already up to date" + exit 0 +fi + +old_src_hash=$(nix-instantiate --eval -A gnucash.src.outputHash | tr -d '"') +old_src_doc_hash=$(nix-instantiate --eval -A gnucash.docs.src.outputHash | tr -d '"') + +src_hash=$(nix-prefetch-url "https://github.com/Gnucash/gnucash/releases/download/$latest_version/gnucash-$latest_version.tar.bz2") +src_hash=$(nix-hash --to-sri --type sha256 "$src_hash") +src_doc_hash=$(nix-prefetch-github Gnucash gnucash-docs --rev "$latest_version" | jq -r .hash) +src_doc_hash=$(nix-hash --to-sri --type sha256 "$src_doc_hash") + +cd "$(dirname "${BASH_SOURCE[0]}")" +sed -i default.nix -e "s|$old_src_hash|$src_hash|" +sed -i default.nix -e "s|$old_src_doc_hash|$src_doc_hash|" +sed -i default.nix -e "/ version =/s|\"${UPDATE_NIX_OLD_VERSION}\"|\"${latest_version}\"|" diff --git a/nixpkgs/pkgs/applications/office/morgen/default.nix b/nixpkgs/pkgs/applications/office/morgen/default.nix index f2bcd3b6a975..54cd07a4e0eb 100644 --- a/nixpkgs/pkgs/applications/office/morgen/default.nix +++ b/nixpkgs/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.0.1"; + version = "3.1.6"; src = fetchurl { - url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-lj+V5mntZzED2ZS62Uwlt/vTXwSuwzXeuEw8y/bA6og="; + url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; + hash = "sha256-/rMPNIpjkHdLE0lAdWCz71DbcqIW+1Y6RdFrYAfTSKU="; }; nativeBuildInputs = [ @@ -46,12 +46,15 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "All-in-one Calendars, Tasks and Scheduler"; homepage = "https://morgen.so/download"; + mainProgram = "morgen"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ wolfangaukang ]; + maintainers = with maintainers; [ justanotherariel wolfangaukang ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/applications/office/morgen/update.sh b/nixpkgs/pkgs/applications/office/morgen/update.sh new file mode 100755 index 000000000000..e12f86a04bbc --- /dev/null +++ b/nixpkgs/pkgs/applications/office/morgen/update.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts + +set -euo pipefail + +# URL to check for the latest version +latestUrl="https://dl.todesktop.com/210203cqcj00tw1/linux/deb/x64" + +# Fetch the latest version information +latestInfo=$(curl -sI -X GET $latestUrl | grep -oP 'morgen-\K\d+(\.\d+)*(?=[^\d])') + +if [[ -z "$latestInfo" ]]; then + echo "Could not find the latest version number." + exit 1 +fi + +# Extract the version number +latestVersion=$(echo "$latestInfo" | head -n 1) + +echo "Latest version of Morgen is $latestVersion" + +# Update the package definition +update-source-version morgen "$latestVersion" + +# Fetch and update the hash +nix-prefetch-url --unpack "https://dl.todesktop.com/210203cqcj00tw1/versions/${latestVersion}/linux/deb" diff --git a/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix b/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix index 7cb012770695..0e40c19fef41 100644 --- a/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix +++ b/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix @@ -211,7 +211,7 @@ python.pkgs.buildPythonApplication rec { whitenoise whoosh zipp - zope_interface + zope-interface zxing-cpp ] ++ redis.optional-dependencies.hiredis diff --git a/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/nixpkgs/pkgs/applications/office/qownnotes/default.nix index e7f8cd804460..5c3dc0f2c296 100644 --- a/nixpkgs/pkgs/applications/office/qownnotes/default.nix +++ b/nixpkgs/pkgs/applications/office/qownnotes/default.nix @@ -19,14 +19,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.12.5"; + version = "24.1.1"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-nPlaKbtG6ncHI9I/qHUFRtc98lWkz7C/VXFX/JkXhDo="; + hash = "sha256-yCsYIi1StZOYutDAWS04u3DccrPB+2oqaynnH4GBEPc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/office/scribus/default.nix b/nixpkgs/pkgs/applications/office/scribus/default.nix index 16e65d283645..54b97b3e9f04 100644 --- a/nixpkgs/pkgs/applications/office/scribus/default.nix +++ b/nixpkgs/pkgs/applications/office/scribus/default.nix @@ -3,7 +3,6 @@ , cmake , cups , fetchurl -, fetchpatch , fontconfig , freetype , harfbuzzFull @@ -12,17 +11,15 @@ , libjpeg , libtiff , libxml2 -, mkDerivation , pixman , pkg-config , podofo , poppler , poppler_data , python3 -, qtbase -, qtimageformats -, qttools , lib +, stdenv +, qt5 }: let @@ -33,46 +30,20 @@ let ] ); in -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "scribus"; - version = "1.5.8"; + version = "1.6.0"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz"; - hash = "sha256-R4Fuj89tBXiP8WqkSZ+X/yJDHHd6d4kUmwqItFHha3Q="; + url = "mirror://sourceforge/scribus/scribus-devel/scribus-${finalAttrs.version}.tar.xz"; + hash = "sha256-lLl0kOzhcoaNxPBMeqLulQtBtfL/QoXfN9YV8ETQOOU="; }; - patches = [ - # For Poppler 22.02 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/85c0dff3422fa3c26fbc2e8d8561f597ec24bd92.patch"; - sha256 = "YR0ii09EVU8Qazz6b8KAIWsUMTwPIwO8JuQPymAWKdw="; - }) - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/f75c1613db67f4067643d0218a2db3235e42ec9f.patch"; - sha256 = "vJU8HsKHE3oXlhcXQk9uCYINPYVPF5IGmrWYFQ6Py5c="; - }) - # For Poppler 22.03 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/f19410ac3b27e33dd62105746784e61e85b90a1d.patch"; - sha256 = "JHdgntYcioYatPeqpmym3c9dORahj0CinGOzbGtA4ds="; - }) - # For Poppler 22.04 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch"; - sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw="; - }) - # For Poppler 22.09 - (fetchpatch { - url = "https://github.com/archlinux/svntogit-community/raw/ea402a588c65d11973b148cf203b3463213431cf/trunk/scribus-1.5.8-poppler-22.09.0.patch"; - sha256 = "IRQ6rSzH6ZWln6F13Ayk8k7ADj8l3lIJlGm/zjEURQM="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config + qt5.wrapQtAppsHook ]; buildInputs = [ @@ -92,23 +63,17 @@ mkDerivation rec { poppler poppler_data pythonEnv - qtbase - qtimageformats - qttools - ]; - - cmakeFlags = [ - # poppler uses std::optional - "-DWANT_CPP17=ON" + qt5.qtbase + qt5.qtimageformats + qt5.qttools ]; meta = with lib; { maintainers = with maintainers; [ - erictapen kiwi + arthsmn ]; - platforms = platforms.linux; - description = "Desktop Publishing (DTP) and Layout program for Linux"; + description = "Desktop Publishing (DTP) and Layout program"; homepage = "https://www.scribus.net"; # There are a lot of licenses... # https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19 @@ -118,5 +83,6 @@ mkDerivation rec { mit publicDomain ]; + broken = stdenv.isDarwin; }; -} +}) diff --git a/nixpkgs/pkgs/applications/office/treesheets/default.nix b/nixpkgs/pkgs/applications/office/treesheets/default.nix index 499dfb98fe42..e1062e03f337 100644 --- a/nixpkgs/pkgs/applications/office/treesheets/default.nix +++ b/nixpkgs/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2023-12-24"; + version = "unstable-2024-01-03"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "a73f268c7bdec0badf83538a476308861d0d4726"; - sha256 = "hAXzOYUXYTYxKoku1HqIDVXWkJBVCXbbvNdBVsVEbC4="; + rev = "a8641361b839ed0720f9c6e043420945ac2427a7"; + sha256 = "MTRcG9fsyypDmVHRgtQFqbbSb0n7X7kXuEM6oYy/OVc="; }; nativeBuildInputs = [ |