diff options
Diffstat (limited to 'pkgs/applications/office')
60 files changed, 813 insertions, 989 deletions
diff --git a/pkgs/applications/office/activitywatch/default.nix b/pkgs/applications/office/activitywatch/default.nix index 04d58e74dad..4187da1bfab 100644 --- a/pkgs/applications/office/activitywatch/default.nix +++ b/pkgs/applications/office/activitywatch/default.nix @@ -5,6 +5,7 @@ , pkg-config , perl , openssl +, rust-jemalloc-sys , python3 , wrapQtAppsHook , qtbase @@ -173,6 +174,7 @@ rec { buildInputs = [ openssl + rust-jemalloc-sys ]; postFixup = '' diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 11d29123872..3e281d59bc9 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -8,15 +8,16 @@ , gtk3 , xdg-user-dirs , keybinder3 +, libnotify }: stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.3.1"; + version = "0.3.8"; src = fetchzip { - url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04.tar.gz"; - hash = "sha256-jIekGA+MG9tvjEyHAI3dcD7lI1JL/qPqRpVO9gRhcTw="; + url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz"; + hash = "sha256-3ICeKSqzx1zp/KpaAFl9qLSaugWm4HZrKjrDCWz9ok4="; stripRoot = false; }; @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 keybinder3 + libnotify ]; dontBuild = true; diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix index c490be23811..af8ceeb4b7b 100644 --- a/pkgs/applications/office/autokey/default.nix +++ b/pkgs/applications/office/autokey/default.nix @@ -6,17 +6,19 @@ , gtksourceview3 , libappindicator-gtk3 , libnotify +, gnome +, wmctrl }: python3Packages.buildPythonApplication rec { pname = "autokey"; - version = "0.95.10"; + version = "0.96.0"; src = fetchFromGitHub { owner = "autokey"; repo = "autokey"; rev = "v${version}"; - sha256 = "0f0cqfnb49wwdy7zl2f2ypcnd5pc8r8n7z7ssxkq20d4xfxlgamr"; + hash = "sha256-d1WJLqkdC7QgzuYdnxYhajD3DtCpgceWCAxGrk0KKew="; }; # Tests appear to be broken with import errors within the project structure @@ -35,8 +37,20 @@ python3Packages.buildPythonApplication rec { pyinotify xlib pygobject3 + packaging ]; + runtimeDeps = [ + gnome.zenity + wmctrl + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=(''${gappsWrapperArgs[@]} --prefix PATH : ${ lib.makeBinPath runtimeDeps }) + ''; + postInstall = '' # remove Qt version which we currently do not support rm $out/bin/autokey-qt $out/share/applications/autokey-qt.desktop diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index 91fea99ff1e..cd640e89bf8 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { "-DUSE_POPPLER=${if usePoppler then "ON" else "OFF"}" "-DUSE_MUPDF=${if useMupdf then "ON" else "OFF"}" "-DUSE_QTPDF=OFF" - "-DLINK_MUPDF_THIRD=ON" + "-DLINK_MUPDF_THIRD=OFF" "-DUSE_EXTERNAL_RENDERER=${if useExternalRenderer then "ON" else "OFF"}" "-DLINK_MUJS=OFF" "-DLINK_GUMBO=ON" diff --git a/pkgs/applications/office/bookletimposer/default.nix b/pkgs/applications/office/bookletimposer/default.nix index 6bdaf63b771..87dbbbb732f 100644 --- a/pkgs/applications/office/bookletimposer/default.nix +++ b/pkgs/applications/office/bookletimposer/default.nix @@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = [ gtk3 - (python3.withPackages (ps: with ps; [ distutils_extra pypdf2 pygobject3 ])) + (python3.withPackages (ps: with ps; [ distutils-extra pypdf2 pygobject3 ])) ]; meta = { diff --git a/pkgs/applications/office/clockify/default.nix b/pkgs/applications/office/clockify/default.nix index 37afa6cc226..efd20632a2a 100644 --- a/pkgs/applications/office/clockify/default.nix +++ b/pkgs/applications/office/clockify/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clockify"; - version = "2.0.3"; + version = "2.1.6"; src = fetchurl { - url = "https://web.archive.org/web/20211118160803/https://clockify-resources.s3.eu-central-1.amazonaws.com/downloads/Clockify_Setup.deb"; - sha256 = "sha256-eVZ3OqM1eoWfST7Qu9o8VmLm8ntD+ETf/0aes6RY4Y8="; + url = "https://web.archive.org/web/20231110130133/https://clockify.me/downloads/Clockify_Setup_x64.deb"; + hash = "sha256-jndoMk3vqk8a5jMzKVo6ThovSISmcu+hef9IJcg3reQ="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mv opt $out substituteInPlace $out/share/applications/clockify.desktop \ - --replace "/opt/Clockify" $out/bin + --replace "/opt/Clockify/" "" makeWrapper ${electron}/bin/electron $out/bin/clockify \ --add-flags $out/opt/Clockify/resources/app.asar @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://clockify.me"; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang ]; + mainProgram = "clockify"; platforms = [ "x86_64-linux" ]; - }; } diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index b7e2105a94e..2e869daff53 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -2,12 +2,12 @@ python3.pkgs.buildPythonApplication rec { pname = "fava"; - version = "1.26.1"; + version = "1.26.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-pj4kaQDXahjhN7bu7xxT/ZuoCfPdGyo898482S5gnlE="; + hash = "sha256-+rMuVfe6BDAcZgJkBb18YLFZirOBfad6WGbWtAT21uI="; }; nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; @@ -31,6 +31,11 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'setuptools_scm>=8.0' 'setuptools_scm' + ''; + preCheck = '' export HOME=$TEMPDIR ''; diff --git a/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch b/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch index e2b81538046..8b00b275e59 100644 --- a/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch +++ b/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch @@ -1,8 +1,6 @@ -diff --git a/libgnucash/app-utils/gnc-quotes.cpp b/libgnucash/app-utils/gnc-quotes.cpp -index 3003fca71f..2f2b1398e1 100644 ---- a/libgnucash/app-utils/gnc-quotes.cpp -+++ b/libgnucash/app-utils/gnc-quotes.cpp -@@ -122,7 +122,6 @@ private: +--- a/libgnucash/app-utils/gnc-quotes.cpp 2023-09-23 07:04:21.000000000 +0900 ++++ b/libgnucash/app-utils/gnc-quotes.cpp 2023-09-25 11:58:46.482696433 +0900 +@@ -125,7 +125,6 @@ class GncFQQuoteSource final : public GncQuoteSource { @@ -10,7 +8,7 @@ index 3003fca71f..2f2b1398e1 100644 std::string c_fq_wrapper; std::string m_version; StrVec m_sources; -@@ -145,13 +144,12 @@ static std::string parse_quotesource_error(const std::string& line); +@@ -148,13 +147,12 @@ static const std::string empty_string{}; GncFQQuoteSource::GncFQQuoteSource() : @@ -25,7 +23,7 @@ index 3003fca71f..2f2b1398e1 100644 auto [rv, sources, errors] = run_cmd(args, empty_string); if (rv) { -@@ -197,7 +195,7 @@ m_version{}, m_sources{}, m_api_key{} +@@ -200,7 +198,7 @@ QuoteResult GncFQQuoteSource::get_quotes(const std::string& json_str) const { @@ -34,7 +32,7 @@ index 3003fca71f..2f2b1398e1 100644 return run_cmd(args, json_str); } -@@ -215,13 +213,13 @@ GncFQQuoteSource::run_cmd (const StrVec& args, const std::string& json_string) c +@@ -218,7 +216,7 @@ auto input_buf = bp::buffer (json_string); bp::child process; if (m_api_key.empty()) @@ -43,6 +41,8 @@ index 3003fca71f..2f2b1398e1 100644 bp::std_out > out_buf, bp::std_err > err_buf, bp::std_in < input_buf, +@@ -227,7 +225,7 @@ + #endif svc); else - process = bp::child(c_cmd, args, diff --git a/pkgs/applications/office/gnucash/0005-remove-gncquotes-online-wiggle.patch b/pkgs/applications/office/gnucash/0005-remove-gncquotes-online-wiggle.patch deleted file mode 100644 index 14b68555f36..00000000000 --- a/pkgs/applications/office/gnucash/0005-remove-gncquotes-online-wiggle.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/libgnucash/app-utils/test/gtest-gnc-quotes.cpp b/libgnucash/app-utils/test/gtest-gnc-quotes.cpp -index 8a5221d19d..d14e96cb66 100644 ---- a/libgnucash/app-utils/test/gtest-gnc-quotes.cpp -+++ b/libgnucash/app-utils/test/gtest-gnc-quotes.cpp -@@ -153,25 +153,6 @@ TEST_F(GncQuotesTest, quotable_commodities) - EXPECT_EQ(4u, commodities.size()); - } - --#ifdef HAVE_F_Q --TEST_F(GncQuotesTest, online_wiggle) --{ -- GncQuotes quotes; -- quotes.fetch(m_book); -- auto pricedb{gnc_pricedb_get_db(m_book)}; -- auto failures{quotes.failures()}; -- ASSERT_EQ(1u, failures.size()); -- EXPECT_EQ(GncQuoteError::QUOTE_FAILED, std::get<2>(failures[0])); --// EXPECT_EQ(GncQuoteError::QUOTE_FAILED, std::get<2>(failures[1])); -- EXPECT_EQ(3u, gnc_pricedb_get_num_prices(pricedb)); --} --#else --TEST_F(GncQuotesTest, fq_failure) --{ -- EXPECT_THROW(GncQuotes quotes;, GncQuoteException); --} --#endif -- - TEST_F(GncQuotesTest, offline_wiggle) - { - StrVec quote_vec{ - diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index ae843bcf0f1..7c378bc52a9 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,6 +1,8 @@ { lib , stdenv +, fetchFromGitHub , fetchurl +, fetchpatch , aqbanking , boost , cmake @@ -26,12 +28,13 @@ stdenv.mkDerivation rec { pname = "gnucash"; - version = "5.3"; + version = "5.4"; # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { - url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-FFjLCMWF6unXJL7G8oErzAO76D7SlKRqeJeqqwGm8Vo="; + # 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="; }; nativeBuildInputs = [ @@ -74,8 +77,12 @@ stdenv.mkDerivation rec { ./0003-remove-valgrind.patch # this patch makes gnucash exec the Finance::Quote wrapper directly ./0004-exec-fq-wrapper.patch - # this patch removes the online_wiggle GncQuotes test - ./0005-remove-gncquotes-online-wiggle.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 @@ -91,12 +98,29 @@ stdenv.mkDerivation rec { enableParallelChecking = true; checkTarget = "check"; + passthru.docs = stdenv.mkDerivation { + pname = "gnucash-docs"; + inherit version; + + src = fetchFromGitHub { + owner = "Gnucash"; + repo = "gnucash-docs"; + rev = version; + hash = "sha256-aPxQEcpo8SPv8lPQbxMl1wg8ijH9Rz0oo4K5lp3C/bw="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libxml2 libxslt ]; + }; + preFixup = '' gappsWrapperArgs+=( + # documentation + --prefix XDG_DATA_DIRS : ${passthru.docs}/share # db drivers location --set GNC_DBD_DIR ${libdbiDrivers}/lib/dbd - # gnome settings schemas location on Nix - --set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "${pname}-${version}"} + # gsettings schema location on Nix + --set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "gnucash-${version}"} ) ''; @@ -108,6 +132,7 @@ stdenv.mkDerivation rec { # gnc-fq-* are cli utils written in Perl hence the extra wrapping postFixup = '' wrapProgram $out/bin/gnucash "''${gappsWrapperArgs[@]}" + wrapProgram $out/bin/gnucash-cli "''${gappsWrapperArgs[@]}" wrapProgram $out/bin/finance-quote-wrapper \ --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ JSONParse FinanceQuote ]}" @@ -139,6 +164,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ domenkozar AndersonTorres rski nevivurn ]; platforms = platforms.unix; + mainProgram = "gnucash"; }; } # TODO: investigate Darwin support diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 88091fa4b03..105ec845689 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,16 +1,16 @@ { fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook -, libsoup, gnome }: +, libsoup_3, gnome }: stdenv.mkDerivation rec { pname = "homebank"; - version = "5.6.6"; + version = "5.7.1"; src = fetchurl { url = "http://homebank.free.fr/public/sources/homebank-${version}.tar.gz"; - hash = "sha256-ZW/N8YUU8r7SYY/+hqVYrqYW/KQqtuChfQJxXftl3A4="; + hash = "sha256-fwqSnXde7yalqfKfo8AT8+762/aYLMCGp8dd3bm09Ck="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; - buildInputs = [ gtk libofx libsoup gnome.adwaita-icon-theme]; + buildInputs = [ gtk libofx libsoup_3 gnome.adwaita-icon-theme]; meta = with lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/pkgs/applications/office/libreoffice/README.md b/pkgs/applications/office/libreoffice/README.md deleted file mode 100644 index a084572d217..00000000000 --- a/pkgs/applications/office/libreoffice/README.md +++ /dev/null @@ -1,9 +0,0 @@ -LibreOffice -=========== - -To generate `src-$VARIANT/download.nix`, i.e. list of additional sources that -the libreoffice build process needs to download: - - nix-shell gen-shell.nix --argstr variant VARIANT --run generate - -Where VARIANT is either `still` or `fresh`. diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index bec44b0b7ff..44d07503b2f 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, fetchpatch , lib , substituteAll , pam @@ -100,7 +99,7 @@ , langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "tr" "uk" "zh-CN" ] , withHelp ? true , kdeIntegration ? false -, mkDerivation ? null +, wrapQtAppsHook ? null , qtbase ? null , qtx11extras ? null , qtwayland ? null @@ -145,31 +144,33 @@ let }; importVariant = f: import (./. + "/src-${variant}/${f}"); - - primary-src = importVariant "primary.nix" { inherit fetchurl; }; - - inherit (primary-src) major minor version; - - langsSpaces = concatStringsSep " " langs; - - mkDrv = if kdeIntegration then mkDerivation else stdenv.mkDerivation; - + # Update these files with: + # nix-shell maintainers/scripts/update.nix --argstr package libreoffice-$VARIANT.unwrapped + version = importVariant "version.nix"; + srcsAttributes = { + main = importVariant "main.nix"; + help = importVariant "help.nix"; + translations = importVariant "translations.nix"; + deps = (importVariant "deps.nix") ++ [ + # TODO: Why is this needed? + (rec { + name = "unowinreg.dll"; + url = "https://dev-www.libreoffice.org/extern/${md5name}"; + sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; + md5 = "185d60944ea767075d27247c3162b3bc"; + md5name = "${md5}-${name}"; + }) + ]; + }; srcs = { - primary = primary-src; - third_party = - map (x: ((fetchurl { inherit (x) url sha256 name; }) // { inherit (x) md5name md5; })) - (importVariant "download.nix" ++ [ - (rec { - name = "unowinreg.dll"; - url = "https://dev-www.libreoffice.org/extern/${md5name}"; - sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; - md5 = "185d60944ea767075d27247c3162b3bc"; - md5name = "${md5}-${name}"; - }) - ]); - - translations = primary-src.translations; - help = primary-src.help; + third_party = map (x: + (fetchurl { + inherit (x) url sha256 name; + }) // { + inherit (x) md5name md5; + }) srcsAttributes.deps; + translations = fetchurl srcsAttributes.translations; + help = fetchurl srcsAttributes.help; }; # See `postPatch` for details @@ -185,13 +186,12 @@ let kwindowsystem ]); }; + tarballPath = "external/tarballs"; -in -(mkDrv rec { +in stdenv.mkDerivation (finalAttrs: { pname = "libreoffice"; inherit version; - - inherit (primary-src) src; + src = fetchurl srcsAttributes.main; env.NIX_CFLAGS_COMPILE = toString ([ "-I${librdf_rasqal}/include/rasqal" # librdf_redland refers to rasqal.h instead of rasqal/rasqal.h @@ -200,8 +200,6 @@ in "-O2" # https://bugs.gentoo.org/727188 ]); - tarballPath = "external/tarballs"; - postUnpack = '' mkdir -v $sourceRoot/${tarballPath} '' + (flip concatMapStrings srcs.third_party (f: '' @@ -215,18 +213,11 @@ in tar -xf ${srcs.translations} ''; - # Remove build config to reduce the amount of `-dev` outputs in the - # runtime closure. This was introduced in upstream commit - # cbfac11330882c7d0a817b6c37a08b2ace2b66f4, so the patch doesn't apply - # for 7.4. - patches = lib.optionals (lib.versionAtLeast version "7.5") [ + patches = [ + # Remove build config to reduce the amount of `-dev` outputs in the + # runtime closure. This behavior was introduced by upstream in commit + # cbfac11330882c7d0a817b6c37a08b2ace2b66f4 ./0001-Strip-away-BUILDCONFIG.patch - ] ++ [ - (fetchpatch { - name = "fix-curl-8.2.patch"; - url = "https://github.com/LibreOffice/core/commit/2a68dc02bd19a717d3c86873206fabed1098f228.diff"; - hash = "sha256-C+kts+oaLR3+GbnX/wrFguF7SzgerNataxP0SPxhyY8="; - }) ]; # libreoffice tries to reference the BUILDCONFIG (e.g. PKG_CONFIG_PATH) @@ -236,27 +227,9 @@ in disallowedRequisites = lib.optionals (!kdeIntegration) (lib.concatMap (x: lib.optional (x?dev) x.dev) - buildInputs); - - ### QT/KDE - # - # configure.ac assumes that the first directory that contains headers and - # libraries during its checks contains *all* the relevant headers/libs which - # obviously doesn't work for us, so we have 2 options: - # - # 1. patch configure.ac in order to specify the direct paths to various Qt/KDE - # dependencies which is ugly and brittle, or - # - # 2. use symlinkJoin to pull in the relevant dependencies and just patch in - # that path which is *also* ugly, but far less likely to break - # - # The 2nd option is not very Nix'y, but I'll take robust over nice any day. - # Additionally, it's much easier to fix if LO breaks on the next upgrade (just - # add the missing dependencies to it). - postPatch = '' - substituteInPlace shell/source/unix/exec/shellexec.cxx \ - --replace xdg-open ${if kdeIntegration then "kde-open5" else "xdg-open"} + finalAttrs.buildInputs); + postPatch = '' # configure checks for header 'gpgme++/gpgmepp_version.h', # and if it is found (no matter where) uses a hardcoded path # in what presumably is an effort to make it possible to write @@ -267,6 +240,21 @@ in 'GPGMEPP_CFLAGS=-I/usr/include/gpgme++' \ 'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++' '' + optionalString kdeIntegration '' + substituteInPlace shell/source/unix/exec/shellexec.cxx \ + --replace xdg-open kde-open5 + # configure.ac assumes that the first directory that contains headers and + # libraries during its checks contains *all* the relevant headers/libs which + # obviously doesn't work for us, so we have 2 options: + # + # 1. patch configure.ac in order to specify the direct paths to various Qt/KDE + # dependencies which is ugly and brittle, or + # + # 2. use symlinkJoin to pull in the relevant dependencies and just patch in + # that path which is *also* ugly, but far less likely to break + # + # The 2nd option is not very Nix'y, but I'll take robust over nice any day. + # Additionally, it's much easier to fix if LO breaks on the next upgrade (just + # add the missing dependencies to it). substituteInPlace configure.ac \ --replace '$QT5INC ' '$QT5INC ${kdeDeps}/include ' \ --replace '$QT5LIB ' '$QT5LIB ${kdeDeps}/lib ' \ @@ -280,7 +268,7 @@ in preConfigure = '' configureFlagsArray=( "--with-parallelism=$NIX_BUILD_CORES" - "--with-lang=${langsSpaces}" + "--with-lang=${concatStringsSep " " langs}" ); chmod a+x ./bin/unpack-sources @@ -294,102 +282,110 @@ in NOCONFIGURE=1 ./autogen.sh ''; - postConfigure = + postConfigure = '' # fetch_Download_item tries to interpret the name as a variable name, let it do so... - '' - sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile - sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile - '' - # Test fixups - # May need to be revisited/pruned, left alone for now. - + '' - # unit test sd_tiledrendering seems to be fragile - # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html - echo > ./sd/CppunitTest_sd_tiledrendering.mk - sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk - # Pivot chart tests. Fragile. - sed -e '/CPPUNIT_TEST(testRoundtrip)/d' -i chart2/qa/extras/PivotChartTest.cxx - sed -e '/CPPUNIT_TEST(testPivotTableMedianODS)/d' -i sc/qa/unit/pivottable_filters_test.cxx - # one more fragile test? - sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx - # this I actually hate, this should be a data consistency test! - sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx - # rendering-dependent test - # tilde expansion in path processing checks the existence of $HOME - sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx - # fails on systems using ZFS, see https://github.com/NixOS/nixpkgs/issues/19071 - sed -e '/CPPUNIT_TEST(getSystemPathFromFileURL_005);/d' -i './sal/qa/osl/file/osl_File.cxx' - # rendering-dependent: on my computer the test table actually doesn't fit… - # interesting fact: test disabled on macOS by upstream - sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx - # Segfault on DB access — maybe temporarily acceptable for a new version of Fresh? - sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk - # one more fragile test? - sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx - # rendering-dependent tests - sed -e '/CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape)/d' -i sc/qa/unit/filters-test.cxx - sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx - sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx - sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx - sed -z -r -e 's/DECLARE_OOXMLIMPORT_TEST[(]testTdf112443,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlimport/ooxmlimport.cxx - sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx - # not sure about this fragile test - sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx - # bunch of new Fresh failures. Sigh. - sed -e '/CPPUNIT_TEST(testDocumentLayout);/d' -i './sd/qa/unit/import-tests.cxx' - sed -e '/CPPUNIT_TEST(testErrorBarDataRangeODS);/d' -i './chart2/qa/extras/chart2export.cxx' - sed -e '/CPPUNIT_TEST(testLabelStringODS);/d' -i './chart2/qa/extras/chart2export.cxx' - sed -e '/CPPUNIT_TEST(testAxisNumberFormatODS);/d' -i './chart2/qa/extras/chart2export.cxx' - sed -e '/CPPUNIT_TEST(testBackgroundImage);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testFdo84043);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf97630);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf80020);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf62176);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testEmbeddedPdf);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testEmbeddedText);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf98477);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testTdf50499);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf100926);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testPageWithTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTextRotation);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf113818);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf119629);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf113822);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf105739);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testPageBitmapWithTransparency);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testTdf115005);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_On);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_Off);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testTdf44774);/d' -i './sd/qa/unit/misc-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf38225);/d' -i './sd/qa/unit/misc-tests.cxx' - sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testFdo85554);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' - sed -e '/CPPUNIT_TEST(testEmbeddedDataSource);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' - sed -e '/CPPUNIT_TEST(testTdf96479);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' - sed -e '/CPPUNIT_TEST(testInconsistentBookmark);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' - sed -e /CppunitTest_sw_layoutwriter/d -i sw/Module_sw.mk - sed -e /CppunitTest_sw_htmlimport/d -i sw/Module_sw.mk - sed -e /CppunitTest_sw_core_layout/d -i sw/Module_sw.mk - sed -e /CppunitTest_sw_uiwriter6/d -i sw/Module_sw.mk - sed -e /CppunitTest_sdext_pdfimport/d -i sdext/Module_sdext.mk - sed -e /CppunitTest_vcl_pdfexport/d -i vcl/Module_vcl.mk - sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlexport9.cxx" - sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx" - sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx" - sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/unowriter/unowriter.cxx" - - # testReqIfTable fails since libxml2: 2.10.3 -> 2.10.4 - sed -e 's@.*"/html/body/div/table/tr/th".*@//&@' -i sw/qa/extras/htmlexport/htmlexport.cxx - '' - # This to avoid using /lib:/usr/lib at linking - + '' - sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk - - find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \; - ''; + sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile + sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile + '' /* Test fixups. May need to be revisited/pruned, left alone for now. */ + '' + # unit test sd_tiledrendering seems to be fragile + # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html + echo > ./sd/CppunitTest_sd_tiledrendering.mk + sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk + # Pivot chart tests. Fragile. + sed -e '/CPPUNIT_TEST(testRoundtrip)/d' -i chart2/qa/extras/PivotChartTest.cxx + sed -e '/CPPUNIT_TEST(testPivotTableMedianODS)/d' -i sc/qa/unit/pivottable_filters_test.cxx + # one more fragile test? + sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx + # this I actually hate, this should be a data consistency test! + sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx + # rendering-dependent test + # tilde expansion in path processing checks the existence of $HOME + sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx + # fails on systems using ZFS, see https://github.com/NixOS/nixpkgs/issues/19071 + sed -e '/CPPUNIT_TEST(getSystemPathFromFileURL_005);/d' -i './sal/qa/osl/file/osl_File.cxx' + # rendering-dependent: on my computer the test table actually doesn't fit… + # interesting fact: test disabled on macOS by upstream + sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx + # Segfault on DB access — maybe temporarily acceptable for a new version of Fresh? + sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk + # one more fragile test? + sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx + # rendering-dependent tests + sed -e '/CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape)/d' -i sc/qa/unit/filters-test.cxx + sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx + sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx + sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx + sed -z -r -e 's/DECLARE_OOXMLIMPORT_TEST[(]testTdf112443,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlimport/ooxmlimport.cxx + sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx + # not sure about this fragile test + sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx + # bunch of new Fresh failures. Sigh. + sed -e '/CPPUNIT_TEST(testDocumentLayout);/d' -i './sd/qa/unit/import-tests.cxx' + sed -e '/CPPUNIT_TEST(testErrorBarDataRangeODS);/d' -i './chart2/qa/extras/chart2export.cxx' + sed -e '/CPPUNIT_TEST(testLabelStringODS);/d' -i './chart2/qa/extras/chart2export.cxx' + sed -e '/CPPUNIT_TEST(testAxisNumberFormatODS);/d' -i './chart2/qa/extras/chart2export.cxx' + sed -e '/CPPUNIT_TEST(testBackgroundImage);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testFdo84043);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf97630);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf80020);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf62176);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedPdf);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedText);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf98477);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf50499);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf100926);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testPageWithTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTextRotation);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf113818);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf119629);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf113822);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf105739);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testPageBitmapWithTransparency);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf115005);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_On);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_Off);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf44774);/d' -i './sd/qa/unit/misc-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf38225);/d' -i './sd/qa/unit/misc-tests.cxx' + sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testFdo85554);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedDataSource);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(testTdf96479);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(testInconsistentBookmark);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' + sed -e /CppunitTest_sw_layoutwriter/d -i sw/Module_sw.mk + sed -e /CppunitTest_sw_htmlimport/d -i sw/Module_sw.mk + sed -e /CppunitTest_sw_core_layout/d -i sw/Module_sw.mk + sed -e /CppunitTest_sw_uiwriter6/d -i sw/Module_sw.mk + sed -e /CppunitTest_sdext_pdfimport/d -i sdext/Module_sdext.mk + sed -e /CppunitTest_vcl_pdfexport/d -i vcl/Module_vcl.mk + sed -e /CppunitTest_sc_ucalc_formula/d -i sc/Module_sc.mk + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlexport9.cxx" + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx" + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx" + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/unowriter/unowriter.cxx" + + sed -e '/CPPUNIT_ASSERT(!bRTL);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(0, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(4, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(11, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(18, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(3, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(9, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(17, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(22, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + + # testReqIfTable fails since libxml2: 2.10.3 -> 2.10.4 + sed -e 's@.*"/html/body/div/table/tr/th".*@//&@' -i sw/qa/extras/htmlexport/htmlexport.cxx + '' /* This to avoid using /lib:/usr/lib at linking */ + '' + sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk + + find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \; + '' + optionalString stdenv.isAarch64 '' + sed -e '/CPPUNIT_TEST(testStatisticalFormulasFODS);/d' -i './sc/qa/unit/functions_statistical.cxx' + ''; makeFlags = [ "SHELL=${bash}/bin/bash" ]; @@ -406,13 +402,6 @@ in cp -r sysui/desktop/icons "$out/share" sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop - - # Install dolphin templates, like debian does - install -D extras/source/shellnew/soffice.* --target-directory="$out/share/templates/.source" - cp ${substituteAll {src = ./soffice-template.desktop; app="Writer"; ext="odt"; type="text"; }} $out/share/templates/soffice.odt.desktop - cp ${substituteAll {src = ./soffice-template.desktop; app="Calc"; ext="ods"; type="spreadsheet"; }} $out/share/templates/soffice.ods.desktop - cp ${substituteAll {src = ./soffice-template.desktop; app="Impress"; ext="odp"; type="presentation";}} $out/share/templates/soffice.odp.desktop - cp ${substituteAll {src = ./soffice-template.desktop; app="Draw"; ext="odg"; type="drawing"; }} $out/share/templates/soffice.odg.desktop ''; # Wrapping is done in ./wrapper.nix @@ -475,16 +464,26 @@ in "--without-system-libqxp" "--without-system-dragonbox" "--without-system-libfixmath" + # the "still" variant doesn't support Nixpkgs' mdds 2.1, only mdds 2.0 + ] ++ optionals (variant == "still") [ + "--without-system-mdds" + ] ++ optionals (variant == "fresh") [ "--with-system-mdds" + ] ++ [ # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" "--without-system-xmlsec" - "--without-system-cuckoo" "--without-system-zxing" ] ++ optionals kdeIntegration [ "--enable-kf5" "--enable-qt5" "--enable-gtk3-kde5" + ] ++ optionals (variant == "fresh") [ + "--without-system-dragonbox" + "--without-system-libfixmath" + # Technically needed only when kdeIntegration is enabled in the "fresh" + # variant. Won't hurt to put it here for every "fresh" variant. + "--without-system-frozen" ]; checkTarget = concatStringsSep " " [ @@ -501,9 +500,11 @@ in jdk17 libtool pkg-config + ] ++ optionals kdeIntegration [ + wrapQtAppsHook ]; - buildInputs = with xorg; [ + buildInputs = with xorg; finalAttrs.passthru.gst_packages ++ [ ArchiveZip CoinMP IOCompress @@ -572,6 +573,7 @@ in libxshmfence libxslt libzmf + libwebp mdds mythes ncurses @@ -592,14 +594,23 @@ in which zip zlib - ] - ++ passthru.gst_packages - ++ optionals kdeIntegration [ qtbase qtx11extras kcoreaddons kio ] - ++ optionals (lib.versionAtLeast (lib.versions.majorMinor version) "7.4") [ libwebp ]; + ] ++ optionals kdeIntegration [ + qtbase + qtx11extras + kcoreaddons + kio + ]; passthru = { inherit srcs; jdk = jre'; + updateScript = [ + ./update.sh + # Pass it this file name as argument + (builtins.unsafeGetAttrPos "pname" finalAttrs.finalPackage).file + # And the variant + variant + ]; inherit kdeIntegration; # For the wrapper.nix inherit gtk3; @@ -656,4 +667,4 @@ in maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; -}).overrideAttrs ((importVariant "override.nix") (args // { inherit kdeIntegration; })) +}) diff --git a/pkgs/applications/office/libreoffice/download-list-builder.sh b/pkgs/applications/office/libreoffice/download-list-builder.sh deleted file mode 100644 index 31cab28fd82..00000000000 --- a/pkgs/applications/office/libreoffice/download-list-builder.sh +++ /dev/null @@ -1,4 +0,0 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi -source $stdenv/setup - -tar --extract --file=$src libreoffice-$version/download.lst -O > $out diff --git a/pkgs/applications/office/libreoffice/gen-shell.nix b/pkgs/applications/office/libreoffice/gen-shell.nix deleted file mode 100644 index 7429bb0cb38..00000000000 --- a/pkgs/applications/office/libreoffice/gen-shell.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ pkgs ? (import <nixpkgs> {}), variant }: - -with pkgs; - -let - - primary-src = callPackage (./. + "/src-${variant}/primary.nix") {}; - -in - -stdenv.mkDerivation { - name = "generate-libreoffice-srcs-shell"; - - buildCommand = "exit 1"; - - downloadList = stdenv.mkDerivation { - name = "libreoffice-${primary-src.version}-download-list"; - inherit (primary-src) src version; - builder = ./download-list-builder.sh; - }; - - buildInputs = [ python3 ]; - - shellHook = '' - function generate { - python3 generate-libreoffice-srcs.py ${variant} > src-${variant}/download.nix - } - ''; -} diff --git a/pkgs/applications/office/libreoffice/gpgme-1.18.patch b/pkgs/applications/office/libreoffice/gpgme-1.18.patch deleted file mode 100644 index f554371e91b..00000000000 --- a/pkgs/applications/office/libreoffice/gpgme-1.18.patch +++ /dev/null @@ -1,10 +0,0 @@ -The way this check mixes C and C++ started to cause issues since gpgme 1.18.0 -But we can confidently skip the function check anyway. ---- a/configure.ac -+++ b/configure.ac -@@ -12302,4 +12302 @@ -- # progress_callback is the only func with plain C linkage -- # checking for it also filters out older, KDE-dependent libgpgmepp versions -- AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ], -- [AC_MSG_ERROR(gpgmepp not found or not functional)], []) -+ GPGMEPP_LIBS=-lgpgmepp diff --git a/pkgs/applications/office/libreoffice/poppler-22-04-0.patch b/pkgs/applications/office/libreoffice/poppler-22-04-0.patch deleted file mode 100644 index c907bf1680b..00000000000 --- a/pkgs/applications/office/libreoffice/poppler-22-04-0.patch +++ /dev/null @@ -1,100 +0,0 @@ -Patch from OpenSUSE -https://build.opensuse.org/package/view_file/LibreOffice:Factory/libreoffice/poppler-22-04-0.patch?expand=1&rev=45e176f964509ebe3560d0dbf1ec8be9 -Index: libreoffice-7.3.3.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -=================================================================== ---- libreoffice-7.3.3.1.orig/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ libreoffice-7.3.3.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -474,12 +474,21 @@ int PDFOutDev::parseFont( long long nNew - { - // TODO(P3): Unfortunately, need to read stream twice, since - // we must write byte count to stdout before -+#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed -+ auto pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef()); -+ if ( pBuf ) -+ { -+ aNewFont.isEmbedded = true; -+ nSize = pBuf->size(); -+ } -+#else - char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); - if( pBuf ) - { - aNewFont.isEmbedded = true; - gfree(pBuf); - } -+#endif - } - - m_aFontMap[ nNewId ] = aNewFont; -@@ -492,21 +501,35 @@ void PDFOutDev::writeFontFile( GfxFont* - return; - - int nSize = 0; -+#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed -+ auto pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef()); -+ if ( !pBuf ) -+ return; -+ nSize = pBuf->size(); -+#else - char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); - if( !pBuf ) - return; -+#endif - - // ---sync point--- see SYNC STREAMS above - fflush(stdout); - -+#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed -+ if( fwrite(pBuf->data(), sizeof(unsigned char), nSize, g_binary_out) != static_cast<size_t>(nSize) ) -+ { -+#else - if( fwrite(pBuf, sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) ) - { - gfree(pBuf); -+#endif - exit(1); // error - } - // ---sync point--- see SYNC STREAMS above - fflush(g_binary_out); -+#if !POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed - gfree(pBuf); -+#endif - } - - #if POPPLER_CHECK_VERSION(0, 83, 0) -@@ -759,7 +782,11 @@ void PDFOutDev::updateFont(GfxState *sta - { - assert(state); - -+#if POPPLER_CHECK_VERSION(22, 04, 0) -+ std::shared_ptr<GfxFont> gfxFont = state->getFont(); -+#else - GfxFont *gfxFont = state->getFont(); -+#endif - if( !gfxFont ) - return; - -@@ -776,7 +803,11 @@ void PDFOutDev::updateFont(GfxState *sta - m_aFontMap.find( fontID ); - if( it == m_aFontMap.end() ) - { -+#if POPPLER_CHECK_VERSION(22, 04, 0) -+ nEmbedSize = parseFont( fontID, gfxFont.get(), state ); -+#else - nEmbedSize = parseFont( fontID, gfxFont, state ); -+#endif - it = m_aFontMap.find( fontID ); - } - -@@ -806,7 +837,11 @@ void PDFOutDev::updateFont(GfxState *sta - - if (nEmbedSize) - { -+#if POPPLER_CHECK_VERSION(22, 04, 0) -+ writeFontFile(gfxFont.get()); -+#else - writeFontFile(gfxFont); -+#endif - } - } - diff --git a/pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch b/pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch deleted file mode 100644 index d3ae91835ad..00000000000 --- a/pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/i18npool/qa/cppunit/test_breakiterator.cxx -+++ b/i18npool/qa/cppunit/test_breakiterator.cxx -@@ -35,7 +35,7 @@ public: - void testWeak(); - void testAsian(); - void testThai(); --#if (U_ICU_VERSION_MAJOR_NUM > 51) -+#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70) - void testLao(); - #ifdef TODO - void testNorthernThai(); -@@ -52,7 +52,7 @@ public: - CPPUNIT_TEST(testWeak); - CPPUNIT_TEST(testAsian); - CPPUNIT_TEST(testThai); --#if (U_ICU_VERSION_MAJOR_NUM > 51) -+#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70) - CPPUNIT_TEST(testLao); - #ifdef TODO - CPPUNIT_TEST(testKhmer); -@@ -843,7 +843,7 @@ void TestBreakIterator::testAsian() - } - } - --#if (U_ICU_VERSION_MAJOR_NUM > 51) -+#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70) - //A test to ensure that our Lao word boundary detection is useful - void TestBreakIterator::testLao() - { diff --git a/pkgs/applications/office/libreoffice/soffice-template.desktop b/pkgs/applications/office/libreoffice/soffice-template.desktop deleted file mode 100644 index 4adb91284a9..00000000000 --- a/pkgs/applications/office/libreoffice/soffice-template.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Name=LibreOffice @app@... -Comment=Enter LibreOffice @app@ filename: -Type=Link -URL=.source/soffice.@ext@ -Icon=libreoffice-oasis-@type@ diff --git a/pkgs/applications/office/libreoffice/src-still/download.nix b/pkgs/applications/office/libreoffice/src-fresh/deps.nix index c74bd2716e8..cea715cd1cf 100644 --- a/pkgs/applications/office/libreoffice/src-still/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/deps.nix @@ -7,11 +7,11 @@ md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; } { - name = "boost_1_79_0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/boost_1_79_0.tar.xz"; - sha256 = "2058aa88758a0e1aaac1759b3c4bad2526f899c6ecc6eeea79aa5e8fd3ea95dc"; + name = "boost_1_82_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_82_0.tar.xz"; + sha256 = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de"; md5 = ""; - md5name = "2058aa88758a0e1aaac1759b3c4bad2526f899c6ecc6eeea79aa5e8fd3ea95dc-boost_1_79_0.tar.xz"; + md5name = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de-boost_1_82_0.tar.xz"; } { name = "box2d-2.4.1.tar.gz"; @@ -98,11 +98,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.0.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.0.1.tar.xz"; - sha256 = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0"; + name = "curl-8.2.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.2.1.tar.xz"; + sha256 = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894"; md5 = ""; - md5name = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0-curl-8.0.1.tar.xz"; + md5name = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894-curl-8.2.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -154,11 +154,11 @@ md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2"; } { - name = "fontconfig-2.13.94.tar.xz"; - url = "https://dev-www.libreoffice.org/src/fontconfig-2.13.94.tar.xz"; - sha256 = "a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c"; + name = "fontconfig-2.14.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/fontconfig-2.14.2.tar.xz"; + sha256 = "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b"; md5 = ""; - md5name = "a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c-fontconfig-2.13.94.tar.xz"; + md5name = "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b-fontconfig-2.14.2.tar.xz"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -210,34 +210,6 @@ md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; } { - name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz"; - url = "https://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; - sha256 = "09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f"; - md5 = "907d6e99f241876695c19ff3db0b8923"; - md5name = "907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; - } - { - name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; - url = "https://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; - sha256 = "e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61"; - md5 = "edc4d741888bc0d38e32dbaa17149596"; - md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; - } - { - name = "source-serif-pro-3.000R.tar.gz"; - url = "https://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz"; - sha256 = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3"; - md5 = ""; - md5name = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3-source-serif-pro-3.000R.tar.gz"; - } - { - name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; - url = "https://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; - sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7"; - md5 = ""; - md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz"; - } - { name = "noto-fonts-20171024.tar.gz"; url = "https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz"; sha256 = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994"; @@ -266,18 +238,11 @@ md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; } { - name = "Amiri-0.117.zip"; - url = "https://dev-www.libreoffice.org/src/Amiri-0.117.zip"; - sha256 = "9c4e768893e0023a0ad6f488d5c84bd5add6565d3dcadb838ba5b20e75fcc9a7"; + name = "Amiri-1.000.zip"; + url = "https://dev-www.libreoffice.org/src/Amiri-1.000.zip"; + sha256 = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30"; md5 = ""; - md5name = "9c4e768893e0023a0ad6f488d5c84bd5add6565d3dcadb838ba5b20e75fcc9a7-Amiri-0.117.zip"; - } - { - name = "ttf-kacst_2.01+mry.tar.gz"; - url = "https://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz"; - sha256 = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56"; - md5 = ""; - md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz"; + md5name = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30-Amiri-1.000.zip"; } { name = "ReemKufi-1.2.zip"; @@ -301,11 +266,18 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.12.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/freetype-2.12.0.tar.xz"; - sha256 = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033"; + name = "freetype-2.13.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/freetype-2.13.0.tar.xz"; + sha256 = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c"; md5 = ""; - md5name = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033-freetype-2.12.0.tar.xz"; + md5name = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c-freetype-2.13.0.tar.xz"; + } + { + name = "frozen-1.1.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/frozen-1.1.1.tar.gz"; + sha256 = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45"; + md5 = ""; + md5name = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45-frozen-1.1.1.tar.gz"; } { name = "glm-0.9.9.8.zip"; @@ -329,11 +301,11 @@ md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; } { - name = "harfbuzz-7.1.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/harfbuzz-7.1.0.tar.xz"; - sha256 = "f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b"; + name = "harfbuzz-8.0.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/harfbuzz-8.0.0.tar.xz"; + sha256 = "1f98b5e3d06a344fe667d7e8210094ced458791499839bddde98c167ce6a7c79"; md5 = ""; - md5name = "f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b-harfbuzz-7.1.0.tar.xz"; + md5name = "1f98b5e3d06a344fe667d7e8210094ced458791499839bddde98c167ce6a7c79-harfbuzz-8.0.0.tar.xz"; } { name = "hsqldb_1_8_0.zip"; @@ -343,11 +315,11 @@ md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; } { - name = "hunspell-1.7.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz"; - sha256 = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951"; + name = "hunspell-1.7.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/hunspell-1.7.2.tar.gz"; + sha256 = "11ddfa39afe28c28539fe65fc4f1592d410c1e9b6dd7d8a91ca25d85e9ec65b8"; md5 = ""; - md5name = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951-hunspell-1.7.0.tar.gz"; + md5name = "11ddfa39afe28c28539fe65fc4f1592d410c1e9b6dd7d8a91ca25d85e9ec65b8-hunspell-1.7.2.tar.gz"; } { name = "hyphen-2.8.8.tar.gz"; @@ -357,18 +329,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-71_1-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-71_1-src.tgz"; - sha256 = "67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf"; + name = "icu4c-73_2-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-73_2-src.tgz"; + sha256 = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1"; md5 = ""; - md5name = "67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf-icu4c-71_1-src.tgz"; + md5name = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1-icu4c-73_2-src.tgz"; } { - name = "icu4c-71_1-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-71_1-data.zip"; - sha256 = "e3882b4fece6e5e039f22c3189b7ba224180fd26fdbfa9db284617455b93e804"; + name = "icu4c-73_2-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-73_2-data.zip"; + sha256 = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701"; md5 = ""; - md5name = "e3882b4fece6e5e039f22c3189b7ba224180fd26fdbfa9db284617455b93e804-icu4c-71_1-data.zip"; + md5name = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701-icu4c-73_2-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -448,18 +420,18 @@ md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { - name = "libjpeg-turbo-2.1.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.2.tar.gz"; - sha256 = "09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5"; + name = "libjpeg-turbo-2.1.5.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.5.1.tar.gz"; + sha256 = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf"; md5 = ""; - md5name = "09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5-libjpeg-turbo-2.1.2.tar.gz"; + md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - name = "language-subtag-registry-2022-08-08.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2022-08-08.tar.bz2"; - sha256 = "e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00"; + name = "language-subtag-registry-2023-05-11.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2023-05-11.tar.bz2"; + sha256 = "9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da"; md5 = ""; - md5name = "e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00-language-subtag-registry-2022-08-08.tar.bz2"; + md5name = "9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da-language-subtag-registry-2023-05-11.tar.bz2"; } { name = "lcms2-2.12.tar.gz"; @@ -469,11 +441,11 @@ md5name = "18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5-lcms2-2.12.tar.gz"; } { - name = "libassuan-2.5.5.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libassuan-2.5.5.tar.bz2"; - sha256 = "8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4"; + name = "libassuan-2.5.6.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libassuan-2.5.6.tar.bz2"; + sha256 = "e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426"; md5 = ""; - md5name = "8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4-libassuan-2.5.5.tar.bz2"; + md5name = "e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426-libassuan-2.5.6.tar.bz2"; } { name = "libatomic_ops-7.6.8.tar.gz"; @@ -525,39 +497,39 @@ md5name = "5dcb4db3b2340f81f601ce86d8d76b69e34d70f84f804192c901e4b7f84d5fb0-libnumbertext-1.0.11.tar.xz"; } { - name = "ltm-1.0.zip"; - url = "https://dev-www.libreoffice.org/src/ltm-1.0.zip"; - sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483"; + name = "ltm-1.2.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/ltm-1.2.0.tar.xz"; + sha256 = "b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1"; md5 = ""; - md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; + md5name = "b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1-ltm-1.2.0.tar.xz"; } { - name = "libwebp-1.2.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libwebp-1.2.4.tar.gz"; - sha256 = "7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df"; + name = "libwebp-1.3.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libwebp-1.3.2.tar.gz"; + sha256 = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4"; md5 = ""; - md5name = "7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df-libwebp-1.2.4.tar.gz"; + md5name = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4-libwebp-1.3.2.tar.gz"; } { - name = "xmlsec1-1.2.34.tar.gz"; - url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.34.tar.gz"; - sha256 = "52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262"; + name = "xmlsec1-1.2.37.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.37.tar.gz"; + sha256 = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c"; md5 = ""; - md5name = "52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262-xmlsec1-1.2.34.tar.gz"; + md5name = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c-xmlsec1-1.2.37.tar.gz"; } { - name = "libxml2-2.10.4.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.10.4.tar.xz"; - sha256 = "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45"; + name = "libxml2-2.11.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.11.4.tar.xz"; + sha256 = "737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7"; md5 = ""; - md5name = "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45-libxml2-2.10.4.tar.xz"; + md5name = "737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7-libxml2-2.11.4.tar.xz"; } { - name = "libxslt-1.1.35.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxslt-1.1.35.tar.xz"; - sha256 = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79"; + name = "libxslt-1.1.38.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.38.tar.xz"; + sha256 = "1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1"; md5 = ""; - md5name = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79-libxslt-1.1.35.tar.xz"; + md5name = "1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1-libxslt-1.1.38.tar.xz"; } { name = "lp_solve_5.5.tar.gz"; @@ -581,11 +553,11 @@ md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz"; } { - name = "mdds-2.0.3.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/mdds-2.0.3.tar.bz2"; - sha256 = "9771fe42e133443c13ca187253763e17c8bc96a1a02aec9e1e8893367ffa9ce5"; + name = "mdds-2.1.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/mdds-2.1.1.tar.xz"; + sha256 = "1483d90cefb8aa4563c4d0a85cb7b243aa95217d235d422e9ca6722fd5b97e56"; md5 = ""; - md5name = "9771fe42e133443c13ca187253763e17c8bc96a1a02aec9e1e8893367ffa9ce5-mdds-2.0.3.tar.bz2"; + md5name = "1483d90cefb8aa4563c4d0a85cb7b243aa95217d235d422e9ca6722fd5b97e56-mdds-2.1.1.tar.xz"; } { name = "mDNSResponder-878.200.35.tar.gz"; @@ -609,18 +581,18 @@ md5name = "e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c-libmwaw-0.3.21.tar.xz"; } { - name = "mythes-1.2.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; - sha256 = "1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f"; - md5 = "a8c2c5b8f09e7ede322d5c602ff6a4b6"; - md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; + name = "mythes-1.2.5.tar.xz"; + url = "https://dev-www.libreoffice.org/src/mythes-1.2.5.tar.xz"; + sha256 = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d"; + md5 = ""; + md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz"; } { - name = "nss-3.88.1-with-nspr-4.35.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.88.1-with-nspr-4.35.tar.gz"; - sha256 = "fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a"; + name = "nss-3.90-with-nspr-4.35.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.90-with-nspr-4.35.tar.gz"; + sha256 = "f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739"; md5 = ""; - md5name = "fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a-nss-3.88.1-with-nspr-4.35.tar.gz"; + md5name = "f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739-nss-3.90-with-nspr-4.35.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; @@ -644,25 +616,25 @@ md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; } { - name = "openldap-2.4.59.tgz"; - url = "https://dev-www.libreoffice.org/src/openldap-2.4.59.tgz"; - sha256 = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34"; + name = "openldap-2.6.6.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.6.6.tgz"; + sha256 = "082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0"; md5 = ""; - md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz"; + md5name = "082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0-openldap-2.6.6.tgz"; } { - name = "openssl-1.1.1t.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-1.1.1t.tar.gz"; - sha256 = "8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b"; + name = "openssl-3.0.10.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-3.0.10.tar.gz"; + sha256 = "1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323"; md5 = ""; - md5name = "8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b-openssl-1.1.1t.tar.gz"; + md5name = "1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323-openssl-3.0.10.tar.gz"; } { - name = "liborcus-0.17.2.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/liborcus-0.17.2.tar.bz2"; - sha256 = "2a86c405a5929f749b27637509596421d46805753364ab258b035fd01fbde143"; + name = "liborcus-0.18.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/liborcus-0.18.1.tar.xz"; + sha256 = "6006b9f1576315e313df715a7e72a17f3e0b17d7b6bd119cfa8a0b608ce971eb"; md5 = ""; - md5name = "2a86c405a5929f749b27637509596421d46805753364ab258b035fd01fbde143-liborcus-0.17.2.tar.bz2"; + md5name = "6006b9f1576315e313df715a7e72a17f3e0b17d7b6bd119cfa8a0b608ce971eb-liborcus-0.18.1.tar.xz"; } { name = "libpagemaker-0.0.4.tar.xz"; @@ -672,11 +644,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-5058.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-5058.tar.bz2"; - sha256 = "eaf4ce9fad32b5d951c524139df23119b66c67720057defb97acab2dfb2582ac"; + name = "pdfium-5778.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-5778.tar.bz2"; + sha256 = "b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06"; md5 = ""; - md5name = "eaf4ce9fad32b5d951c524139df23119b66c67720057defb97acab2dfb2582ac-pdfium-5058.tar.bz2"; + md5name = "b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06-pdfium-5778.tar.bz2"; } { name = "pixman-0.42.2.tar.gz"; @@ -686,46 +658,46 @@ md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz"; } { - name = "libpng-1.6.39.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libpng-1.6.39.tar.xz"; - sha256 = "1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937"; + name = "libpng-1.6.40.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.40.tar.xz"; + sha256 = "535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1"; md5 = ""; - md5name = "1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937-libpng-1.6.39.tar.xz"; + md5name = "535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1-libpng-1.6.40.tar.xz"; } { - name = "tiff-4.5.0rc3.tar.xz"; - url = "https://dev-www.libreoffice.org/src/tiff-4.5.0rc3.tar.xz"; - sha256 = "dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c"; + name = "tiff-4.5.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/tiff-4.5.1.tar.xz"; + sha256 = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a"; md5 = ""; - md5name = "dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c-tiff-4.5.0rc3.tar.xz"; + md5name = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a-tiff-4.5.1.tar.xz"; } { - name = "poppler-22.12.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-22.12.0.tar.xz"; - sha256 = "d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0"; + name = "poppler-23.06.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-23.06.0.tar.xz"; + sha256 = "d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65"; md5 = ""; - md5name = "d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0-poppler-22.12.0.tar.xz"; + md5name = "d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65-poppler-23.06.0.tar.xz"; } { - name = "poppler-data-0.4.11.tar.gz"; - url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.11.tar.gz"; - sha256 = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c"; + name = "poppler-data-0.4.12.tar.gz"; + url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.12.tar.gz"; + sha256 = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74"; md5 = ""; - md5name = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c-poppler-data-0.4.11.tar.gz"; + md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz"; } { - name = "postgresql-13.10.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-13.10.tar.bz2"; - sha256 = "5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2"; + name = "postgresql-13.11.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-13.11.tar.bz2"; + sha256 = "4992ff647203566b670d4e54dc5317499a26856c93576d0ea951bdf6bee50bfb"; md5 = ""; - md5name = "5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2-postgresql-13.10.tar.bz2"; + md5name = "4992ff647203566b670d4e54dc5317499a26856c93576d0ea951bdf6bee50bfb-postgresql-13.11.tar.bz2"; } { - name = "Python-3.8.16.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.8.16.tar.xz"; - sha256 = "d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562"; + name = "Python-3.8.18.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.8.18.tar.xz"; + sha256 = "3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f"; md5 = ""; - md5name = "d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562-Python-3.8.16.tar.xz"; + md5name = "3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f-Python-3.8.18.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -770,11 +742,11 @@ md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; } { - name = "skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"; - sha256 = "c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9"; + name = "skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"; + sha256 = "0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9"; md5 = ""; - md5name = "c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9-skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"; + md5name = "0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9-skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; @@ -798,13 +770,6 @@ md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz"; } { - name = "ucpp-1.3.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; - sha256 = "983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776"; - md5 = "0168229624cfac409e766913506961a8"; - md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; - } - { name = "libvisio-0.1.7.tar.xz"; url = "https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"; @@ -819,11 +784,11 @@ md5name = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09-libwpd-0.10.3.tar.xz"; } { - name = "libwpg-0.3.3.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz"; - sha256 = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c"; + name = "libwpg-0.3.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwpg-0.3.4.tar.xz"; + sha256 = "b55fda9440d1e070630eb2487d8b8697cf412c214a27caee9df69cec7c004de3"; md5 = ""; - md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz"; + md5name = "b55fda9440d1e070630eb2487d8b8697cf412c214a27caee9df69cec7c004de3-libwpg-0.3.4.tar.xz"; } { name = "libwps-0.4.12.tar.xz"; @@ -854,10 +819,10 @@ md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; } { - name = "zxing-cpp-1.2.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/zxing-cpp-1.2.0.tar.gz"; - sha256 = "653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a"; + name = "zxing-cpp-2.0.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.0.0.tar.gz"; + sha256 = "12b76b7005c30d34265fc20356d340da179b0b4d43d2c1b35bcca86776069f76"; md5 = ""; - md5name = "653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a-zxing-cpp-1.2.0.tar.gz"; + md5name = "12b76b7005c30d34265fc20356d340da179b0b4d43d2c1b35bcca86776069f76-zxing-cpp-2.0.0.tar.gz"; } ] diff --git a/pkgs/applications/office/libreoffice/src-fresh/help.nix b/pkgs/applications/office/libreoffice/src-fresh/help.nix new file mode 100644 index 00000000000..af319ca97a3 --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-fresh/help.nix @@ -0,0 +1,4 @@ +{ + sha256 = "0j6idhdywnbl0qaimf1ahxaqvp9s0y2hfrbcbmw32c30g812gp3b"; + url = "https://download.documentfoundation.org/libreoffice/src/7.6.2/libreoffice-help-7.6.2.1.tar.xz"; +} diff --git a/pkgs/applications/office/libreoffice/src-fresh/main.nix b/pkgs/applications/office/libreoffice/src-fresh/main.nix new file mode 100644 index 00000000000..52f29a20681 --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-fresh/main.nix @@ -0,0 +1,4 @@ +{ + sha256 = "18lw5gnjihjwzdsk6xql7ax5lasykxxvg5bp40q4rqics0xp7lp5"; + url = "https://download.documentfoundation.org/libreoffice/src/7.6.2/libreoffice-7.6.2.1.tar.xz"; +} diff --git a/pkgs/applications/office/libreoffice/src-fresh/override.nix b/pkgs/applications/office/libreoffice/src-fresh/override.nix deleted file mode 100644 index 148c674f507..00000000000 --- a/pkgs/applications/office/libreoffice/src-fresh/override.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, kdeIntegration, ... }: -attrs: -{ - postConfigure = attrs.postConfigure + '' - sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' - sed -e '/CPPUNIT_ASSERT(!bRTL);/d' -i './vcl/qa/cppunit/text.cxx' - - sed -e '/CPPUNIT_ASSERT_EQUAL(0, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(4, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(11, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(18, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - - sed -e '/CPPUNIT_ASSERT_EQUAL(3, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(9, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(17, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(22, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - ''; - configureFlags = attrs.configureFlags ++ [ - "--without-system-dragonbox" - "--without-system-libfixmath" - ]; -} diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix deleted file mode 100644 index e9dc428749b..00000000000 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ fetchurl }: - -rec { - fetchSrc = {name, hash}: fetchurl { - url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; - sha256 = hash; - }; - - major = "7"; - minor = "5"; - patch = "4"; - tweak = "1"; - - subdir = "${major}.${minor}.${patch}"; - - version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; - - src = fetchurl { - url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - hash = "sha256-dWE7yXldkiEnsJOxfxyZ9p05eARqexgRRgNV158VVF4="; - }; - - # FIXME rename - translations = fetchSrc { - name = "translations"; - hash = "sha256-dv3L8DtdxZcwmeXnqtTtwIpOvwZg3aH3VvJBiiZzbh0="; - }; - - # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from - # it and LibreOffice can use these by pointing DICPATH environment variable at the hunspell directory - - help = fetchSrc { - name = "help"; - hash = "sha256-2CrGEyK5AQEAo1Qz1ACmvMH7BaOubW5BNLWv3fDEdOY="; - }; -} diff --git a/pkgs/applications/office/libreoffice/src-fresh/translations.nix b/pkgs/applications/office/libreoffice/src-fresh/translations.nix new file mode 100644 index 00000000000..e48a731402f --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-fresh/translations.nix @@ -0,0 +1,4 @@ +{ + sha256 = "02nnys853na9hwznxnf1h0pm5ymijvpyv9chg45v11vy2ak9y8sv"; + url = "https://download.documentfoundation.org/libreoffice/src/7.6.2/libreoffice-translations-7.6.2.1.tar.xz"; +} diff --git a/pkgs/applications/office/libreoffice/src-fresh/version.nix b/pkgs/applications/office/libreoffice/src-fresh/version.nix new file mode 100644 index 00000000000..121156b199e --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-fresh/version.nix @@ -0,0 +1 @@ +"7.6.2.1" diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-still/deps.nix index 345c30299f0..5a13758ff1f 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-still/deps.nix @@ -98,11 +98,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.0.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.0.1.tar.xz"; - sha256 = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0"; + name = "curl-8.2.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.2.1.tar.xz"; + sha256 = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894"; md5 = ""; - md5name = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0-curl-8.0.1.tar.xz"; + md5name = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894-curl-8.2.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -273,11 +273,11 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.12.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/freetype-2.12.0.tar.xz"; - sha256 = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033"; + name = "freetype-2.13.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/freetype-2.13.0.tar.xz"; + sha256 = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c"; md5 = ""; - md5name = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033-freetype-2.12.0.tar.xz"; + md5name = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c-freetype-2.13.0.tar.xz"; } { name = "glm-0.9.9.8.zip"; @@ -427,11 +427,11 @@ md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - name = "language-subtag-registry-2022-08-08.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2022-08-08.tar.bz2"; - sha256 = "e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00"; + name = "language-subtag-registry-2023-05-11.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2023-05-11.tar.bz2"; + sha256 = "9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da"; md5 = ""; - md5name = "e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00-language-subtag-registry-2022-08-08.tar.bz2"; + md5name = "9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da-language-subtag-registry-2023-05-11.tar.bz2"; } { name = "lcms2-2.12.tar.gz"; @@ -504,11 +504,11 @@ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "libwebp-1.3.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libwebp-1.3.0.tar.gz"; - sha256 = "64ac4614db292ae8c5aa26de0295bf1623dbb3985054cb656c55e67431def17c"; + name = "libwebp-1.3.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libwebp-1.3.2.tar.gz"; + sha256 = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4"; md5 = ""; - md5name = "64ac4614db292ae8c5aa26de0295bf1623dbb3985054cb656c55e67431def17c-libwebp-1.3.0.tar.gz"; + md5name = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4-libwebp-1.3.2.tar.gz"; } { name = "xmlsec1-1.2.37.tar.gz"; @@ -518,11 +518,11 @@ md5name = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c-xmlsec1-1.2.37.tar.gz"; } { - name = "libxml2-2.10.4.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.10.4.tar.xz"; - sha256 = "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45"; + name = "libxml2-2.11.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.11.4.tar.xz"; + sha256 = "737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7"; md5 = ""; - md5name = "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45-libxml2-2.10.4.tar.xz"; + md5name = "737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7-libxml2-2.11.4.tar.xz"; } { name = "libxslt-1.1.35.tar.xz"; @@ -588,11 +588,11 @@ md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz"; } { - name = "nss-3.88.1-with-nspr-4.35.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.88.1-with-nspr-4.35.tar.gz"; - sha256 = "fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a"; + name = "nss-3.90-with-nspr-4.35.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.90-with-nspr-4.35.tar.gz"; + sha256 = "f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739"; md5 = ""; - md5name = "fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a-nss-3.88.1-with-nspr-4.35.tar.gz"; + md5name = "f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739-nss-3.90-with-nspr-4.35.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; @@ -623,11 +623,11 @@ md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz"; } { - name = "openssl-3.0.8.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-3.0.8.tar.gz"; - sha256 = "6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e"; + name = "openssl-3.0.10.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-3.0.10.tar.gz"; + sha256 = "1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323"; md5 = ""; - md5name = "6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e-openssl-3.0.8.tar.gz"; + md5name = "1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323-openssl-3.0.10.tar.gz"; } { name = "liborcus-0.17.2.tar.bz2"; @@ -644,11 +644,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-5408.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-5408.tar.bz2"; - sha256 = "7db59b1e91f2bc0ab4c5e19d1a4f881e6a47dbb0d3b7e980a7358225b12a0f35"; + name = "pdfium-5778.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-5778.tar.bz2"; + sha256 = "b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06"; md5 = ""; - md5name = "7db59b1e91f2bc0ab4c5e19d1a4f881e6a47dbb0d3b7e980a7358225b12a0f35-pdfium-5408.tar.bz2"; + md5name = "b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06-pdfium-5778.tar.bz2"; } { name = "pixman-0.42.2.tar.gz"; @@ -665,11 +665,11 @@ md5name = "1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937-libpng-1.6.39.tar.xz"; } { - name = "tiff-4.5.0rc3.tar.xz"; - url = "https://dev-www.libreoffice.org/src/tiff-4.5.0rc3.tar.xz"; - sha256 = "dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c"; + name = "tiff-4.5.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/tiff-4.5.1.tar.xz"; + sha256 = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a"; md5 = ""; - md5name = "dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c-tiff-4.5.0rc3.tar.xz"; + md5name = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a-tiff-4.5.1.tar.xz"; } { name = "poppler-22.12.0.tar.xz"; @@ -693,11 +693,11 @@ md5name = "5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2-postgresql-13.10.tar.bz2"; } { - name = "Python-3.8.16.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.8.16.tar.xz"; - sha256 = "d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562"; + name = "Python-3.8.18.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.8.18.tar.xz"; + sha256 = "3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f"; md5 = ""; - md5name = "d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562-Python-3.8.16.tar.xz"; + md5name = "3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f-Python-3.8.18.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-still/help.nix b/pkgs/applications/office/libreoffice/src-still/help.nix new file mode 100644 index 00000000000..c2a5e643ab3 --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-still/help.nix @@ -0,0 +1,4 @@ +{ + sha256 = "0lpgcwq03qxvhbl5b9ndaz0cwswd6jin1rfm6hv3kr8q4l52jgb3"; + url = "https://download.documentfoundation.org/libreoffice/src/7.5.7/libreoffice-help-7.5.7.1.tar.xz"; +} diff --git a/pkgs/applications/office/libreoffice/src-still/main.nix b/pkgs/applications/office/libreoffice/src-still/main.nix new file mode 100644 index 00000000000..3f2f4d54da9 --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-still/main.nix @@ -0,0 +1,4 @@ +{ + sha256 = "041bs79539w61yqmy971rfpf8qvfs4cl2m2fdjv7n1nqf6a2z4v5"; + url = "https://download.documentfoundation.org/libreoffice/src/7.5.7/libreoffice-7.5.7.1.tar.xz"; +} diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix deleted file mode 100644 index 0a46cc37364..00000000000 --- a/pkgs/applications/office/libreoffice/src-still/override.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, kdeIntegration, commonsLogging, ... }: -attrs: -{ - postConfigure = attrs.postConfigure + '' - sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' - sed -e '/CPPUNIT_ASSERT(!bRTL);/d' -i './vcl/qa/cppunit/text.cxx' - - sed -e '/CPPUNIT_ASSERT_EQUAL(0, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(4, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(11, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(18, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - - sed -e '/CPPUNIT_ASSERT_EQUAL(3, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(9, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(17, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(22, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - ''; - configureFlags = attrs.configureFlags; - - patches = attrs.patches or []; -} diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix deleted file mode 100644 index e0cbdc5da9a..00000000000 --- a/pkgs/applications/office/libreoffice/src-still/primary.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ fetchurl }: - -rec { - fetchSrc = {name, hash}: fetchurl { - url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; - inherit hash; - }; - - major = "7"; - minor = "4"; - patch = "7"; - tweak = "2"; - - subdir = "${major}.${minor}.${patch}"; - - version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; - - src = fetchurl { - url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - hash = "sha256-dD2R8qE4png4D6eo7LWyQB2ZSwZ7MwdQ8DrY9SOi+yA="; - }; - - # FIXME rename - translations = fetchSrc { - name = "translations"; - hash = "sha256-7wea0EClmvwcPvgQDGagkOF7eBVvYTZScCEEpirdXnE="; - }; - - # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from - # it and LibreOffice can use these by pointing DICPATH environment variable at the hunspell directory - - help = fetchSrc { - name = "help"; - hash = "sha256-vcQWE3mBZx2sBQ9KzTh6zM7277mK9twfvyESTzTiII8="; - }; -} diff --git a/pkgs/applications/office/libreoffice/src-still/translations.nix b/pkgs/applications/office/libreoffice/src-still/translations.nix new file mode 100644 index 00000000000..b9d465f1464 --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-still/translations.nix @@ -0,0 +1,4 @@ +{ + sha256 = "1zxhnn8sslrlyb1cyg319slza2kn6mcc4h3li9ssnlfzkrzvxhc4"; + url = "https://download.documentfoundation.org/libreoffice/src/7.5.7/libreoffice-translations-7.5.7.1.tar.xz"; +} diff --git a/pkgs/applications/office/libreoffice/src-still/version.nix b/pkgs/applications/office/libreoffice/src-still/version.nix new file mode 100644 index 00000000000..8324371b4e5 --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-still/version.nix @@ -0,0 +1 @@ +"7.5.7.1" diff --git a/pkgs/applications/office/libreoffice/update.sh b/pkgs/applications/office/libreoffice/update.sh new file mode 100755 index 00000000000..a04e668e818 --- /dev/null +++ b/pkgs/applications/office/libreoffice/update.sh @@ -0,0 +1,74 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p python3 pup curl jq nix + +set -euo pipefail +echoerr() { echo "$@" 1>&2; } + +fname="$1" +echoerr got fname $fname +shift + +variant="$1" +# See comment near version_major variable +if [[ $variant == fresh ]]; then + head_tail=head +elif [[ $variant == still ]]; then + head_tail=tail +else + echoerr got unknown variant $variant + exit 3 +fi +echoerr got variant $variant +shift + +# Not totally needed, but makes it easy to run the update in case tis folder is +# deleted. +mkdir -p "$(dirname $fname)/src-$variant" +cd "$(dirname $fname)/src-$variant" + +# The pup command prints both fresh and still versions one after another, and +# we use either head -1 or tail -1 to get the right version, per the if elif +# above. +version_major="$(curl --silent https://www.libreoffice.org/download/download-libreoffice/ |\ + pup '.dl_version_number text{}' | $head_tail -1)" +echoerr got from website ${variant}_version $version_major +baseurl=https://download.documentfoundation.org/libreoffice/src/$version_major +tarballs=($(curl --silent $baseurl/ |\ + pup 'table json{}' |\ + jq --raw-output '.. | .href? | strings' |\ + grep "$version_major.*.tar.xz$")) + +full_version="$(echo ${tarballs[0]} | sed -e 's/^libreoffice-//' -e 's/.tar.xz$//')" +echoerr full version is $full_version +echo \"$full_version\" > version.nix + +for t in help translations; do + echo "{" > $t.nix + echo " sha256 = "\"$(nix-prefetch-url $baseurl/libreoffice-$t-$full_version.tar.xz)'";' >> $t.nix + echo " url = "\"$baseurl/libreoffice-$t-$full_version.tar.xz'";' >> $t.nix + echo "}" >> $t.nix +done + +# Out of loop nix-prefetch-url, because there is no $t, and we want the output +# path as well, to get the download.lst file from there afterwards. +main_path_hash=($(nix-prefetch-url --print-path $baseurl/libreoffice-$full_version.tar.xz)) +echo "{" > main.nix +echo " sha256 = "\"${main_path_hash[0]}'";' >> main.nix +echo " url = "\"$baseurl/libreoffice-$full_version.tar.xz'";' >> main.nix +echo "}" >> main.nix +echoerr got filename ${main_path_hash[1]} + +# Environment variable required by ../generate-libreoffice-srcs.py +export downloadList=/tmp/nixpkgs-libreoffice-update-download-$full_version.lst +# Need to extract the file only if it doesn't exist, otherwise spare time be +# skipping this. +if [[ ! -f "$downloadList" ]]; then + tar --extract \ + --file=${main_path_hash[1]} \ + libreoffice-$full_version/download.lst \ + -O > $downloadList +else + echoerr relying on previously downloaded downloadList file +fi +cd .. +python3 ./generate-libreoffice-srcs.py > src-$variant/deps.nix diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix index 1f4059b2adf..b44fc71c3d8 100644 --- a/pkgs/applications/office/libreoffice/wrapper.nix +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -19,7 +19,9 @@ }: let - inherit (unwrapped.srcs.primary) major minor; + inherit (unwrapped) version; + major = lib.versions.major version; + minor = lib.versions.minor version; makeWrapperArgs = builtins.concatStringsSep " " ([ "--set" "GDK_PIXBUF_MODULE_FILE" "${librsvg}/${gdk-pixbuf.moduleDir}.cache" diff --git a/pkgs/applications/office/micropad/default.nix b/pkgs/applications/office/micropad/default.nix index ae522f53e61..8a1b435cf2d 100644 --- a/pkgs/applications/office/micropad/default.nix +++ b/pkgs/applications/office/micropad/default.nix @@ -15,25 +15,25 @@ let in mkYarnPackage rec { pname = "micropad"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "MicroPad"; repo = "Micropad-Electron"; rev = "v${version}"; - hash = "sha256-Rr3mOz2OlCq2tibxutR8zBANhswnkz70aP9BBS/pXp0="; + hash = "sha256-VK3sSXYW/Dev7jCdkgrU9PXFbJ6+R2hy6QMRjj6bJ5M="; }; micropad-core = fetchzip { url = "https://github.com/MicroPad/MicroPad-Core/releases/download/v${version}/micropad.tar.xz"; - hash = "sha256-7yFTD8bXsxT6kBKxBGGxwzYpa0rZYLYV6KRYtImQ58c="; + hash = "sha256-KfS13p+mjIh7VShVCT6vFuQY0e/EO/sENOx4GPAORHU="; }; packageJSON = ./package.json; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-PKCi1c8WY1BG/H1kUJ8xSCVoLF/9DEn5Kh29is2BTYY="; + hash = "sha256-8M0VZI5I4fLoLLmXkIVeCqouww+CyiXbd+vJc8+2tIs="; }; nativeBuildInputs = [ copyDesktopItems makeWrapper ] diff --git a/pkgs/applications/office/micropad/package.json b/pkgs/applications/office/micropad/package.json index b3492b71e6d..9c392b08205 100644 --- a/pkgs/applications/office/micropad/package.json +++ b/pkgs/applications/office/micropad/package.json @@ -1,6 +1,6 @@ { "name": "micropad", - "version": "4.3.0", + "version": "4.4.0", "description": "A powerful note-taking app that helps you organise + take notes without restrictions.", "main": "main.js", "scripts": { @@ -27,9 +27,10 @@ "devDependencies": { "@types/mime": "^3.0.1", "@types/node": "^18.7.18", - "electron": "^25.5.0", - "electron-builder": "^24.6.3", - "typescript": "~4.9.5" + "@types/typo-js": "^1.2.1", + "electron": "^27.0.2", + "electron-builder": "^24.6.4", + "typescript": "~5.2.2" }, "dependencies": { "dictionary-en": "^3.0.0", diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index 166210704aa..b7d53507c4c 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -23,6 +23,10 @@ mkDerivation rec { substituteInPlace app/src/views/mainWindow/MainWindow.cpp \ --replace ":/resource/pic/logo.svg" "$out/share/icons/hicolor/48x48/apps/mytetra.png" + + # https://github.com/xintrea/mytetra_dev/issues/164 + substituteInPlace thirdParty/mimetex/mimetex.c \ + --replace "const char *strcasestr" "char *strcasestr" ''; postFixup = '' diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 7d9346c153b..c5c291511eb 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , buildNpmPackage , nixosTests , gettext @@ -19,13 +20,13 @@ }: let - version = "1.17.2"; + version = "1.17.4"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-/0Ml3NRTghqNykB1RZfqDW9TtENnSRM7wqG7Vn4Kl04="; + hash = "sha256-Kl8AUfHfEiEy40qeDI8x2rxdXcj01mpitw7T/96ibQQ="; }; # Use specific package versions required by paperless-ngx @@ -51,7 +52,7 @@ let pname = "paperless-ngx-frontend"; inherit version src; - npmDepsHash = "sha256-6EvC9Ka8gl0eRgJtHooB3yQNVGYzuH/WRga4AtzQ0EY="; + npmDepsHash = "sha256-5Q9NtIO7k/6AiF9Er10HhmEBFyQOP9CiTkTZglUeChg="; nativeBuildInputs = [ python3 @@ -91,6 +92,16 @@ python.pkgs.buildPythonApplication rec { inherit version src; + patches = [ + # https://github.com/paperless-ngx/paperless-ngx/pull/4146 + (fetchpatch { + name = "fix-tests-for-python311.patch"; + url = "https://github.com/paperless-ngx/paperless-ngx/commit/73f6c0a056e3859061339e295f57213fd4239b2d.patch"; + hash = "sha256-sZcRug5T4cw5ppKpGYrrfz9RxtYxnkeNOlXcMgdWT0E="; + }) + ]; + + nativeBuildInputs = [ gettext ]; @@ -204,7 +215,7 @@ python.pkgs.buildPythonApplication rec { whoosh zipp zope_interface - zxing_cpp + zxing-cpp ] ++ redis.optional-dependencies.hiredis ++ twisted.optional-dependencies.tls @@ -213,13 +224,13 @@ python.pkgs.buildPythonApplication rec { postBuild = '' # Compile manually because `pythonRecompileBytecodeHook` only works # for files in `python.sitePackages` - ${python.pythonForBuild.interpreter} -OO -m compileall src + ${python.pythonOnBuildForHost.interpreter} -OO -m compileall src # Collect static files - ${python.pythonForBuild.interpreter} src/manage.py collectstatic --clear --no-input + ${python.pythonOnBuildForHost.interpreter} src/manage.py collectstatic --clear --no-input # Compile string translations using gettext - ${python.pythonForBuild.interpreter} src/manage.py compilemessages + ${python.pythonOnBuildForHost.interpreter} src/manage.py compilemessages ''; installPhase = '' @@ -242,7 +253,7 @@ python.pkgs.buildPythonApplication rec { nativeCheckInputs = with python.pkgs; [ daphne - factory_boy + factory-boy imagehash pdfminer-six pytest-django diff --git a/pkgs/applications/office/paperwork/openpaperwork-core.nix b/pkgs/applications/office/paperwork/openpaperwork-core.nix index ee4fe040bfa..d434e000da5 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-core.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-core.nix @@ -1,8 +1,15 @@ -{ buildPythonPackage, lib, fetchFromGitLab +{ buildPythonPackage +, lib +, fetchFromGitLab -, isPy3k, isPyPy +, isPy3k +, isPyPy -, distro, setuptools, psutil +, distro +, setuptools +, psutil +, certifi +, setuptools-scm , pkgs }: @@ -10,6 +17,7 @@ buildPythonPackage rec { pname = "openpaperwork-core"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; + format = "pyproject"; sourceRoot = "${src.name}/openpaperwork-core"; @@ -17,23 +25,33 @@ buildPythonPackage rec { disabled = !isPy3k && !isPyPy; patchPhase = '' - echo 'version = "${version}"' > src/openpaperwork_core/_version.py chmod a+w -R .. patchShebangs ../tools ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = [ distro setuptools psutil + certifi ]; - nativeBuildInputs = [ pkgs.gettext pkgs.which ]; + nativeBuildInputs = [ + pkgs.gettext + pkgs.which + setuptools-scm + ]; preBuild = '' make l10n_compile ''; + preCheck = '' + export HOME=$(mktemp -d) + ''; + meta = { description = "Backend part of Paperwork (Python API, no UI)"; homepage = "https://openpaper.work/"; diff --git a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix index 9566a601063..cd0290f0874 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix @@ -9,6 +9,7 @@ , pillow , pygobject3 , distro +, setuptools-scm , pkgs }: @@ -16,6 +17,7 @@ buildPythonPackage rec { pname = "openpaperwork-gtk"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; + format = "pyproject"; sourceRoot = "${src.name}/openpaperwork-gtk"; @@ -23,12 +25,18 @@ buildPythonPackage rec { disabled = !isPy3k && !isPyPy; patchPhase = '' - echo 'version = "${version}"' > src/openpaperwork_gtk/_version.py chmod a+w -R .. patchShebangs ../tools ''; - nativeBuildInputs = [ pkgs.gettext pkgs.which ]; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + pkgs.gettext + pkgs.which + setuptools-scm + ]; + preBuild = '' make l10n_compile ''; diff --git a/pkgs/applications/office/paperwork/paperwork-backend.nix b/pkgs/applications/office/paperwork/paperwork-backend.nix index cbb57496427..95608b26e2f 100644 --- a/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -1,6 +1,5 @@ { buildPythonPackage , lib -, fetchpatch , fetchFromGitLab , pyenchant , scikit-learn @@ -8,7 +7,6 @@ , pycountry , whoosh , termcolor -, levenshtein , pygobject3 , pyocr , natsort @@ -24,34 +22,30 @@ , shared-mime-info , libreoffice , unittestCheckHook +, setuptools-scm }: buildPythonPackage rec { pname = "paperwork-backend"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; + format = "pyproject"; sourceRoot = "${src.name}/paperwork-backend"; patches = [ # disables a flaky test https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/issues/1035#note_1493700 ./flaky_test.patch - (fetchpatch { - url = "https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/commit/0f5cf0fe7ef223000e02c28e4c7576f74a778fe6.patch"; - hash = "sha256-NIK3j2TdydfeK3/udS/Pc+tJa/pPkfAmSPPeaYuaCq4="; - }) ]; patchFlags = [ "-p2" ]; postPatch = '' - substituteInPlace setup.py \ - --replace python-Levenshtein Levenshtein - - echo 'version = "${version}"' > src/paperwork_backend/_version.py chmod a+w -R .. patchShebangs ../tools ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = [ distro gtk3 @@ -63,7 +57,6 @@ buildPythonPackage rec { pygobject3 pyocr pypillowfight - levenshtein poppler_gi scikit-learn termcolor @@ -74,6 +67,7 @@ buildPythonPackage rec { gettext shared-mime-info which + setuptools-scm ]; preBuild = '' diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index d4ae3070d9a..9950075d6b2 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -13,7 +13,7 @@ , gettext , gobject-introspection , gdk-pixbuf -, texlive +, texliveSmall , imagemagick , perlPackages , writeScript @@ -21,9 +21,7 @@ let documentation_deps = [ - (texlive.combine { - inherit (texlive) scheme-small wrapfig gensymb; - }) + (texliveSmall.withPackages (ps: with ps; [ wrapfig gensymb ])) xvfb-run imagemagick perlPackages.Po4a @@ -34,6 +32,7 @@ in python3Packages.buildPythonApplication rec { inherit src version; pname = "paperwork"; + format = "pyproject"; sample_docs = sample_documents // { # a trick for the update script @@ -43,21 +42,13 @@ python3Packages.buildPythonApplication rec { sourceRoot = "${src.name}/paperwork-gtk"; - # Patch out a few paths that assume that we're using the FHS: - postPatch = '' - substituteInPlace setup.py \ - --replace python-Levenshtein Levenshtein + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + postPatch = '' chmod a+w -R .. patchShebangs ../tools export HOME=$(mktemp -d) - - cat - ../AUTHORS.py > src/paperwork_gtk/_version.py <<EOF - # -*- coding: utf-8 -*- - version = "${version}" - authors_code="" - EOF ''; preBuild = '' @@ -93,6 +84,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook gobject-introspection + python3Packages.setuptools-scm (lib.getBin gettext) which gdk-pixbuf # for the setup hook diff --git a/pkgs/applications/office/paperwork/paperwork-shell.nix b/pkgs/applications/office/paperwork/paperwork-shell.nix index 56d84e1039c..7a1d82a5eb3 100644 --- a/pkgs/applications/office/paperwork/paperwork-shell.nix +++ b/pkgs/applications/office/paperwork/paperwork-shell.nix @@ -9,9 +9,11 @@ , openpaperwork-gtk , paperwork-backend , fabulous +, rich , getkey , psutil , shared-mime-info +, setuptools-scm , pkgs }: @@ -19,6 +21,7 @@ buildPythonPackage rec { pname = "paperwork-shell"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; + format = "pyproject"; sourceRoot = "${src.name}/paperwork-shell"; @@ -26,10 +29,10 @@ buildPythonPackage rec { disabled = !isPy3k && !isPyPy; patchPhase = '' - echo 'version = "${version}"' > src/paperwork_shell/_version.py chmod a+w -R .. patchShebangs ../tools ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; propagatedBuildInputs = [ openpaperwork-core @@ -37,6 +40,7 @@ buildPythonPackage rec { fabulous getkey psutil + rich ]; nativeCheckInputs = [ @@ -44,7 +48,12 @@ buildPythonPackage rec { openpaperwork-gtk ]; - nativeBuildInputs = [ pkgs.gettext pkgs.which ]; + nativeBuildInputs = [ + pkgs.gettext + pkgs.which + setuptools-scm + ]; + preBuild = '' make l10n_compile ''; diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix index 6323c2c417b..ad0a071bd4e 100644 --- a/pkgs/applications/office/paperwork/src.nix +++ b/pkgs/applications/office/paperwork/src.nix @@ -1,13 +1,13 @@ {fetchFromGitLab}: rec { - version = "2.1.2"; + version = "2.2.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork"; group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "/5k+zUtTE+Dr879xbHDCAYrqlEJLsbkcRSG3GbA/PCg="; + sha256 = "sha256-OFVj9INDiOpGd5N3ziMBWt3/IdmpInc+jEAxW3GcvOA="; }; sample_documents = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 66df0d26ac9..e507692d622 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.65.3"; + version = "0.65.6"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-xAbfyjQ0MPNDC6UJthCLtu8nfI/AdtludvejA32/dIQ="; + hash = "sha256-sI2DqhR9LmXxjkkMTDiMG/f/QXcBVPmEjbHFsmEP8qE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/pyspread/default.nix b/pkgs/applications/office/pyspread/default.nix deleted file mode 100644 index 61a4c7694b7..00000000000 --- a/pkgs/applications/office/pyspread/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib -, python3 -, fetchPypi -, copyDesktopItems -, wrapQtAppsHook -, qtsvg -, makeDesktopItem -}: - -python3.pkgs.buildPythonApplication rec { - pname = "pyspread"; - version = "2.0.2"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-rg2T9Y9FU2a+aWg0XM8jyQB9t8zDVlpad3TjUcx4//8="; - }; - - nativeBuildInputs = [ - copyDesktopItems - wrapQtAppsHook - ]; - - buildInputs = [ - qtsvg - ]; - - propagatedBuildInputs = with python3.pkgs; [ - python-dateutil - markdown2 - matplotlib - numpy - pyenchant - pyqt5 - setuptools - ]; - - doCheck = false; # it fails miserably with a core dump - - pythonImportsCheck = [ "pyspread" ]; - - desktopItems = [ - (makeDesktopItem rec { - name = pname; - exec = name; - icon = name; - desktopName = "Pyspread"; - genericName = "Spreadsheet"; - comment = meta.description; - categories = [ "Office" "Development" "Spreadsheet" ]; - }) - ]; - - preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") - ''; - - meta = with lib; { - homepage = "https://pyspread.gitlab.io/"; - description = "A Python-oriented spreadsheet application"; - longDescription = '' - pyspread is a non-traditional spreadsheet application that is based on and - written in the programming language Python. The goal of pyspread is to be - the most pythonic spreadsheet. - - pyspread expects Python expressions in its grid cells, which makes a - spreadsheet specific language obsolete. Each cell returns a Python object - that can be accessed from other cells. These objects can represent - anything including lists or matrices. - ''; - license = with licenses; gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; all; - }; -} diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix index e90184b5221..ff7ce412129 100644 --- a/pkgs/applications/office/qnotero/default.nix +++ b/pkgs/applications/office/qnotero/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: +{ lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook }: python3Packages.buildPythonPackage rec { pname = "qnotero"; @@ -46,6 +46,7 @@ python3Packages.buildPythonPackage rec { homepage = "https://www.cogsci.nl/software/qnotero"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; + broken = stdenv.isDarwin; # Build fails even after adding cx-freeze to `buildInputs` maintainers = [ lib.maintainers.nico202 ]; }; } diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 4f277951ae9..1303afb9d66 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -19,14 +19,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.9.4"; + version = "23.11.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-e5x3YeWCaTNoQR924r2EseqDOfFluj58MGS78DzfJUM="; + hash = "sha256-rsYB8aLVVpGGbiEDWCpGCPdZEsOajoGfoh6YYxilxpg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/roam-research/common.nix b/pkgs/applications/office/roam-research/common.nix new file mode 100644 index 00000000000..8e63b111ad2 --- /dev/null +++ b/pkgs/applications/office/roam-research/common.nix @@ -0,0 +1,22 @@ +{ fetchurl }: +let + pname = "roam-research"; + version = "0.0.18"; +in +{ + inherit pname version; + sources = { + x86_64-darwin = fetchurl { + url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}.dmg"; + hash = "sha256-jyFNH3qrgrsftExL/b2t8bY3W3fYVz+Gp11AuaIMxbg="; + }; + aarch64-darwin = fetchurl { + url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}-arm64.dmg"; + hash = "sha256-AnyvFCbyUi6tcgxYQAj+zPLl4/kVh9ZeupetRhzH0PU="; + }; + x86_64-linux = fetchurl { + url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/${pname}_${version}_amd64.deb"; + hash = "sha256-veDWBFZbODsdaO1UdfuC4w6oGCkeVBe+fqKn5XVHKDQ="; + }; + }; +} diff --git a/pkgs/applications/office/roam-research/darwin.nix b/pkgs/applications/office/roam-research/darwin.nix new file mode 100644 index 00000000000..2c736c0c1a7 --- /dev/null +++ b/pkgs/applications/office/roam-research/darwin.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, undmg, fetchurl }: +let + common = import ./common.nix { inherit fetchurl; }; + inherit (stdenv.hostPlatform) system; +in +stdenv.mkDerivation rec { + inherit (common) pname version; + src = common.sources.${system} or (throw "Source for ${pname} is not available for ${system}"); + + appName = "Roam Research"; + + sourceRoot = "."; + + nativeBuildInputs = [ undmg ]; + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" + cp -R *.app "$out/Applications" + + mkdir -p $out/bin + ln -s "$out/Applications/${appName}.app/Contents/MacOS/${appName}" "$out/bin/${appName}" + runHook postInstall + ''; + + meta = with lib; { + description = "A note-taking tool for networked thought"; + homepage = "https://roamresearch.com/"; + maintainers = with lib.maintainers; [ dbalan ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + platforms = [ "x86_64-darwin" "aarch64-darwin" ]; + }; +} diff --git a/pkgs/applications/office/roam-research/default.nix b/pkgs/applications/office/roam-research/default.nix index e1ca9bb47e8..408f026bc57 100644 --- a/pkgs/applications/office/roam-research/default.nix +++ b/pkgs/applications/office/roam-research/default.nix @@ -1,81 +1,8 @@ -{ stdenv, lib, fetchurl, alsa-lib, atk, cairo, cups, dbus, dpkg, expat -, gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor -, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, libdrm -, libpulseaudio, libxcb, libxkbcommon, libxshmfence, mesa, nspr, nss, pango -, udev, }: - +{ stdenv, callPackage, ... }@args: let - libPath = lib.makeLibraryPath [ - alsa-lib - atk - cairo - cups - dbus - expat - gdk-pixbuf - glib - gtk3 - libX11 - libXcomposite - libXdamage - libXext - libXfixes - libXi - libXrandr - libdrm - libxcb - libxkbcommon - libxshmfence - mesa - nspr - nss - pango - stdenv.cc.cc - libXScrnSaver - libXcursor - libXrender - libXtst - libpulseaudio - udev - ]; -in stdenv.mkDerivation rec { - pname = "roam-research"; - version = "0.0.18"; - - src = fetchurl { - url = - "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/${pname}_${version}_amd64.deb"; - sha256 = "sha256-veDWBFZbODsdaO1UdfuC4w6oGCkeVBe+fqKn5XVHKDQ="; - }; - - nativeBuildInputs = [ dpkg ]; - - unpackPhase = '' - mkdir pkg - dpkg-deb -x $src pkg - sourceRoot=pkg - ''; - - installPhase = '' - mkdir -p "$out/bin" - mv opt "$out/" - - ln -s "$out/opt/Roam Research/roam-research" "$out/bin/roam-research" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:$out/opt/Roam Research:\$ORIGIN" "$out/opt/Roam Research/roam-research" - - mv usr/* "$out/" - - substituteInPlace $out/share/applications/roam-research.desktop \ - --replace "/opt/Roam Research/roam-research" "roam-research" - ''; - - dontPatchELF = true; - meta = with lib; { - description = "A note-taking tool for networked thought."; - homepage = "https://roamresearch.com/"; - maintainers = with lib.maintainers; [ dbalan ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - }; -} + extraArgs = removeAttrs args [ "callPackage" ]; +in +if stdenv.isDarwin then + callPackage ./darwin.nix (extraArgs // { }) +else + callPackage ./linux.nix (extraArgs // { }) diff --git a/pkgs/applications/office/roam-research/linux.nix b/pkgs/applications/office/roam-research/linux.nix new file mode 100644 index 00000000000..5873bcfdd19 --- /dev/null +++ b/pkgs/applications/office/roam-research/linux.nix @@ -0,0 +1,73 @@ +{ stdenv, lib, fetchurl, alsa-lib, atk, cairo, cups, dbus, dpkg, expat +, gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor +, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, libdrm +, libpulseaudio, libxcb, libxkbcommon, libxshmfence, mesa, nspr, nss, pango +, udev, }: + +let + common = import ./common.nix { inherit fetchurl; }; + inherit (stdenv.hostPlatform) system; + libPath = lib.makeLibraryPath [ + alsa-lib + atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + libX11 + libXcomposite + libXdamage + libXext + libXfixes + libXi + libXrandr + libdrm + libxcb + libxkbcommon + libxshmfence + mesa + nspr + nss + pango + stdenv.cc.cc + libXScrnSaver + libXcursor + libXrender + libXtst + libpulseaudio + udev + ]; +in stdenv.mkDerivation rec { + inherit (common) pname version; + src = common.sources.${system} or (throw "Source for ${pname} is not available for ${system}"); + + nativeBuildInputs = [ dpkg ]; + + installPhase = '' + mkdir -p "$out/bin" + mv opt "$out/" + + ln -s "$out/opt/Roam Research/roam-research" "$out/bin/roam-research" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:$out/opt/Roam Research:\$ORIGIN" "$out/opt/Roam Research/roam-research" + + mv usr/* "$out/" + + substituteInPlace $out/share/applications/roam-research.desktop \ + --replace "/opt/Roam Research/roam-research" "roam-research" + ''; + + # autoPatchelfHook/patchelf are not used because they cause the binary to coredump. + dontPatchELF = true; + + meta = with lib; { + description = "A note-taking tool for networked thought"; + homepage = "https://roamresearch.com/"; + maintainers = with lib.maintainers; [ dbalan ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index c16c757836a..1e5852b8cc8 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "7.13.2"; + version = "7.14.3"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-HwRJUrNaoAnNuIcDWgXOYA+PxLjOE6NXRJqINIbVxOw="; + sha256 = "sha256-wW72T1+RfejaI9LxSxa/g0lvIRmAeFa2ZaEa8K9mRcw="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index 6629c7f0ae3..824a20a3132 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -5,12 +5,12 @@ }: let - version = "6.2.2"; + version = "6.6.0"; pname = "timeular"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - sha256 = "sha256-i6VLKGHst6gykXOpkt+VFMkdm9RLAWVgAhQ2UZ7Lt5Y="; + sha256 = "sha256-RmWRNKy2w3BM/ipQyFpkNC3+XXsJXjN6VYWNo8OKpy0="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 813c29e1ef5..f2940b1e3fb 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "todoman"; - version = "4.3.2"; + version = "4.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pimutils"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dxyI9ypZZBouTUF72wzvi7j+CeoQ9JNSiXrVeV7ForY="; + hash = "sha256-5tQaNT6QVN9mxa9t6OvMux4ZGy4flUqszTAwet2QL0w="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec { postInstall = '' installShellCompletion --bash contrib/completion/bash/_todo - substituteInPlace contrib/completion/zsh/_todo --replace "jq " "${jq}/bin/jq " + substituteInPlace contrib/completion/zsh/_todo --replace "jq " "${lib.getExe jq} " installShellCompletion --zsh contrib/completion/zsh/_todo ''; @@ -76,7 +76,7 @@ python3.pkgs.buildPythonApplication rec { "todoman" ]; - meta = with lib; { + meta = { homepage = "https://github.com/pimutils/todoman"; description = "Standards-based task manager based on iCalendar"; longDescription = '' @@ -90,9 +90,9 @@ python3.pkgs.buildPythonApplication rec { now. Unsupported fields may not be shown but are never deleted or altered. ''; - changelog = "https://github.com/pimutils/todoman/raw/v${version}/CHANGELOG.rst"; - license = licenses.isc; - maintainers = with maintainers; [ leenaars antonmosich ]; + changelog = "https://todoman.readthedocs.io/en/stable/changelog.html#v${builtins.replaceStrings ["."] ["-"] version}"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ leenaars antonmosich ]; mainProgram = "todo"; }; } diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix index 949e7505b89..dd3f41df523 100644 --- a/pkgs/applications/office/trilium/desktop.nix +++ b/pkgs/applications/office/trilium/desktop.nix @@ -1,6 +1,7 @@ { stdenv, lib, unzip, autoPatchelfHook -, fetchurl, atomEnv, makeWrapper -, makeDesktopItem, copyDesktopItems, wrapGAppsHook, libxshmfence +, fetchurl, makeWrapper +, alsa-lib, mesa, nss, nspr, systemd +, makeDesktopItem, copyDesktopItems, wrapGAppsHook , metaCommon }: @@ -24,6 +25,7 @@ let src = fetchurl linuxSource; + # TODO: migrate off autoPatchelfHook and use nixpkgs' electron nativeBuildInputs = [ autoPatchelfHook makeWrapper @@ -31,7 +33,14 @@ let copyDesktopItems ]; - buildInputs = atomEnv.packages ++ [ libxshmfence ]; + buildInputs = [ + alsa-lib + mesa + nss + nspr + stdenv.cc.cc + systemd + ]; desktopItems = [ (makeDesktopItem { @@ -64,8 +73,9 @@ let ''; # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) + # Error: libstdc++.so.6: cannot open shared object file: No such file or directory preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath}) + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs}) ''; dontStrip = true; diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 67fa25115fb..8376b49b819 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "wpsoffice"; - version = "11.1.0.11704"; + version = "11.1.0.11708"; src = if useChineseVersion then fetchurl { url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${lib.last (lib.splitString "." version)}/wps-office_${version}_amd64.deb"; - hash = "sha256-ffLSon9FpQZDQ1uapchBUkVaHOXs+H/6kHJLNiWqwiE="; + hash = "sha256-GcWRrJ0I1Q6D2VK6YsPmd5Uir5LcIBFJa1amV2sUurk="; } else fetchurl { url = "https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${lib.last (lib.splitString "." version)}/wps-office_${version}.XA_amd64.deb"; - hash = "sha256-nxpMEWKiNjjEUoVJkhpvjnCuWBCCGjPk+sUlKz+KjMI="; + hash = "sha256-J40/wrmMz/r4eb2X/rbxWn04UcSsag7SO3aSqBLFSN4="; }; unpackCmd = "dpkg -x $src ."; diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index c9e787f6d9a..b21f3edaa53 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -7,11 +7,11 @@ python3Packages.buildPythonApplication rec { pname = "zim"; - version = "0.75.1"; + version = "0.75.2"; src = fetchurl { url = "https://zim-wiki.org/downloads/zim-${version}.tar.gz"; - sha256 = "sha256-iOF11/fhQYlvnpWJidJS1yJVavF7xLxvBl59VCh9A4U="; + hash = "sha256-QIkNsFsWeNHEcXhGHHZyJDMMW2lNvdwMJLGxeCZaLdI="; }; buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; @@ -54,6 +54,7 @@ python3Packages.buildPythonApplication rec { changelog = "https://github.com/zim-desktop-wiki/zim-desktop-wiki/blob/${version}/CHANGELOG.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; + mainProgram = "zim"; broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790 }; } diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 35178fd4a9a..32e42a8b944 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "6.0.26"; + version = "6.0.30"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - hash = "sha256-Btrzv9trUFjCrQ+OEc7MUOzq7x3XW7jtgUJMitmPK0A="; + hash = "sha256-4XQZ1xw9Qtk3SzHMsEUk+HuIYtHDAOMgpwzbAd5QQpU="; }; nativeBuildInputs = [ wrapGAppsHook ]; |