libreoffice-fresh-unwrapped 7.6.2.1 -> 24.2.0.1 https://repology.org/project/libreoffice/versions attrpath: libreoffice-fresh-unwrapped Checking auto update branch... [version] [version] generic version rewriter does not support multiple hashes [rustCrateVersion] [rustCrateVersion] No cargoSha256 or cargoHash found [golangModuleVersion] [golangModuleVersion] Not a buildGoModule package with vendorSha256 or vendorHash [npmDepsVersion] [npmDepsVersion] No npmDepsHash [updateScript] [updateScript] Success [updateScript] Going to be running update for following packages: - libreoffice-7.6.2.1 Press Enter key to continue... Running update for: - libreoffice-7.6.2.1: UPDATING ... - libreoffice-7.6.2.1: DONE. Packages updated! Diff after rewrites: diff --git a/pkgs/applications/office/libreoffice/src-fresh/deps.nix b/pkgs/applications/office/libreoffice/src-fresh/deps.nix index cea715cd1cfc..acb8da608fae 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/deps.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/deps.nix @@ -77,11 +77,11 @@ md5name = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4-dtoa-20180411.tgz"; } { - name = "libcmis-0.5.2.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz"; - sha256 = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2"; + name = "libcmis-0.6.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcmis-0.6.1.tar.xz"; + sha256 = "d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074"; md5 = ""; - md5name = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2-libcmis-0.5.2.tar.xz"; + md5name = "d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074-libcmis-0.6.1.tar.xz"; } { name = "CoinMP-1.7.6.tgz"; @@ -98,11 +98,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.2.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.2.1.tar.xz"; - sha256 = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894"; + name = "curl-8.4.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.4.0.tar.xz"; + sha256 = "16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d"; md5 = ""; - md5name = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894-curl-8.2.1.tar.xz"; + md5name = "16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d-curl-8.4.0.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -301,11 +301,11 @@ md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; } { - name = "harfbuzz-8.0.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/harfbuzz-8.0.0.tar.xz"; - sha256 = "1f98b5e3d06a344fe667d7e8210094ced458791499839bddde98c167ce6a7c79"; + name = "harfbuzz-8.2.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/harfbuzz-8.2.2.tar.xz"; + sha256 = "e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3"; md5 = ""; - md5name = "1f98b5e3d06a344fe667d7e8210094ced458791499839bddde98c167ce6a7c79-harfbuzz-8.0.0.tar.xz"; + md5name = "e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3-harfbuzz-8.2.2.tar.xz"; } { name = "hsqldb_1_8_0.zip"; @@ -427,11 +427,11 @@ md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - 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"; + name = "language-subtag-registry-2023-08-02.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2023-08-02.tar.bz2"; + sha256 = "59fdc026b5088e7947e1e6add482d2a40e1f7e25c50f198b456954216462c2eb"; md5 = ""; - md5name = "9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da-language-subtag-registry-2023-05-11.tar.bz2"; + md5name = "59fdc026b5088e7947e1e6add482d2a40e1f7e25c50f198b456954216462c2eb-language-subtag-registry-2023-08-02.tar.bz2"; } { name = "lcms2-2.12.tar.gz"; @@ -469,11 +469,11 @@ md5name = "6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25715682754eca3368df-libexttextcat-3.4.6.tar.xz"; } { - name = "libffi-3.3.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libffi-3.3.tar.gz"; - sha256 = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056"; + name = "libffi-3.4.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libffi-3.4.4.tar.gz"; + sha256 = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676"; md5 = ""; - md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz"; + md5name = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676-libffi-3.4.4.tar.gz"; } { name = "libgpg-error-1.43.tar.bz2"; @@ -497,11 +497,11 @@ md5name = "5dcb4db3b2340f81f601ce86d8d76b69e34d70f84f804192c901e4b7f84d5fb0-libnumbertext-1.0.11.tar.xz"; } { - name = "ltm-1.2.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/ltm-1.2.0.tar.xz"; - sha256 = "b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1"; + name = "ltm-1.2.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/ltm-1.2.1.tar.xz"; + sha256 = "986025d7b374276fee2e30e99f3649e4ac0db8a02257a37ee10eae72abed0d1f"; md5 = ""; - md5name = "b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1-ltm-1.2.0.tar.xz"; + md5name = "986025d7b374276fee2e30e99f3649e4ac0db8a02257a37ee10eae72abed0d1f-ltm-1.2.1.tar.xz"; } { name = "libwebp-1.3.2.tar.gz"; @@ -546,11 +546,11 @@ md5name = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e-lxml-4.1.1.tgz"; } { - name = "mariadb-connector-c-3.1.8-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz"; - sha256 = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b"; + name = "mariadb-connector-c-3.3.7-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.7-src.tar.gz"; + sha256 = "975a9a862fed80f84e0206373f7ef05537aada5b65d99b71b36ab892b44240bf"; md5 = ""; - md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz"; + md5name = "975a9a862fed80f84e0206373f7ef05537aada5b65d99b71b36ab892b44240bf-mariadb-connector-c-3.3.7-src.tar.gz"; } { name = "mdds-2.1.1.tar.xz"; @@ -623,11 +623,11 @@ md5name = "082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0-openldap-2.6.6.tgz"; } { - name = "openssl-3.0.10.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-3.0.10.tar.gz"; - sha256 = "1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323"; + name = "openssl-3.0.11.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-3.0.11.tar.gz"; + sha256 = "b3425d3bb4a2218d0697eb41f7fc0cdede016ed19ca49d168b78e8d947887f55"; md5 = ""; - md5name = "1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323-openssl-3.0.10.tar.gz"; + md5name = "b3425d3bb4a2218d0697eb41f7fc0cdede016ed19ca49d168b78e8d947887f55-openssl-3.0.11.tar.gz"; } { name = "liborcus-0.18.1.tar.xz"; @@ -665,18 +665,18 @@ md5name = "535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1-libpng-1.6.40.tar.xz"; } { - name = "tiff-4.5.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/tiff-4.5.1.tar.xz"; - sha256 = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a"; + name = "tiff-4.6.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/tiff-4.6.0.tar.xz"; + sha256 = "e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2"; md5 = ""; - md5name = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a-tiff-4.5.1.tar.xz"; + md5name = "e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2-tiff-4.6.0.tar.xz"; } { - name = "poppler-23.06.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-23.06.0.tar.xz"; - sha256 = "d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65"; + name = "poppler-23.09.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-23.09.0.tar.xz"; + sha256 = "80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55"; md5 = ""; - md5name = "d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65-poppler-23.06.0.tar.xz"; + md5name = "80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55-poppler-23.09.0.tar.xz"; } { name = "poppler-data-0.4.12.tar.gz"; @@ -791,11 +791,11 @@ md5name = "b55fda9440d1e070630eb2487d8b8697cf412c214a27caee9df69cec7c004de3-libwpg-0.3.4.tar.xz"; } { - name = "libwps-0.4.12.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libwps-0.4.12.tar.xz"; - sha256 = "e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb"; + name = "libwps-0.4.14.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwps-0.4.14.tar.xz"; + sha256 = "365b968e270e85a8469c6b160aa6af5619a4e6c995dbb04c1ecc1b4dd13e80de"; md5 = ""; - md5name = "e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb-libwps-0.4.12.tar.xz"; + md5name = "365b968e270e85a8469c6b160aa6af5619a4e6c995dbb04c1ecc1b4dd13e80de-libwps-0.4.14.tar.xz"; } { name = "xsltml_2.1.2.zip"; @@ -805,11 +805,11 @@ md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; } { - name = "zlib-1.2.13.tar.xz"; - url = "https://dev-www.libreoffice.org/src/zlib-1.2.13.tar.xz"; - sha256 = "d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98"; + name = "zlib-1.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/zlib-1.3.tar.xz"; + sha256 = "8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7"; md5 = ""; - md5name = "d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98-zlib-1.2.13.tar.xz"; + md5name = "8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7-zlib-1.3.tar.xz"; } { name = "libzmf-0.0.2.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/help.nix b/pkgs/applications/office/libreoffice/src-fresh/help.nix index af319ca97a31..b9b1b6148200 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/help.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/help.nix @@ -1,4 +1,4 @@ { - sha256 = "0j6idhdywnbl0qaimf1ahxaqvp9s0y2hfrbcbmw32c30g812gp3b"; - url = "https://download.documentfoundation.org/libreoffice/src/7.6.2/libreoffice-help-7.6.2.1.tar.xz"; + sha256 = "0y46gpnrmmpc1sah26w8pvjwnbnr9diblki9hvzygq4n800lqy7d"; + url = "https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-help-7.6.4.1.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/main.nix b/pkgs/applications/office/libreoffice/src-fresh/main.nix index 52f29a206813..0aab4189764e 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/main.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/main.nix @@ -1,4 +1,4 @@ { - sha256 = "18lw5gnjihjwzdsk6xql7ax5lasykxxvg5bp40q4rqics0xp7lp5"; - url = "https://download.documentfoundation.org/libreoffice/src/7.6.2/libreoffice-7.6.2.1.tar.xz"; + sha256 = "07kam9q1nyzff2y77gk4a2jbx403b6m2i1p0p49n6xscyawagzhk"; + url = "https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-7.6.4.1.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/translations.nix b/pkgs/applications/office/libreoffice/src-fresh/translations.nix index e48a731402f3..1480e31e0a2e 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/translations.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/translations.nix @@ -1,4 +1,4 @@ { - sha256 = "02nnys853na9hwznxnf1h0pm5ymijvpyv9chg45v11vy2ak9y8sv"; - url = "https://download.documentfoundation.org/libreoffice/src/7.6.2/libreoffice-translations-7.6.2.1.tar.xz"; + sha256 = "0ybn7c569wrj3xj20sx34rym8zkxazv9aj4rv76mbp5b82z0snis"; + url = "https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-translations-7.6.4.1.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/version.nix b/pkgs/applications/office/libreoffice/src-fresh/version.nix index 121156b199ed..5a38852a307e 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/version.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/version.nix @@ -1 +1 @@ -"7.6.2.1" +"7.6.4.1" No auto update branch exists Old version 7.6.2.1" not present in master derivation file with contents: { stdenv , fetchurl , fetchpatch , lib , substituteAll , pam , python3 , libxslt , perl , ArchiveZip , box2d , gettext , IOCompress , zlib , libjpeg , expat , freetype , libwpd , libxml2 , db , curl , fontconfig , libsndfile , neon , bison , flex , zip , unzip , gtk3 , libmspack , getopt , file , cairo , which , icu , boost , jdk17 , ant , cups , xorg , fontforge , jre17_minimal , openssl , gperf , cppunit , poppler , util-linux , librsvg , libGLU , libGL , bsh , CoinMP , libwps , libabw , libmysqlclient , autoconf , automake , openldap , bash , hunspell , librdf_redland , nss , nspr , libwpg , dbus-glib , clucene_core , libcdr , lcms , unixODBC , mdds , sane-backends , mythes , libexttextcat , libvisio , fontsConf , pkg-config , bluez5 , libtool , carlito , libatomic_ops , graphite2 , harfbuzz , libodfgen , libzmf , librevenge , libe-book , libmwaw , glm , gst_all_1 , gdb , commonsLogging , librdf_rasqal , gnome , glib , ncurses , libepoxy , gpgme , libwebp , abseil-cpp , 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 , wrapQtAppsHook ? null , qtbase ? null , qtx11extras ? null , qtwayland ? null , ki18n ? null , kconfig ? null , kcoreaddons ? null , kio ? null , kwindowsystem ? null , variant ? "fresh" , symlinkJoin , postgresql # The rest are used only in passthru, for the wrapper , kauth ? null , kcompletion ? null , kconfigwidgets ? null , kglobalaccel ? null , kitemviews ? null , knotifications ? null , ktextwidgets ? null , kwidgetsaddons ? null , kxmlgui ? null , phonon ? null , qtdeclarative ? null , qtquickcontrols ? null , qtsvg ? null , qttools ? null , solid ? null , sonnet ? null } @ args: assert builtins.elem variant [ "fresh" "still" ]; let inherit (lib) flatten flip concatMapStrings concatStringsSep getDev getLib optionals optionalString; jre' = jre17_minimal.override { modules = [ "java.base" "java.desktop" "java.logging" "java.sql" ]; }; importVariant = f: import (./. + "/src-${variant}/${f}"); # 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 = { 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 kdeDeps = symlinkJoin { name = "libreoffice-kde-dependencies-${version}"; paths = flatten (map (e: [ (getDev e) (getLib e) ]) [ qtbase qtx11extras kconfig kcoreaddons ki18n kio kwindowsystem ]); }; tarballPath = "external/tarballs"; in stdenv.mkDerivation (finalAttrs: { pname = "libreoffice"; inherit version; 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 "-fno-visibility-inlines-hidden" # https://bugs.documentfoundation.org/show_bug.cgi?id=78174#c10 ] ++ optionals (stdenv.isLinux && stdenv.isAarch64 && variant == "still") [ "-O2" # https://bugs.gentoo.org/727188 ]); postUnpack = '' mkdir -v $sourceRoot/${tarballPath} '' + (flip concatMapStrings srcs.third_party (f: '' ln -sfv ${f} $sourceRoot/${tarballPath}/${f.md5name} ln -sfv ${f} $sourceRoot/${tarballPath}/${f.name} '')) + '' ln -sv ${srcs.help} $sourceRoot/${tarballPath}/${srcs.help.name} ln -svf ${srcs.translations} $sourceRoot/${tarballPath}/${srcs.translations.name} tar -xf ${srcs.help} tar -xf ${srcs.translations} ''; 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 # Backport fix for tests broken by expired test certificates. (fetchpatch { url = "https://cgit.freedesktop.org/libreoffice/core/patch/?id=ececb678b8362e3be8e02768ddd5e4197d87dc2a"; hash = "sha256-TUfKlwNxUTOJ95VLqwVD+ez1xhu7bW6xZlgIaCyIiNg="; }) ]; # libreoffice tries to reference the BUILDCONFIG (e.g. PKG_CONFIG_PATH) # in the binary causing the closure size to blow up because of many unnecessary # dependencies to dev outputs. This behavior was patched away in nixpkgs # (see above), make sure these don't leak again by accident. disallowedRequisites = lib.optionals (!kdeIntegration) (lib.concatMap (x: lib.optional (x?dev) x.dev) 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 # '#include ' instead of '#include '. # # Fix this path to point to where the headers can actually be found instead. substituteInPlace configure.ac --replace \ '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 ' \ --replace '$KF5INC ' '$KF5INC ${kdeDeps}/include ${kdeDeps}/include/KF5 '\ --replace '$KF5LIB ' '$KF5LIB ${kdeDeps}/lib ' ''; dontUseCmakeConfigure = true; dontUseCmakeBuildDir = true; preConfigure = '' configureFlagsArray=( "--with-parallelism=$NIX_BUILD_CORES" "--with-lang=${concatStringsSep " " langs}" ); chmod a+x ./bin/unpack-sources patchShebangs . # This is required as some cppunittests require fontconfig configured cp "${fontsConf}" fonts.conf sed -e '/include/i${carlito}/etc/fonts/conf.d' -i fonts.conf export FONTCONFIG_FILE="$PWD/fonts.conf" NOCONFIGURE=1 ./autogen.sh ''; 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 '/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" ]; enableParallelBuilding = true; buildTargets = [ "build-nocheck" ]; doCheck = true; # It installs only things to $out/lib/libreoffice postInstall = '' mkdir -p $out/share ln -s $out/lib/libreoffice/share/xdg $out/share/applications cp -r sysui/desktop/icons "$out/share" sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop ''; # Wrapping is done in ./wrapper.nix dontWrapQtApps = true; configureFlags = [ (lib.withFeature withHelp "help") "--with-boost=${getDev boost}" "--with-boost-libdir=${getLib boost}/lib" "--with-beanshell-jar=${bsh}" "--with-vendor=NixOS" "--disable-report-builder" "--disable-online-update" "--enable-python=system" "--enable-dbus" "--enable-release-build" "--enable-epm" "--with-ant-home=${getLib ant}/lib/ant" "--with-system-cairo" "--with-system-libs" "--with-system-headers" "--with-system-openssl" "--with-system-libabw" "--without-system-libcmis" "--with-system-libwps" "--with-system-openldap" "--with-system-coinmp" "--with-system-postgresql" # Without these, configure does not finish "--without-junit" # Schema files for validation are not included in the source tarball "--without-export-validation" # We do tarball prefetching ourselves "--disable-fetch-external" "--enable-build-opensymbol" # I imagine this helps. Copied from go-oo. # Modified on every upgrade, though "--disable-odk" "--disable-firebird-sdbc" "--without-fonts" "--without-doxygen" # TODO: package these as system libraries "--with-system-beanshell" "--without-system-hsqldb" "--without-system-altlinuxhyph" "--without-system-lpsolve" "--without-system-libetonyek" "--without-system-libfreehand" "--without-system-liblangtag" "--without-system-libmspub" "--without-system-libnumbertext" "--without-system-libpagemaker" "--without-system-libstaroffice" "--without-system-libepubgen" "--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-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 " " [ "unitcheck" "slowcheck" ]; nativeBuildInputs = [ autoconf automake bison fontforge gdb jdk17 libtool pkg-config ] ++ optionals kdeIntegration [ wrapQtAppsHook ]; buildInputs = with xorg; finalAttrs.passthru.gst_packages ++ [ ArchiveZip CoinMP IOCompress abseil-cpp ant bluez5 boost box2d cairo clucene_core cppunit cups curl db dbus-glib expat file flex fontconfig freetype getopt gettext glib glm gnome.adwaita-icon-theme gperf gpgme graphite2 gtk3 harfbuzz hunspell icu jre' lcms libGL libGLU libX11 libXaw libXdmcp libXext libXi libXinerama libXtst libabw libatomic_ops libcdr libe-book libepoxy libexttextcat libjpeg libmspack libmwaw libmysqlclient libodfgen libpthreadstubs librdf_rasqal librdf_redland librevenge librsvg libsndfile libvisio libwpd libwpg libwps libxml2 libxshmfence libxslt libzmf libwebp mdds mythes ncurses neon nspr nss openldap openssl pam perl poppler postgresql python3 sane-backends unixODBC unzip util-linux which zip zlib ] ++ 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; # Although present in qtPackages, we need qtbase.qtPluginPrefix and # qtbase.qtQmlPrefix inherit qtbase; gst_packages = with gst_all_1; [ gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly gstreamer ]; qmlPackages = [ ki18n knotifications qtdeclarative qtquickcontrols qtwayland solid sonnet ]; qtPackages = [ kauth kcompletion kconfigwidgets kglobalaccel ki18n kio kitemviews ktextwidgets kwidgetsaddons kwindowsystem kxmlgui phonon qtbase qtdeclarative qtsvg qttools qtwayland sonnet ]; }; requiredSystemFeatures = [ "big-parallel" ]; meta = with lib; { description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; homepage = "https://libreoffice.org/"; # at least one jar in dependencies sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl3; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; })