Merge pull request #257853 from doronbehar/pkg/libreoffice

-9

pkgs/applications/office/libreoffice/README.md

··· 1 - LibreOffice 2 - =========== 3 - 4 - To generate `src-$VARIANT/download.nix`, i.e. list of additional sources that 5 - the libreoffice build process needs to download: 6 - 7 - nix-shell gen-shell.nix --argstr variant VARIANT --run generate 8 - 9 - Where VARIANT is either `still` or `fresh`.

+181 -170

pkgs/applications/office/libreoffice/default.nix

··· 1 1 { stdenv 2 2 , fetchurl 3 - , fetchpatch 4 3 , lib 5 4 , substituteAll 6 5 , pam ··· 99 100 , 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" ] 100 101 , withHelp ? true 101 102 , kdeIntegration ? false 102 - , mkDerivation ? null 103 + , wrapQtAppsHook ? null 103 104 , qtbase ? null 104 105 , qtx11extras ? null 105 106 , qtwayland ? null ··· 144 145 }; 145 146 146 147 importVariant = f: import (./. + "/src-${variant}/${f}"); 147 - 148 - primary-src = importVariant "primary.nix" { inherit fetchurl; }; 149 - 150 - inherit (primary-src) major minor version; 151 - 152 - langsSpaces = concatStringsSep " " langs; 153 - 154 - mkDrv = if kdeIntegration then mkDerivation else stdenv.mkDerivation; 155 - 148 + # Update these files with: 149 + # nix-shell maintainers/scripts/update.nix --argstr package libreoffice-$VARIANT.unwrapped 150 + version = importVariant "version.nix"; 151 + srcsAttributes = { 152 + main = importVariant "main.nix"; 153 + help = importVariant "help.nix"; 154 + translations = importVariant "translations.nix"; 155 + deps = (importVariant "deps.nix") ++ [ 156 + # TODO: Why is this needed? 157 + (rec { 158 + name = "unowinreg.dll"; 159 + url = "https://dev-www.libreoffice.org/extern/${md5name}"; 160 + sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; 161 + md5 = "185d60944ea767075d27247c3162b3bc"; 162 + md5name = "${md5}-${name}"; 163 + }) 164 + ]; 165 + }; 156 166 srcs = { 157 - primary = primary-src; 158 - third_party = 159 - map (x: ((fetchurl { inherit (x) url sha256 name; }) // { inherit (x) md5name md5; })) 160 - (importVariant "download.nix" ++ [ 161 - (rec { 162 - name = "unowinreg.dll"; 163 - url = "https://dev-www.libreoffice.org/extern/${md5name}"; 164 - sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; 165 - md5 = "185d60944ea767075d27247c3162b3bc"; 166 - md5name = "${md5}-${name}"; 167 - }) 168 - ]); 169 - 170 - translations = primary-src.translations; 171 - help = primary-src.help; 167 + third_party = map (x: 168 + (fetchurl { 169 + inherit (x) url sha256 name; 170 + }) // { 171 + inherit (x) md5name md5; 172 + }) srcsAttributes.deps; 173 + translations = fetchurl srcsAttributes.translations; 174 + help = fetchurl srcsAttributes.help; 172 175 }; 173 176 174 177 # See `postPatch` for details ··· 186 185 kwindowsystem 187 186 ]); 188 187 }; 188 + tarballPath = "external/tarballs"; 189 189 190 - in 191 - (mkDrv rec { 190 + in stdenv.mkDerivation (finalAttrs: { 192 191 pname = "libreoffice"; 193 192 inherit version; 194 - 195 - inherit (primary-src) src; 193 + src = fetchurl srcsAttributes.main; 196 194 197 195 env.NIX_CFLAGS_COMPILE = toString ([ 198 196 "-I${librdf_rasqal}/include/rasqal" # librdf_redland refers to rasqal.h instead of rasqal/rasqal.h ··· 199 199 ] ++ optionals (stdenv.isLinux && stdenv.isAarch64 && variant == "still") [ 200 200 "-O2" # https://bugs.gentoo.org/727188 201 201 ]); 202 - 203 - tarballPath = "external/tarballs"; 204 202 205 203 postUnpack = '' 206 204 mkdir -v $sourceRoot/${tarballPath} ··· 213 215 tar -xf ${srcs.translations} 214 216 ''; 215 217 216 - # Remove build config to reduce the amount of `-dev` outputs in the 217 - # runtime closure. This was introduced in upstream commit 218 - # cbfac11330882c7d0a817b6c37a08b2ace2b66f4, so the patch doesn't apply 219 - # for 7.4. 220 - patches = lib.optionals (lib.versionAtLeast version "7.5") [ 218 + patches = [ 219 + # Remove build config to reduce the amount of `-dev` outputs in the 220 + # runtime closure. This behavior was introduced by upstream in commit 221 + # cbfac11330882c7d0a817b6c37a08b2ace2b66f4 221 222 ./0001-Strip-away-BUILDCONFIG.patch 222 - ] ++ [ 223 - (fetchpatch { 224 - name = "fix-curl-8.2.patch"; 225 - url = "https://github.com/LibreOffice/core/commit/2a68dc02bd19a717d3c86873206fabed1098f228.diff"; 226 - hash = "sha256-C+kts+oaLR3+GbnX/wrFguF7SzgerNataxP0SPxhyY8="; 227 - }) 228 223 ]; 229 224 230 225 # libreoffice tries to reference the BUILDCONFIG (e.g. PKG_CONFIG_PATH) ··· 227 236 disallowedRequisites = lib.optionals (!kdeIntegration) 228 237 (lib.concatMap 229 238 (x: lib.optional (x?dev) x.dev) 230 - buildInputs); 239 + finalAttrs.buildInputs); 231 240 232 - ### QT/KDE 233 - # 234 - # configure.ac assumes that the first directory that contains headers and 235 - # libraries during its checks contains *all* the relevant headers/libs which 236 - # obviously doesn't work for us, so we have 2 options: 237 - # 238 - # 1. patch configure.ac in order to specify the direct paths to various Qt/KDE 239 - # dependencies which is ugly and brittle, or 240 - # 241 - # 2. use symlinkJoin to pull in the relevant dependencies and just patch in 242 - # that path which is *also* ugly, but far less likely to break 243 - # 244 - # The 2nd option is not very Nix'y, but I'll take robust over nice any day. 245 - # Additionally, it's much easier to fix if LO breaks on the next upgrade (just 246 - # add the missing dependencies to it). 247 241 postPatch = '' 248 - substituteInPlace shell/source/unix/exec/shellexec.cxx \ 249 - --replace xdg-open ${if kdeIntegration then "kde-open5" else "xdg-open"} 250 - 251 242 # configure checks for header 'gpgme++/gpgmepp_version.h', 252 243 # and if it is found (no matter where) uses a hardcoded path 253 244 # in what presumably is an effort to make it possible to write ··· 240 267 'GPGMEPP_CFLAGS=-I/usr/include/gpgme++' \ 241 268 'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++' 242 269 '' + optionalString kdeIntegration '' 270 + substituteInPlace shell/source/unix/exec/shellexec.cxx \ 271 + --replace xdg-open kde-open5 272 + # configure.ac assumes that the first directory that contains headers and 273 + # libraries during its checks contains *all* the relevant headers/libs which 274 + # obviously doesn't work for us, so we have 2 options: 275 + # 276 + # 1. patch configure.ac in order to specify the direct paths to various Qt/KDE 277 + # dependencies which is ugly and brittle, or 278 + # 279 + # 2. use symlinkJoin to pull in the relevant dependencies and just patch in 280 + # that path which is *also* ugly, but far less likely to break 281 + # 282 + # The 2nd option is not very Nix'y, but I'll take robust over nice any day. 283 + # Additionally, it's much easier to fix if LO breaks on the next upgrade (just 284 + # add the missing dependencies to it). 243 285 substituteInPlace configure.ac \ 244 286 --replace '$QT5INC ' '$QT5INC ${kdeDeps}/include ' \ 245 287 --replace '$QT5LIB ' '$QT5LIB ${kdeDeps}/lib ' \ ··· 268 280 preConfigure = '' 269 281 configureFlagsArray=( 270 282 "--with-parallelism=$NIX_BUILD_CORES" 271 - "--with-lang=${langsSpaces}" 283 + "--with-lang=${concatStringsSep " " langs}" 272 284 ); 273 285 274 286 chmod a+x ./bin/unpack-sources ··· 282 294 NOCONFIGURE=1 ./autogen.sh 283 295 ''; 284 296 285 - postConfigure = 297 + postConfigure = '' 286 298 # fetch_Download_item tries to interpret the name as a variable name, let it do so... 287 - '' 288 - sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile 289 - sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile 290 - '' 291 - # Test fixups 292 - # May need to be revisited/pruned, left alone for now. 293 - + '' 294 - # unit test sd_tiledrendering seems to be fragile 295 - # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html 296 - echo > ./sd/CppunitTest_sd_tiledrendering.mk 297 - sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk 298 - # Pivot chart tests. Fragile. 299 - sed -e '/CPPUNIT_TEST(testRoundtrip)/d' -i chart2/qa/extras/PivotChartTest.cxx 300 - sed -e '/CPPUNIT_TEST(testPivotTableMedianODS)/d' -i sc/qa/unit/pivottable_filters_test.cxx 301 - # one more fragile test? 302 - sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx 303 - # this I actually hate, this should be a data consistency test! 304 - sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx 305 - # rendering-dependent test 306 - # tilde expansion in path processing checks the existence of $HOME 307 - sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx 308 - # fails on systems using ZFS, see https://github.com/NixOS/nixpkgs/issues/19071 309 - sed -e '/CPPUNIT_TEST(getSystemPathFromFileURL_005);/d' -i './sal/qa/osl/file/osl_File.cxx' 310 - # rendering-dependent: on my computer the test table actually doesn't fit… 311 - # interesting fact: test disabled on macOS by upstream 312 - sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx 313 - # Segfault on DB access — maybe temporarily acceptable for a new version of Fresh? 314 - sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk 315 - # one more fragile test? 316 - sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx 317 - # rendering-dependent tests 318 - sed -e '/CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape)/d' -i sc/qa/unit/filters-test.cxx 319 - sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx 320 - sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx 321 - sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 322 - sed -z -r -e 's/DECLARE_OOXMLIMPORT_TEST[(]testTdf112443,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlimport/ooxmlimport.cxx 323 - sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx 324 - # not sure about this fragile test 325 - sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx 326 - # bunch of new Fresh failures. Sigh. 327 - sed -e '/CPPUNIT_TEST(testDocumentLayout);/d' -i './sd/qa/unit/import-tests.cxx' 328 - sed -e '/CPPUNIT_TEST(testErrorBarDataRangeODS);/d' -i './chart2/qa/extras/chart2export.cxx' 329 - sed -e '/CPPUNIT_TEST(testLabelStringODS);/d' -i './chart2/qa/extras/chart2export.cxx' 330 - sed -e '/CPPUNIT_TEST(testAxisNumberFormatODS);/d' -i './chart2/qa/extras/chart2export.cxx' 331 - sed -e '/CPPUNIT_TEST(testBackgroundImage);/d' -i './sd/qa/unit/export-tests.cxx' 332 - sed -e '/CPPUNIT_TEST(testFdo84043);/d' -i './sd/qa/unit/export-tests.cxx' 333 - sed -e '/CPPUNIT_TEST(testTdf97630);/d' -i './sd/qa/unit/export-tests.cxx' 334 - sed -e '/CPPUNIT_TEST(testTdf80020);/d' -i './sd/qa/unit/export-tests.cxx' 335 - sed -e '/CPPUNIT_TEST(testTdf62176);/d' -i './sd/qa/unit/export-tests.cxx' 336 - sed -e '/CPPUNIT_TEST(testTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' 337 - sed -e '/CPPUNIT_TEST(testEmbeddedPdf);/d' -i './sd/qa/unit/export-tests.cxx' 338 - sed -e '/CPPUNIT_TEST(testEmbeddedText);/d' -i './sd/qa/unit/export-tests.cxx' 339 - sed -e '/CPPUNIT_TEST(testTdf98477);/d' -i './sd/qa/unit/export-tests.cxx' 340 - sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' 341 - sed -e '/CPPUNIT_TEST(testTdf50499);/d' -i './sd/qa/unit/export-tests.cxx' 342 - sed -e '/CPPUNIT_TEST(testTdf100926);/d' -i './sd/qa/unit/export-tests.cxx' 343 - sed -e '/CPPUNIT_TEST(testPageWithTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' 344 - sed -e '/CPPUNIT_TEST(testTextRotation);/d' -i './sd/qa/unit/export-tests.cxx' 345 - sed -e '/CPPUNIT_TEST(testTdf113818);/d' -i './sd/qa/unit/export-tests.cxx' 346 - sed -e '/CPPUNIT_TEST(testTdf119629);/d' -i './sd/qa/unit/export-tests.cxx' 347 - sed -e '/CPPUNIT_TEST(testTdf113822);/d' -i './sd/qa/unit/export-tests.cxx' 348 - sed -e '/CPPUNIT_TEST(testTdf105739);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' 349 - sed -e '/CPPUNIT_TEST(testPageBitmapWithTransparency);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' 350 - sed -e '/CPPUNIT_TEST(testTdf115005);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' 351 - sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_On);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' 352 - sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_Off);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' 353 - sed -e '/CPPUNIT_TEST(testTdf44774);/d' -i './sd/qa/unit/misc-tests.cxx' 354 - sed -e '/CPPUNIT_TEST(testTdf38225);/d' -i './sd/qa/unit/misc-tests.cxx' 355 - sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' 356 - sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests.cxx' 357 - sed -e '/CPPUNIT_TEST(testFdo85554);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' 358 - sed -e '/CPPUNIT_TEST(testEmbeddedDataSource);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' 359 - sed -e '/CPPUNIT_TEST(testTdf96479);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' 360 - sed -e '/CPPUNIT_TEST(testInconsistentBookmark);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' 361 - sed -e /CppunitTest_sw_layoutwriter/d -i sw/Module_sw.mk 362 - sed -e /CppunitTest_sw_htmlimport/d -i sw/Module_sw.mk 363 - sed -e /CppunitTest_sw_core_layout/d -i sw/Module_sw.mk 364 - sed -e /CppunitTest_sw_uiwriter6/d -i sw/Module_sw.mk 365 - sed -e /CppunitTest_sdext_pdfimport/d -i sdext/Module_sdext.mk 366 - sed -e /CppunitTest_vcl_pdfexport/d -i vcl/Module_vcl.mk 367 - 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" 368 - 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" 369 - 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" 370 - 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" 299 + sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile 300 + sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile 301 + '' /* Test fixups. May need to be revisited/pruned, left alone for now. */ + '' 302 + # unit test sd_tiledrendering seems to be fragile 303 + # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html 304 + echo > ./sd/CppunitTest_sd_tiledrendering.mk 305 + sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk 306 + # Pivot chart tests. Fragile. 307 + sed -e '/CPPUNIT_TEST(testRoundtrip)/d' -i chart2/qa/extras/PivotChartTest.cxx 308 + sed -e '/CPPUNIT_TEST(testPivotTableMedianODS)/d' -i sc/qa/unit/pivottable_filters_test.cxx 309 + # one more fragile test? 310 + sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx 311 + # this I actually hate, this should be a data consistency test! 312 + sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx 313 + # rendering-dependent test 314 + # tilde expansion in path processing checks the existence of $HOME 315 + sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx 316 + # fails on systems using ZFS, see https://github.com/NixOS/nixpkgs/issues/19071 317 + sed -e '/CPPUNIT_TEST(getSystemPathFromFileURL_005);/d' -i './sal/qa/osl/file/osl_File.cxx' 318 + # rendering-dependent: on my computer the test table actually doesn't fit… 319 + # interesting fact: test disabled on macOS by upstream 320 + sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx 321 + # Segfault on DB access — maybe temporarily acceptable for a new version of Fresh? 322 + sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk 323 + # one more fragile test? 324 + sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx 325 + # rendering-dependent tests 326 + sed -e '/CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape)/d' -i sc/qa/unit/filters-test.cxx 327 + sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx 328 + sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx 329 + sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 330 + sed -z -r -e 's/DECLARE_OOXMLIMPORT_TEST[(]testTdf112443,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlimport/ooxmlimport.cxx 331 + sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx 332 + # not sure about this fragile test 333 + sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx 334 + # bunch of new Fresh failures. Sigh. 335 + sed -e '/CPPUNIT_TEST(testDocumentLayout);/d' -i './sd/qa/unit/import-tests.cxx' 336 + sed -e '/CPPUNIT_TEST(testErrorBarDataRangeODS);/d' -i './chart2/qa/extras/chart2export.cxx' 337 + sed -e '/CPPUNIT_TEST(testLabelStringODS);/d' -i './chart2/qa/extras/chart2export.cxx' 338 + sed -e '/CPPUNIT_TEST(testAxisNumberFormatODS);/d' -i './chart2/qa/extras/chart2export.cxx' 339 + sed -e '/CPPUNIT_TEST(testBackgroundImage);/d' -i './sd/qa/unit/export-tests.cxx' 340 + sed -e '/CPPUNIT_TEST(testFdo84043);/d' -i './sd/qa/unit/export-tests.cxx' 341 + sed -e '/CPPUNIT_TEST(testTdf97630);/d' -i './sd/qa/unit/export-tests.cxx' 342 + sed -e '/CPPUNIT_TEST(testTdf80020);/d' -i './sd/qa/unit/export-tests.cxx' 343 + sed -e '/CPPUNIT_TEST(testTdf62176);/d' -i './sd/qa/unit/export-tests.cxx' 344 + sed -e '/CPPUNIT_TEST(testTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' 345 + sed -e '/CPPUNIT_TEST(testEmbeddedPdf);/d' -i './sd/qa/unit/export-tests.cxx' 346 + sed -e '/CPPUNIT_TEST(testEmbeddedText);/d' -i './sd/qa/unit/export-tests.cxx' 347 + sed -e '/CPPUNIT_TEST(testTdf98477);/d' -i './sd/qa/unit/export-tests.cxx' 348 + sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' 349 + sed -e '/CPPUNIT_TEST(testTdf50499);/d' -i './sd/qa/unit/export-tests.cxx' 350 + sed -e '/CPPUNIT_TEST(testTdf100926);/d' -i './sd/qa/unit/export-tests.cxx' 351 + sed -e '/CPPUNIT_TEST(testPageWithTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' 352 + sed -e '/CPPUNIT_TEST(testTextRotation);/d' -i './sd/qa/unit/export-tests.cxx' 353 + sed -e '/CPPUNIT_TEST(testTdf113818);/d' -i './sd/qa/unit/export-tests.cxx' 354 + sed -e '/CPPUNIT_TEST(testTdf119629);/d' -i './sd/qa/unit/export-tests.cxx' 355 + sed -e '/CPPUNIT_TEST(testTdf113822);/d' -i './sd/qa/unit/export-tests.cxx' 356 + sed -e '/CPPUNIT_TEST(testTdf105739);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' 357 + sed -e '/CPPUNIT_TEST(testPageBitmapWithTransparency);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' 358 + sed -e '/CPPUNIT_TEST(testTdf115005);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' 359 + sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_On);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' 360 + sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_Off);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' 361 + sed -e '/CPPUNIT_TEST(testTdf44774);/d' -i './sd/qa/unit/misc-tests.cxx' 362 + sed -e '/CPPUNIT_TEST(testTdf38225);/d' -i './sd/qa/unit/misc-tests.cxx' 363 + sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' 364 + sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests.cxx' 365 + sed -e '/CPPUNIT_TEST(testFdo85554);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' 366 + sed -e '/CPPUNIT_TEST(testEmbeddedDataSource);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' 367 + sed -e '/CPPUNIT_TEST(testTdf96479);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' 368 + sed -e '/CPPUNIT_TEST(testInconsistentBookmark);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' 369 + sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' 370 + sed -e /CppunitTest_sw_layoutwriter/d -i sw/Module_sw.mk 371 + sed -e /CppunitTest_sw_htmlimport/d -i sw/Module_sw.mk 372 + sed -e /CppunitTest_sw_core_layout/d -i sw/Module_sw.mk 373 + sed -e /CppunitTest_sw_uiwriter6/d -i sw/Module_sw.mk 374 + sed -e /CppunitTest_sdext_pdfimport/d -i sdext/Module_sdext.mk 375 + sed -e /CppunitTest_vcl_pdfexport/d -i vcl/Module_vcl.mk 376 + sed -e /CppunitTest_sc_ucalc_formula/d -i sc/Module_sc.mk 377 + 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" 378 + 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" 379 + 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" 380 + 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" 371 381 372 - # testReqIfTable fails since libxml2: 2.10.3 -> 2.10.4 373 - sed -e 's@.*"/html/body/div/table/tr/th".*@//&@' -i sw/qa/extras/htmlexport/htmlexport.cxx 374 - '' 375 - # This to avoid using /lib:/usr/lib at linking 376 - + '' 377 - sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk 382 + sed -e '/CPPUNIT_ASSERT(!bRTL);/d' -i './vcl/qa/cppunit/text.cxx' 383 + sed -e '/CPPUNIT_ASSERT_EQUAL(0, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 384 + sed -e '/CPPUNIT_ASSERT_EQUAL(4, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 385 + sed -e '/CPPUNIT_ASSERT_EQUAL(11, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 386 + sed -e '/CPPUNIT_ASSERT_EQUAL(18, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 387 + sed -e '/CPPUNIT_ASSERT_EQUAL(3, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 388 + sed -e '/CPPUNIT_ASSERT_EQUAL(9, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 389 + sed -e '/CPPUNIT_ASSERT_EQUAL(17, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 390 + sed -e '/CPPUNIT_ASSERT_EQUAL(22, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 378 391 379 - find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \; 380 - ''; 392 + # testReqIfTable fails since libxml2: 2.10.3 -> 2.10.4 393 + sed -e 's@.*"/html/body/div/table/tr/th".*@//&@' -i sw/qa/extras/htmlexport/htmlexport.cxx 394 + '' /* This to avoid using /lib:/usr/lib at linking */ + '' 395 + sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk 396 + 397 + find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \; 398 + '' + optionalString stdenv.isAarch64 '' 399 + sed -e '/CPPUNIT_TEST(testStatisticalFormulasFODS);/d' -i './sc/qa/unit/functions_statistical.cxx' 400 + ''; 381 401 382 402 makeFlags = [ "SHELL=${bash}/bin/bash" ]; 383 403 ··· 402 406 403 407 cp -r sysui/desktop/icons "$out/share" 404 408 sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop 405 - 406 - # Install dolphin templates, like debian does 407 - install -D extras/source/shellnew/soffice.* --target-directory="$out/share/templates/.source" 408 - cp ${substituteAll {src = ./soffice-template.desktop; app="Writer"; ext="odt"; type="text"; }} $out/share/templates/soffice.odt.desktop 409 - cp ${substituteAll {src = ./soffice-template.desktop; app="Calc"; ext="ods"; type="spreadsheet"; }} $out/share/templates/soffice.ods.desktop 410 - cp ${substituteAll {src = ./soffice-template.desktop; app="Impress"; ext="odp"; type="presentation";}} $out/share/templates/soffice.odp.desktop 411 - cp ${substituteAll {src = ./soffice-template.desktop; app="Draw"; ext="odg"; type="drawing"; }} $out/share/templates/soffice.odg.desktop 412 409 ''; 413 410 414 411 # Wrapping is done in ./wrapper.nix ··· 464 475 "--without-system-libqxp" 465 476 "--without-system-dragonbox" 466 477 "--without-system-libfixmath" 478 + # the "still" variant doesn't support Nixpkgs' mdds 2.1, only mdds 2.0 479 + ] ++ optionals (variant == "still") [ 480 + "--without-system-mdds" 481 + ] ++ optionals (variant == "fresh") [ 467 482 "--with-system-mdds" 483 + ] ++ [ 468 484 # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f 469 485 "--without-system-orcus" 470 486 "--without-system-xmlsec" 471 - "--without-system-cuckoo" 472 487 "--without-system-zxing" 473 488 ] ++ optionals kdeIntegration [ 474 489 "--enable-kf5" 475 490 "--enable-qt5" 476 491 "--enable-gtk3-kde5" 492 + ] ++ optionals (variant == "fresh") [ 493 + "--without-system-dragonbox" 494 + "--without-system-libfixmath" 495 + # Technically needed only when kdeIntegration is enabled in the "fresh" 496 + # variant. Won't hurt to put it here for every "fresh" variant. 497 + "--without-system-frozen" 477 498 ]; 478 499 479 500 checkTarget = concatStringsSep " " [ ··· 500 501 jdk17 501 502 libtool 502 503 pkg-config 504 + ] ++ optionals kdeIntegration [ 505 + wrapQtAppsHook 503 506 ]; 504 507 505 - buildInputs = with xorg; [ 508 + buildInputs = with xorg; finalAttrs.passthru.gst_packages ++ [ 506 509 ArchiveZip 507 510 CoinMP 508 511 IOCompress ··· 573 572 libxshmfence 574 573 libxslt 575 574 libzmf 575 + libwebp 576 576 mdds 577 577 mythes 578 578 ncurses ··· 594 592 which 595 593 zip 596 594 zlib 597 - ] 598 - ++ passthru.gst_packages 599 - ++ optionals kdeIntegration [ qtbase qtx11extras kcoreaddons kio ] 600 - ++ optionals (lib.versionAtLeast (lib.versions.majorMinor version) "7.4") [ libwebp ]; 595 + ] ++ optionals kdeIntegration [ 596 + qtbase 597 + qtx11extras 598 + kcoreaddons 599 + kio 600 + ]; 601 601 602 602 passthru = { 603 603 inherit srcs; 604 604 jdk = jre'; 605 + updateScript = [ 606 + ./update.sh 607 + # Pass it this file name as argument 608 + (builtins.unsafeGetAttrPos "pname" finalAttrs.finalPackage).file 609 + # And the variant 610 + variant 611 + ]; 605 612 inherit kdeIntegration; 606 613 # For the wrapper.nix 607 614 inherit gtk3; ··· 667 656 maintainers = with maintainers; [ raskin ]; 668 657 platforms = platforms.linux; 669 658 }; 670 - }).overrideAttrs ((importVariant "override.nix") (args // { inherit kdeIntegration; })) 659 + })

-4

pkgs/applications/office/libreoffice/download-list-builder.sh

··· 1 - if [ -e .attrs.sh ]; then source .attrs.sh; fi 2 - source $stdenv/setup 3 - 4 - tar --extract --file=$src libreoffice-$version/download.lst -O > $out

-29

pkgs/applications/office/libreoffice/gen-shell.nix

··· 1 - { pkgs ? (import <nixpkgs> {}), variant }: 2 - 3 - with pkgs; 4 - 5 - let 6 - 7 - primary-src = callPackage (./. + "/src-${variant}/primary.nix") {}; 8 - 9 - in 10 - 11 - stdenv.mkDerivation { 12 - name = "generate-libreoffice-srcs-shell"; 13 - 14 - buildCommand = "exit 1"; 15 - 16 - downloadList = stdenv.mkDerivation { 17 - name = "libreoffice-${primary-src.version}-download-list"; 18 - inherit (primary-src) src version; 19 - builder = ./download-list-builder.sh; 20 - }; 21 - 22 - buildInputs = [ python3 ]; 23 - 24 - shellHook = '' 25 - function generate { 26 - python3 generate-libreoffice-srcs.py ${variant} > src-${variant}/download.nix 27 - } 28 - ''; 29 - }

-10

pkgs/applications/office/libreoffice/gpgme-1.18.patch

··· 1 - The way this check mixes C and C++ started to cause issues since gpgme 1.18.0 2 - But we can confidently skip the function check anyway. 3 - --- a/configure.ac 4 - +++ b/configure.ac 5 - @@ -12302,4 +12302 @@ 6 - - # progress_callback is the only func with plain C linkage 7 - - # checking for it also filters out older, KDE-dependent libgpgmepp versions 8 - - AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ], 9 - - [AC_MSG_ERROR(gpgmepp not found or not functional)], []) 10 - + GPGMEPP_LIBS=-lgpgmepp

-100

pkgs/applications/office/libreoffice/poppler-22-04-0.patch

··· 1 - Patch from OpenSUSE 2 - https://build.opensuse.org/package/view_file/LibreOffice:Factory/libreoffice/poppler-22-04-0.patch?expand=1&rev=45e176f964509ebe3560d0dbf1ec8be9 3 - Index: libreoffice-7.3.3.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 4 - =================================================================== 5 - --- libreoffice-7.3.3.1.orig/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 6 - +++ libreoffice-7.3.3.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 7 - @@ -474,12 +474,21 @@ int PDFOutDev::parseFont( long long nNew 8 - { 9 - // TODO(P3): Unfortunately, need to read stream twice, since 10 - // we must write byte count to stdout before 11 - +#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed 12 - + auto pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef()); 13 - + if ( pBuf ) 14 - + { 15 - + aNewFont.isEmbedded = true; 16 - + nSize = pBuf->size(); 17 - + } 18 - +#else 19 - char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); 20 - if( pBuf ) 21 - { 22 - aNewFont.isEmbedded = true; 23 - gfree(pBuf); 24 - } 25 - +#endif 26 - } 27 - 28 - m_aFontMap[ nNewId ] = aNewFont; 29 - @@ -492,21 +501,35 @@ void PDFOutDev::writeFontFile( GfxFont* 30 - return; 31 - 32 - int nSize = 0; 33 - +#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed 34 - + auto pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef()); 35 - + if ( !pBuf ) 36 - + return; 37 - + nSize = pBuf->size(); 38 - +#else 39 - char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); 40 - if( !pBuf ) 41 - return; 42 - +#endif 43 - 44 - // ---sync point--- see SYNC STREAMS above 45 - fflush(stdout); 46 - 47 - +#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed 48 - + if( fwrite(pBuf->data(), sizeof(unsigned char), nSize, g_binary_out) != static_cast<size_t>(nSize) ) 49 - + { 50 - +#else 51 - if( fwrite(pBuf, sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) ) 52 - { 53 - gfree(pBuf); 54 - +#endif 55 - exit(1); // error 56 - } 57 - // ---sync point--- see SYNC STREAMS above 58 - fflush(g_binary_out); 59 - +#if !POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed 60 - gfree(pBuf); 61 - +#endif 62 - } 63 - 64 - #if POPPLER_CHECK_VERSION(0, 83, 0) 65 - @@ -759,7 +782,11 @@ void PDFOutDev::updateFont(GfxState *sta 66 - { 67 - assert(state); 68 - 69 - +#if POPPLER_CHECK_VERSION(22, 04, 0) 70 - + std::shared_ptr<GfxFont> gfxFont = state->getFont(); 71 - +#else 72 - GfxFont *gfxFont = state->getFont(); 73 - +#endif 74 - if( !gfxFont ) 75 - return; 76 - 77 - @@ -776,7 +803,11 @@ void PDFOutDev::updateFont(GfxState *sta 78 - m_aFontMap.find( fontID ); 79 - if( it == m_aFontMap.end() ) 80 - { 81 - +#if POPPLER_CHECK_VERSION(22, 04, 0) 82 - + nEmbedSize = parseFont( fontID, gfxFont.get(), state ); 83 - +#else 84 - nEmbedSize = parseFont( fontID, gfxFont, state ); 85 - +#endif 86 - it = m_aFontMap.find( fontID ); 87 - } 88 - 89 - @@ -806,7 +837,11 @@ void PDFOutDev::updateFont(GfxState *sta 90 - 91 - if (nEmbedSize) 92 - { 93 - +#if POPPLER_CHECK_VERSION(22, 04, 0) 94 - + writeFontFile(gfxFont.get()); 95 - +#else 96 - writeFontFile(gfxFont); 97 - +#endif 98 - } 99 - } 100 -

-29

pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch

··· 1 - --- a/i18npool/qa/cppunit/test_breakiterator.cxx 2 - +++ b/i18npool/qa/cppunit/test_breakiterator.cxx 3 - @@ -35,7 +35,7 @@ public: 4 - void testWeak(); 5 - void testAsian(); 6 - void testThai(); 7 - -#if (U_ICU_VERSION_MAJOR_NUM > 51) 8 - +#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70) 9 - void testLao(); 10 - #ifdef TODO 11 - void testNorthernThai(); 12 - @@ -52,7 +52,7 @@ public: 13 - CPPUNIT_TEST(testWeak); 14 - CPPUNIT_TEST(testAsian); 15 - CPPUNIT_TEST(testThai); 16 - -#if (U_ICU_VERSION_MAJOR_NUM > 51) 17 - +#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70) 18 - CPPUNIT_TEST(testLao); 19 - #ifdef TODO 20 - CPPUNIT_TEST(testKhmer); 21 - @@ -843,7 +843,7 @@ void TestBreakIterator::testAsian() 22 - } 23 - } 24 - 25 - -#if (U_ICU_VERSION_MAJOR_NUM > 51) 26 - +#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70) 27 - //A test to ensure that our Lao word boundary detection is useful 28 - void TestBreakIterator::testLao() 29 - {

-6

pkgs/applications/office/libreoffice/soffice-template.desktop

··· 1 - [Desktop Entry] 2 - Name=LibreOffice @app@... 3 - Comment=Enter LibreOffice @app@ filename: 4 - Type=Link 5 - URL=.source/soffice.@ext@ 6 - Icon=libreoffice-oasis-@type@

+40 -40

pkgs/applications/office/libreoffice/src-fresh/download.nix pkgs/applications/office/libreoffice/src-still/deps.nix

··· 98 98 md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; 99 99 } 100 100 { 101 - name = "curl-8.0.1.tar.xz"; 102 - url = "https://dev-www.libreoffice.org/src/curl-8.0.1.tar.xz"; 103 - sha256 = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0"; 101 + name = "curl-8.2.1.tar.xz"; 102 + url = "https://dev-www.libreoffice.org/src/curl-8.2.1.tar.xz"; 103 + sha256 = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894"; 104 104 md5 = ""; 105 - md5name = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0-curl-8.0.1.tar.xz"; 105 + md5name = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894-curl-8.2.1.tar.xz"; 106 106 } 107 107 { 108 108 name = "libe-book-0.1.3.tar.xz"; ··· 273 273 md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; 274 274 } 275 275 { 276 - name = "freetype-2.12.0.tar.xz"; 277 - url = "https://dev-www.libreoffice.org/src/freetype-2.12.0.tar.xz"; 278 - sha256 = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033"; 276 + name = "freetype-2.13.0.tar.xz"; 277 + url = "https://dev-www.libreoffice.org/src/freetype-2.13.0.tar.xz"; 278 + sha256 = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c"; 279 279 md5 = ""; 280 - md5name = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033-freetype-2.12.0.tar.xz"; 280 + md5name = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c-freetype-2.13.0.tar.xz"; 281 281 } 282 282 { 283 283 name = "glm-0.9.9.8.zip"; ··· 427 427 md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; 428 428 } 429 429 { 430 - name = "language-subtag-registry-2022-08-08.tar.bz2"; 431 - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2022-08-08.tar.bz2"; 432 - sha256 = "e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00"; 430 + name = "language-subtag-registry-2023-05-11.tar.bz2"; 431 + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2023-05-11.tar.bz2"; 432 + sha256 = "9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da"; 433 433 md5 = ""; 434 - md5name = "e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00-language-subtag-registry-2022-08-08.tar.bz2"; 434 + md5name = "9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da-language-subtag-registry-2023-05-11.tar.bz2"; 435 435 } 436 436 { 437 437 name = "lcms2-2.12.tar.gz"; ··· 504 504 md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; 505 505 } 506 506 { 507 - name = "libwebp-1.3.0.tar.gz"; 508 - url = "https://dev-www.libreoffice.org/src/libwebp-1.3.0.tar.gz"; 509 - sha256 = "64ac4614db292ae8c5aa26de0295bf1623dbb3985054cb656c55e67431def17c"; 507 + name = "libwebp-1.3.2.tar.gz"; 508 + url = "https://dev-www.libreoffice.org/src/libwebp-1.3.2.tar.gz"; 509 + sha256 = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4"; 510 510 md5 = ""; 511 - md5name = "64ac4614db292ae8c5aa26de0295bf1623dbb3985054cb656c55e67431def17c-libwebp-1.3.0.tar.gz"; 511 + md5name = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4-libwebp-1.3.2.tar.gz"; 512 512 } 513 513 { 514 514 name = "xmlsec1-1.2.37.tar.gz"; ··· 518 518 md5name = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c-xmlsec1-1.2.37.tar.gz"; 519 519 } 520 520 { 521 - name = "libxml2-2.10.4.tar.xz"; 522 - url = "https://dev-www.libreoffice.org/src/libxml2-2.10.4.tar.xz"; 523 - sha256 = "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45"; 521 + name = "libxml2-2.11.4.tar.xz"; 522 + url = "https://dev-www.libreoffice.org/src/libxml2-2.11.4.tar.xz"; 523 + sha256 = "737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7"; 524 524 md5 = ""; 525 - md5name = "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45-libxml2-2.10.4.tar.xz"; 525 + md5name = "737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7-libxml2-2.11.4.tar.xz"; 526 526 } 527 527 { 528 528 name = "libxslt-1.1.35.tar.xz"; ··· 588 588 md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz"; 589 589 } 590 590 { 591 - name = "nss-3.88.1-with-nspr-4.35.tar.gz"; 592 - url = "https://dev-www.libreoffice.org/src/nss-3.88.1-with-nspr-4.35.tar.gz"; 593 - sha256 = "fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a"; 591 + name = "nss-3.90-with-nspr-4.35.tar.gz"; 592 + url = "https://dev-www.libreoffice.org/src/nss-3.90-with-nspr-4.35.tar.gz"; 593 + sha256 = "f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739"; 594 594 md5 = ""; 595 - md5name = "fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a-nss-3.88.1-with-nspr-4.35.tar.gz"; 595 + md5name = "f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739-nss-3.90-with-nspr-4.35.tar.gz"; 596 596 } 597 597 { 598 598 name = "libodfgen-0.1.8.tar.xz"; ··· 623 623 md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz"; 624 624 } 625 625 { 626 - name = "openssl-3.0.8.tar.gz"; 627 - url = "https://dev-www.libreoffice.org/src/openssl-3.0.8.tar.gz"; 628 - sha256 = "6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e"; 626 + name = "openssl-3.0.10.tar.gz"; 627 + url = "https://dev-www.libreoffice.org/src/openssl-3.0.10.tar.gz"; 628 + sha256 = "1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323"; 629 629 md5 = ""; 630 - md5name = "6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e-openssl-3.0.8.tar.gz"; 630 + md5name = "1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323-openssl-3.0.10.tar.gz"; 631 631 } 632 632 { 633 633 name = "liborcus-0.17.2.tar.bz2"; ··· 644 644 md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; 645 645 } 646 646 { 647 - name = "pdfium-5408.tar.bz2"; 648 - url = "https://dev-www.libreoffice.org/src/pdfium-5408.tar.bz2"; 649 - sha256 = "7db59b1e91f2bc0ab4c5e19d1a4f881e6a47dbb0d3b7e980a7358225b12a0f35"; 647 + name = "pdfium-5778.tar.bz2"; 648 + url = "https://dev-www.libreoffice.org/src/pdfium-5778.tar.bz2"; 649 + sha256 = "b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06"; 650 650 md5 = ""; 651 - md5name = "7db59b1e91f2bc0ab4c5e19d1a4f881e6a47dbb0d3b7e980a7358225b12a0f35-pdfium-5408.tar.bz2"; 651 + md5name = "b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06-pdfium-5778.tar.bz2"; 652 652 } 653 653 { 654 654 name = "pixman-0.42.2.tar.gz"; ··· 665 665 md5name = "1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937-libpng-1.6.39.tar.xz"; 666 666 } 667 667 { 668 - name = "tiff-4.5.0rc3.tar.xz"; 669 - url = "https://dev-www.libreoffice.org/src/tiff-4.5.0rc3.tar.xz"; 670 - sha256 = "dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c"; 668 + name = "tiff-4.5.1.tar.xz"; 669 + url = "https://dev-www.libreoffice.org/src/tiff-4.5.1.tar.xz"; 670 + sha256 = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a"; 671 671 md5 = ""; 672 - md5name = "dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c-tiff-4.5.0rc3.tar.xz"; 672 + md5name = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a-tiff-4.5.1.tar.xz"; 673 673 } 674 674 { 675 675 name = "poppler-22.12.0.tar.xz"; ··· 693 693 md5name = "5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2-postgresql-13.10.tar.bz2"; 694 694 } 695 695 { 696 - name = "Python-3.8.16.tar.xz"; 697 - url = "https://dev-www.libreoffice.org/src/Python-3.8.16.tar.xz"; 698 - sha256 = "d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562"; 696 + name = "Python-3.8.18.tar.xz"; 697 + url = "https://dev-www.libreoffice.org/src/Python-3.8.18.tar.xz"; 698 + sha256 = "3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f"; 699 699 md5 = ""; 700 - md5name = "d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562-Python-3.8.16.tar.xz"; 700 + md5name = "3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f-Python-3.8.18.tar.xz"; 701 701 } 702 702 { 703 703 name = "libqxp-0.0.2.tar.xz";

+4

pkgs/applications/office/libreoffice/src-fresh/help.nix

··· 1 + { 2 + sha256 = "0j6idhdywnbl0qaimf1ahxaqvp9s0y2hfrbcbmw32c30g812gp3b"; 3 + url = "https://download.documentfoundation.org/libreoffice/src/7.6.2/libreoffice-help-7.6.2.1.tar.xz"; 4 + }

+4

pkgs/applications/office/libreoffice/src-fresh/main.nix

··· 1 + { 2 + sha256 = "18lw5gnjihjwzdsk6xql7ax5lasykxxvg5bp40q4rqics0xp7lp5"; 3 + url = "https://download.documentfoundation.org/libreoffice/src/7.6.2/libreoffice-7.6.2.1.tar.xz"; 4 + }

-22

pkgs/applications/office/libreoffice/src-fresh/override.nix

··· 1 - { lib, kdeIntegration, ... }: 2 - attrs: 3 - { 4 - postConfigure = attrs.postConfigure + '' 5 - sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' 6 - sed -e '/CPPUNIT_ASSERT(!bRTL);/d' -i './vcl/qa/cppunit/text.cxx' 7 - 8 - sed -e '/CPPUNIT_ASSERT_EQUAL(0, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 9 - sed -e '/CPPUNIT_ASSERT_EQUAL(4, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 10 - sed -e '/CPPUNIT_ASSERT_EQUAL(11, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 11 - sed -e '/CPPUNIT_ASSERT_EQUAL(18, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 12 - 13 - sed -e '/CPPUNIT_ASSERT_EQUAL(3, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 14 - sed -e '/CPPUNIT_ASSERT_EQUAL(9, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 15 - sed -e '/CPPUNIT_ASSERT_EQUAL(17, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 16 - sed -e '/CPPUNIT_ASSERT_EQUAL(22, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 17 - ''; 18 - configureFlags = attrs.configureFlags ++ [ 19 - "--without-system-dragonbox" 20 - "--without-system-libfixmath" 21 - ]; 22 - }

-36

pkgs/applications/office/libreoffice/src-fresh/primary.nix

··· 1 - { fetchurl }: 2 - 3 - rec { 4 - fetchSrc = {name, hash}: fetchurl { 5 - url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; 6 - sha256 = hash; 7 - }; 8 - 9 - major = "7"; 10 - minor = "5"; 11 - patch = "4"; 12 - tweak = "1"; 13 - 14 - subdir = "${major}.${minor}.${patch}"; 15 - 16 - version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; 17 - 18 - src = fetchurl { 19 - url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; 20 - hash = "sha256-dWE7yXldkiEnsJOxfxyZ9p05eARqexgRRgNV158VVF4="; 21 - }; 22 - 23 - # FIXME rename 24 - translations = fetchSrc { 25 - name = "translations"; 26 - hash = "sha256-dv3L8DtdxZcwmeXnqtTtwIpOvwZg3aH3VvJBiiZzbh0="; 27 - }; 28 - 29 - # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from 30 - # it and LibreOffice can use these by pointing DICPATH environment variable at the hunspell directory 31 - 32 - help = fetchSrc { 33 - name = "help"; 34 - hash = "sha256-2CrGEyK5AQEAo1Qz1ACmvMH7BaOubW5BNLWv3fDEdOY="; 35 - }; 36 - }

+4

pkgs/applications/office/libreoffice/src-fresh/translations.nix

··· 1 + { 2 + sha256 = "02nnys853na9hwznxnf1h0pm5ymijvpyv9chg45v11vy2ak9y8sv"; 3 + url = "https://download.documentfoundation.org/libreoffice/src/7.6.2/libreoffice-translations-7.6.2.1.tar.xz"; 4 + }

+1

pkgs/applications/office/libreoffice/src-fresh/version.nix

··· 1 + "7.6.2.1"

+140 -175

pkgs/applications/office/libreoffice/src-still/download.nix pkgs/applications/office/libreoffice/src-fresh/deps.nix

··· 7 7 md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; 8 8 } 9 9 { 10 - name = "boost_1_79_0.tar.xz"; 11 - url = "https://dev-www.libreoffice.org/src/boost_1_79_0.tar.xz"; 12 - sha256 = "2058aa88758a0e1aaac1759b3c4bad2526f899c6ecc6eeea79aa5e8fd3ea95dc"; 10 + name = "boost_1_82_0.tar.xz"; 11 + url = "https://dev-www.libreoffice.org/src/boost_1_82_0.tar.xz"; 12 + sha256 = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de"; 13 13 md5 = ""; 14 - md5name = "2058aa88758a0e1aaac1759b3c4bad2526f899c6ecc6eeea79aa5e8fd3ea95dc-boost_1_79_0.tar.xz"; 14 + md5name = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de-boost_1_82_0.tar.xz"; 15 15 } 16 16 { 17 17 name = "box2d-2.4.1.tar.gz"; ··· 98 98 md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; 99 99 } 100 100 { 101 - name = "curl-8.0.1.tar.xz"; 102 - url = "https://dev-www.libreoffice.org/src/curl-8.0.1.tar.xz"; 103 - sha256 = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0"; 101 + name = "curl-8.2.1.tar.xz"; 102 + url = "https://dev-www.libreoffice.org/src/curl-8.2.1.tar.xz"; 103 + sha256 = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894"; 104 104 md5 = ""; 105 - md5name = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0-curl-8.0.1.tar.xz"; 105 + md5name = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894-curl-8.2.1.tar.xz"; 106 106 } 107 107 { 108 108 name = "libe-book-0.1.3.tar.xz"; ··· 154 154 md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2"; 155 155 } 156 156 { 157 - name = "fontconfig-2.13.94.tar.xz"; 158 - url = "https://dev-www.libreoffice.org/src/fontconfig-2.13.94.tar.xz"; 159 - sha256 = "a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c"; 157 + name = "fontconfig-2.14.2.tar.xz"; 158 + url = "https://dev-www.libreoffice.org/src/fontconfig-2.14.2.tar.xz"; 159 + sha256 = "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b"; 160 160 md5 = ""; 161 - md5name = "a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c-fontconfig-2.13.94.tar.xz"; 161 + md5name = "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b-fontconfig-2.14.2.tar.xz"; 162 162 } 163 163 { 164 164 name = "crosextrafonts-20130214.tar.gz"; ··· 210 210 md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; 211 211 } 212 212 { 213 - name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz"; 214 - url = "https://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; 215 - sha256 = "09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f"; 216 - md5 = "907d6e99f241876695c19ff3db0b8923"; 217 - md5name = "907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; 218 - } 219 - { 220 - name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; 221 - url = "https://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; 222 - sha256 = "e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61"; 223 - md5 = "edc4d741888bc0d38e32dbaa17149596"; 224 - md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; 225 - } 226 - { 227 - name = "source-serif-pro-3.000R.tar.gz"; 228 - url = "https://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz"; 229 - sha256 = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3"; 230 - md5 = ""; 231 - md5name = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3-source-serif-pro-3.000R.tar.gz"; 232 - } 233 - { 234 - name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; 235 - url = "https://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; 236 - sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7"; 237 - md5 = ""; 238 - md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz"; 239 - } 240 - { 241 213 name = "noto-fonts-20171024.tar.gz"; 242 214 url = "https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz"; 243 215 sha256 = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994"; ··· 238 266 md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; 239 267 } 240 268 { 241 - name = "Amiri-0.117.zip"; 242 - url = "https://dev-www.libreoffice.org/src/Amiri-0.117.zip"; 243 - sha256 = "9c4e768893e0023a0ad6f488d5c84bd5add6565d3dcadb838ba5b20e75fcc9a7"; 269 + name = "Amiri-1.000.zip"; 270 + url = "https://dev-www.libreoffice.org/src/Amiri-1.000.zip"; 271 + sha256 = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30"; 244 272 md5 = ""; 245 - md5name = "9c4e768893e0023a0ad6f488d5c84bd5add6565d3dcadb838ba5b20e75fcc9a7-Amiri-0.117.zip"; 246 - } 247 - { 248 - name = "ttf-kacst_2.01+mry.tar.gz"; 249 - url = "https://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz"; 250 - sha256 = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56"; 251 - md5 = ""; 252 - md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz"; 273 + md5name = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30-Amiri-1.000.zip"; 253 274 } 254 275 { 255 276 name = "ReemKufi-1.2.zip"; ··· 266 301 md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; 267 302 } 268 303 { 269 - name = "freetype-2.12.0.tar.xz"; 270 - url = "https://dev-www.libreoffice.org/src/freetype-2.12.0.tar.xz"; 271 - sha256 = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033"; 304 + name = "freetype-2.13.0.tar.xz"; 305 + url = "https://dev-www.libreoffice.org/src/freetype-2.13.0.tar.xz"; 306 + sha256 = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c"; 272 307 md5 = ""; 273 - md5name = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033-freetype-2.12.0.tar.xz"; 308 + md5name = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c-freetype-2.13.0.tar.xz"; 309 + } 310 + { 311 + name = "frozen-1.1.1.tar.gz"; 312 + url = "https://dev-www.libreoffice.org/src/frozen-1.1.1.tar.gz"; 313 + sha256 = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45"; 314 + md5 = ""; 315 + md5name = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45-frozen-1.1.1.tar.gz"; 274 316 } 275 317 { 276 318 name = "glm-0.9.9.8.zip"; ··· 301 329 md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; 302 330 } 303 331 { 304 - name = "harfbuzz-7.1.0.tar.xz"; 305 - url = "https://dev-www.libreoffice.org/src/harfbuzz-7.1.0.tar.xz"; 306 - sha256 = "f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b"; 332 + name = "harfbuzz-8.0.0.tar.xz"; 333 + url = "https://dev-www.libreoffice.org/src/harfbuzz-8.0.0.tar.xz"; 334 + sha256 = "1f98b5e3d06a344fe667d7e8210094ced458791499839bddde98c167ce6a7c79"; 307 335 md5 = ""; 308 - md5name = "f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b-harfbuzz-7.1.0.tar.xz"; 336 + md5name = "1f98b5e3d06a344fe667d7e8210094ced458791499839bddde98c167ce6a7c79-harfbuzz-8.0.0.tar.xz"; 309 337 } 310 338 { 311 339 name = "hsqldb_1_8_0.zip"; ··· 315 343 md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; 316 344 } 317 345 { 318 - name = "hunspell-1.7.0.tar.gz"; 319 - url = "https://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz"; 320 - sha256 = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951"; 346 + name = "hunspell-1.7.2.tar.gz"; 347 + url = "https://dev-www.libreoffice.org/src/hunspell-1.7.2.tar.gz"; 348 + sha256 = "11ddfa39afe28c28539fe65fc4f1592d410c1e9b6dd7d8a91ca25d85e9ec65b8"; 321 349 md5 = ""; 322 - md5name = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951-hunspell-1.7.0.tar.gz"; 350 + md5name = "11ddfa39afe28c28539fe65fc4f1592d410c1e9b6dd7d8a91ca25d85e9ec65b8-hunspell-1.7.2.tar.gz"; 323 351 } 324 352 { 325 353 name = "hyphen-2.8.8.tar.gz"; ··· 329 357 md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; 330 358 } 331 359 { 332 - name = "icu4c-71_1-src.tgz"; 333 - url = "https://dev-www.libreoffice.org/src/icu4c-71_1-src.tgz"; 334 - sha256 = "67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf"; 360 + name = "icu4c-73_2-src.tgz"; 361 + url = "https://dev-www.libreoffice.org/src/icu4c-73_2-src.tgz"; 362 + sha256 = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1"; 335 363 md5 = ""; 336 - md5name = "67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf-icu4c-71_1-src.tgz"; 364 + md5name = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1-icu4c-73_2-src.tgz"; 337 365 } 338 366 { 339 - name = "icu4c-71_1-data.zip"; 340 - url = "https://dev-www.libreoffice.org/src/icu4c-71_1-data.zip"; 341 - sha256 = "e3882b4fece6e5e039f22c3189b7ba224180fd26fdbfa9db284617455b93e804"; 367 + name = "icu4c-73_2-data.zip"; 368 + url = "https://dev-www.libreoffice.org/src/icu4c-73_2-data.zip"; 369 + sha256 = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701"; 342 370 md5 = ""; 343 - md5name = "e3882b4fece6e5e039f22c3189b7ba224180fd26fdbfa9db284617455b93e804-icu4c-71_1-data.zip"; 371 + md5name = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701-icu4c-73_2-data.zip"; 344 372 } 345 373 { 346 374 name = "flow-engine-0.9.4.zip"; ··· 420 448 md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; 421 449 } 422 450 { 423 - name = "libjpeg-turbo-2.1.2.tar.gz"; 424 - url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.2.tar.gz"; 425 - sha256 = "09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5"; 451 + name = "libjpeg-turbo-2.1.5.1.tar.gz"; 452 + url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.5.1.tar.gz"; 453 + sha256 = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf"; 426 454 md5 = ""; 427 - md5name = "09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5-libjpeg-turbo-2.1.2.tar.gz"; 455 + md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; 428 456 } 429 457 { 430 - name = "language-subtag-registry-2022-08-08.tar.bz2"; 431 - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2022-08-08.tar.bz2"; 432 - sha256 = "e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00"; 458 + name = "language-subtag-registry-2023-05-11.tar.bz2"; 459 + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2023-05-11.tar.bz2"; 460 + sha256 = "9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da"; 433 461 md5 = ""; 434 - md5name = "e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00-language-subtag-registry-2022-08-08.tar.bz2"; 462 + md5name = "9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da-language-subtag-registry-2023-05-11.tar.bz2"; 435 463 } 436 464 { 437 465 name = "lcms2-2.12.tar.gz"; ··· 441 469 md5name = "18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5-lcms2-2.12.tar.gz"; 442 470 } 443 471 { 444 - name = "libassuan-2.5.5.tar.bz2"; 445 - url = "https://dev-www.libreoffice.org/src/libassuan-2.5.5.tar.bz2"; 446 - sha256 = "8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4"; 472 + name = "libassuan-2.5.6.tar.bz2"; 473 + url = "https://dev-www.libreoffice.org/src/libassuan-2.5.6.tar.bz2"; 474 + sha256 = "e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426"; 447 475 md5 = ""; 448 - md5name = "8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4-libassuan-2.5.5.tar.bz2"; 476 + md5name = "e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426-libassuan-2.5.6.tar.bz2"; 449 477 } 450 478 { 451 479 name = "libatomic_ops-7.6.8.tar.gz"; ··· 497 525 md5name = "5dcb4db3b2340f81f601ce86d8d76b69e34d70f84f804192c901e4b7f84d5fb0-libnumbertext-1.0.11.tar.xz"; 498 526 } 499 527 { 500 - name = "ltm-1.0.zip"; 501 - url = "https://dev-www.libreoffice.org/src/ltm-1.0.zip"; 502 - sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483"; 528 + name = "ltm-1.2.0.tar.xz"; 529 + url = "https://dev-www.libreoffice.org/src/ltm-1.2.0.tar.xz"; 530 + sha256 = "b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1"; 503 531 md5 = ""; 504 - md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; 532 + md5name = "b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1-ltm-1.2.0.tar.xz"; 505 533 } 506 534 { 507 - name = "libwebp-1.2.4.tar.gz"; 508 - url = "https://dev-www.libreoffice.org/src/libwebp-1.2.4.tar.gz"; 509 - sha256 = "7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df"; 535 + name = "libwebp-1.3.2.tar.gz"; 536 + url = "https://dev-www.libreoffice.org/src/libwebp-1.3.2.tar.gz"; 537 + sha256 = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4"; 510 538 md5 = ""; 511 - md5name = "7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df-libwebp-1.2.4.tar.gz"; 539 + md5name = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4-libwebp-1.3.2.tar.gz"; 512 540 } 513 541 { 514 - name = "xmlsec1-1.2.34.tar.gz"; 515 - url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.34.tar.gz"; 516 - sha256 = "52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262"; 542 + name = "xmlsec1-1.2.37.tar.gz"; 543 + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.37.tar.gz"; 544 + sha256 = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c"; 517 545 md5 = ""; 518 - md5name = "52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262-xmlsec1-1.2.34.tar.gz"; 546 + md5name = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c-xmlsec1-1.2.37.tar.gz"; 519 547 } 520 548 { 521 - name = "libxml2-2.10.4.tar.xz"; 522 - url = "https://dev-www.libreoffice.org/src/libxml2-2.10.4.tar.xz"; 523 - sha256 = "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45"; 549 + name = "libxml2-2.11.4.tar.xz"; 550 + url = "https://dev-www.libreoffice.org/src/libxml2-2.11.4.tar.xz"; 551 + sha256 = "737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7"; 524 552 md5 = ""; 525 - md5name = "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45-libxml2-2.10.4.tar.xz"; 553 + md5name = "737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7-libxml2-2.11.4.tar.xz"; 526 554 } 527 555 { 528 - name = "libxslt-1.1.35.tar.xz"; 529 - url = "https://dev-www.libreoffice.org/src/libxslt-1.1.35.tar.xz"; 530 - sha256 = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79"; 556 + name = "libxslt-1.1.38.tar.xz"; 557 + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.38.tar.xz"; 558 + sha256 = "1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1"; 531 559 md5 = ""; 532 - md5name = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79-libxslt-1.1.35.tar.xz"; 560 + md5name = "1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1-libxslt-1.1.38.tar.xz"; 533 561 } 534 562 { 535 563 name = "lp_solve_5.5.tar.gz"; ··· 553 581 md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz"; 554 582 } 555 583 { 556 - name = "mdds-2.0.3.tar.bz2"; 557 - url = "https://dev-www.libreoffice.org/src/mdds-2.0.3.tar.bz2"; 558 - sha256 = "9771fe42e133443c13ca187253763e17c8bc96a1a02aec9e1e8893367ffa9ce5"; 584 + name = "mdds-2.1.1.tar.xz"; 585 + url = "https://dev-www.libreoffice.org/src/mdds-2.1.1.tar.xz"; 586 + sha256 = "1483d90cefb8aa4563c4d0a85cb7b243aa95217d235d422e9ca6722fd5b97e56"; 559 587 md5 = ""; 560 - md5name = "9771fe42e133443c13ca187253763e17c8bc96a1a02aec9e1e8893367ffa9ce5-mdds-2.0.3.tar.bz2"; 588 + md5name = "1483d90cefb8aa4563c4d0a85cb7b243aa95217d235d422e9ca6722fd5b97e56-mdds-2.1.1.tar.xz"; 561 589 } 562 590 { 563 591 name = "mDNSResponder-878.200.35.tar.gz"; ··· 581 609 md5name = "e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c-libmwaw-0.3.21.tar.xz"; 582 610 } 583 611 { 584 - name = "mythes-1.2.4.tar.gz"; 585 - url = "https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; 586 - sha256 = "1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f"; 587 - md5 = "a8c2c5b8f09e7ede322d5c602ff6a4b6"; 588 - md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; 612 + name = "mythes-1.2.5.tar.xz"; 613 + url = "https://dev-www.libreoffice.org/src/mythes-1.2.5.tar.xz"; 614 + sha256 = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d"; 615 + md5 = ""; 616 + md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz"; 589 617 } 590 618 { 591 - name = "nss-3.88.1-with-nspr-4.35.tar.gz"; 592 - url = "https://dev-www.libreoffice.org/src/nss-3.88.1-with-nspr-4.35.tar.gz"; 593 - sha256 = "fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a"; 619 + name = "nss-3.90-with-nspr-4.35.tar.gz"; 620 + url = "https://dev-www.libreoffice.org/src/nss-3.90-with-nspr-4.35.tar.gz"; 621 + sha256 = "f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739"; 594 622 md5 = ""; 595 - md5name = "fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a-nss-3.88.1-with-nspr-4.35.tar.gz"; 623 + md5name = "f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739-nss-3.90-with-nspr-4.35.tar.gz"; 596 624 } 597 625 { 598 626 name = "libodfgen-0.1.8.tar.xz"; ··· 616 644 md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; 617 645 } 618 646 { 619 - name = "openldap-2.4.59.tgz"; 620 - url = "https://dev-www.libreoffice.org/src/openldap-2.4.59.tgz"; 621 - sha256 = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34"; 647 + name = "openldap-2.6.6.tgz"; 648 + url = "https://dev-www.libreoffice.org/src/openldap-2.6.6.tgz"; 649 + sha256 = "082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0"; 622 650 md5 = ""; 623 - md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz"; 651 + md5name = "082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0-openldap-2.6.6.tgz"; 624 652 } 625 653 { 626 - name = "openssl-1.1.1t.tar.gz"; 627 - url = "https://dev-www.libreoffice.org/src/openssl-1.1.1t.tar.gz"; 628 - sha256 = "8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b"; 654 + name = "openssl-3.0.10.tar.gz"; 655 + url = "https://dev-www.libreoffice.org/src/openssl-3.0.10.tar.gz"; 656 + sha256 = "1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323"; 629 657 md5 = ""; 630 - md5name = "8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b-openssl-1.1.1t.tar.gz"; 658 + md5name = "1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323-openssl-3.0.10.tar.gz"; 631 659 } 632 660 { 633 - name = "liborcus-0.17.2.tar.bz2"; 634 - url = "https://dev-www.libreoffice.org/src/liborcus-0.17.2.tar.bz2"; 635 - sha256 = "2a86c405a5929f749b27637509596421d46805753364ab258b035fd01fbde143"; 661 + name = "liborcus-0.18.1.tar.xz"; 662 + url = "https://dev-www.libreoffice.org/src/liborcus-0.18.1.tar.xz"; 663 + sha256 = "6006b9f1576315e313df715a7e72a17f3e0b17d7b6bd119cfa8a0b608ce971eb"; 636 664 md5 = ""; 637 - md5name = "2a86c405a5929f749b27637509596421d46805753364ab258b035fd01fbde143-liborcus-0.17.2.tar.bz2"; 665 + md5name = "6006b9f1576315e313df715a7e72a17f3e0b17d7b6bd119cfa8a0b608ce971eb-liborcus-0.18.1.tar.xz"; 638 666 } 639 667 { 640 668 name = "libpagemaker-0.0.4.tar.xz"; ··· 644 672 md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; 645 673 } 646 674 { 647 - name = "pdfium-5058.tar.bz2"; 648 - url = "https://dev-www.libreoffice.org/src/pdfium-5058.tar.bz2"; 649 - sha256 = "eaf4ce9fad32b5d951c524139df23119b66c67720057defb97acab2dfb2582ac"; 675 + name = "pdfium-5778.tar.bz2"; 676 + url = "https://dev-www.libreoffice.org/src/pdfium-5778.tar.bz2"; 677 + sha256 = "b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06"; 650 678 md5 = ""; 651 - md5name = "eaf4ce9fad32b5d951c524139df23119b66c67720057defb97acab2dfb2582ac-pdfium-5058.tar.bz2"; 679 + md5name = "b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06-pdfium-5778.tar.bz2"; 652 680 } 653 681 { 654 682 name = "pixman-0.42.2.tar.gz"; ··· 658 686 md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz"; 659 687 } 660 688 { 661 - name = "libpng-1.6.39.tar.xz"; 662 - url = "https://dev-www.libreoffice.org/src/libpng-1.6.39.tar.xz"; 663 - sha256 = "1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937"; 689 + name = "libpng-1.6.40.tar.xz"; 690 + url = "https://dev-www.libreoffice.org/src/libpng-1.6.40.tar.xz"; 691 + sha256 = "535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1"; 664 692 md5 = ""; 665 - md5name = "1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937-libpng-1.6.39.tar.xz"; 693 + md5name = "535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1-libpng-1.6.40.tar.xz"; 666 694 } 667 695 { 668 - name = "tiff-4.5.0rc3.tar.xz"; 669 - url = "https://dev-www.libreoffice.org/src/tiff-4.5.0rc3.tar.xz"; 670 - sha256 = "dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c"; 696 + name = "tiff-4.5.1.tar.xz"; 697 + url = "https://dev-www.libreoffice.org/src/tiff-4.5.1.tar.xz"; 698 + sha256 = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a"; 671 699 md5 = ""; 672 - md5name = "dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c-tiff-4.5.0rc3.tar.xz"; 700 + md5name = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a-tiff-4.5.1.tar.xz"; 673 701 } 674 702 { 675 - name = "poppler-22.12.0.tar.xz"; 676 - url = "https://dev-www.libreoffice.org/src/poppler-22.12.0.tar.xz"; 677 - sha256 = "d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0"; 703 + name = "poppler-23.06.0.tar.xz"; 704 + url = "https://dev-www.libreoffice.org/src/poppler-23.06.0.tar.xz"; 705 + sha256 = "d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65"; 678 706 md5 = ""; 679 - md5name = "d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0-poppler-22.12.0.tar.xz"; 707 + md5name = "d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65-poppler-23.06.0.tar.xz"; 680 708 } 681 709 { 682 - name = "poppler-data-0.4.11.tar.gz"; 683 - url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.11.tar.gz"; 684 - sha256 = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c"; 710 + name = "poppler-data-0.4.12.tar.gz"; 711 + url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.12.tar.gz"; 712 + sha256 = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74"; 685 713 md5 = ""; 686 - md5name = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c-poppler-data-0.4.11.tar.gz"; 714 + md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz"; 687 715 } 688 716 { 689 - name = "postgresql-13.10.tar.bz2"; 690 - url = "https://dev-www.libreoffice.org/src/postgresql-13.10.tar.bz2"; 691 - sha256 = "5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2"; 717 + name = "postgresql-13.11.tar.bz2"; 718 + url = "https://dev-www.libreoffice.org/src/postgresql-13.11.tar.bz2"; 719 + sha256 = "4992ff647203566b670d4e54dc5317499a26856c93576d0ea951bdf6bee50bfb"; 692 720 md5 = ""; 693 - md5name = "5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2-postgresql-13.10.tar.bz2"; 721 + md5name = "4992ff647203566b670d4e54dc5317499a26856c93576d0ea951bdf6bee50bfb-postgresql-13.11.tar.bz2"; 694 722 } 695 723 { 696 - name = "Python-3.8.16.tar.xz"; 697 - url = "https://dev-www.libreoffice.org/src/Python-3.8.16.tar.xz"; 698 - sha256 = "d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562"; 724 + name = "Python-3.8.18.tar.xz"; 725 + url = "https://dev-www.libreoffice.org/src/Python-3.8.18.tar.xz"; 726 + sha256 = "3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f"; 699 727 md5 = ""; 700 - md5name = "d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562-Python-3.8.16.tar.xz"; 728 + md5name = "3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f-Python-3.8.18.tar.xz"; 701 729 } 702 730 { 703 731 name = "libqxp-0.0.2.tar.xz"; ··· 742 770 md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; 743 771 } 744 772 { 745 - name = "skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"; 746 - url = "https://dev-www.libreoffice.org/src/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"; 747 - sha256 = "c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9"; 773 + name = "skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"; 774 + url = "https://dev-www.libreoffice.org/src/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"; 775 + sha256 = "0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9"; 748 776 md5 = ""; 749 - md5name = "c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9-skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"; 777 + md5name = "0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9-skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"; 750 778 } 751 779 { 752 780 name = "libstaroffice-0.0.7.tar.xz"; ··· 770 798 md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz"; 771 799 } 772 800 { 773 - name = "ucpp-1.3.2.tar.gz"; 774 - url = "https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; 775 - sha256 = "983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776"; 776 - md5 = "0168229624cfac409e766913506961a8"; 777 - md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; 778 - } 779 - { 780 801 name = "libvisio-0.1.7.tar.xz"; 781 802 url = "https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; 782 803 sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"; ··· 784 819 md5name = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09-libwpd-0.10.3.tar.xz"; 785 820 } 786 821 { 787 - name = "libwpg-0.3.3.tar.xz"; 788 - url = "https://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz"; 789 - sha256 = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c"; 822 + name = "libwpg-0.3.4.tar.xz"; 823 + url = "https://dev-www.libreoffice.org/src/libwpg-0.3.4.tar.xz"; 824 + sha256 = "b55fda9440d1e070630eb2487d8b8697cf412c214a27caee9df69cec7c004de3"; 790 825 md5 = ""; 791 - md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz"; 826 + md5name = "b55fda9440d1e070630eb2487d8b8697cf412c214a27caee9df69cec7c004de3-libwpg-0.3.4.tar.xz"; 792 827 } 793 828 { 794 829 name = "libwps-0.4.12.tar.xz"; ··· 819 854 md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; 820 855 } 821 856 { 822 - name = "zxing-cpp-1.2.0.tar.gz"; 823 - url = "https://dev-www.libreoffice.org/src/zxing-cpp-1.2.0.tar.gz"; 824 - sha256 = "653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a"; 857 + name = "zxing-cpp-2.0.0.tar.gz"; 858 + url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.0.0.tar.gz"; 859 + sha256 = "12b76b7005c30d34265fc20356d340da179b0b4d43d2c1b35bcca86776069f76"; 825 860 md5 = ""; 826 - md5name = "653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a-zxing-cpp-1.2.0.tar.gz"; 861 + md5name = "12b76b7005c30d34265fc20356d340da179b0b4d43d2c1b35bcca86776069f76-zxing-cpp-2.0.0.tar.gz"; 827 862 } 828 863 ]

+4

pkgs/applications/office/libreoffice/src-still/help.nix

··· 1 + { 2 + sha256 = "0lpgcwq03qxvhbl5b9ndaz0cwswd6jin1rfm6hv3kr8q4l52jgb3"; 3 + url = "https://download.documentfoundation.org/libreoffice/src/7.5.7/libreoffice-help-7.5.7.1.tar.xz"; 4 + }

+4

pkgs/applications/office/libreoffice/src-still/main.nix

··· 1 + { 2 + sha256 = "041bs79539w61yqmy971rfpf8qvfs4cl2m2fdjv7n1nqf6a2z4v5"; 3 + url = "https://download.documentfoundation.org/libreoffice/src/7.5.7/libreoffice-7.5.7.1.tar.xz"; 4 + }

-21

pkgs/applications/office/libreoffice/src-still/override.nix

··· 1 - { lib, kdeIntegration, commonsLogging, ... }: 2 - attrs: 3 - { 4 - postConfigure = attrs.postConfigure + '' 5 - sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' 6 - sed -e '/CPPUNIT_ASSERT(!bRTL);/d' -i './vcl/qa/cppunit/text.cxx' 7 - 8 - sed -e '/CPPUNIT_ASSERT_EQUAL(0, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 9 - sed -e '/CPPUNIT_ASSERT_EQUAL(4, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 10 - sed -e '/CPPUNIT_ASSERT_EQUAL(11, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 11 - sed -e '/CPPUNIT_ASSERT_EQUAL(18, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 12 - 13 - sed -e '/CPPUNIT_ASSERT_EQUAL(3, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 14 - sed -e '/CPPUNIT_ASSERT_EQUAL(9, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 15 - sed -e '/CPPUNIT_ASSERT_EQUAL(17, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 16 - sed -e '/CPPUNIT_ASSERT_EQUAL(22, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' 17 - ''; 18 - configureFlags = attrs.configureFlags; 19 - 20 - patches = attrs.patches or []; 21 - }

-36

pkgs/applications/office/libreoffice/src-still/primary.nix

··· 1 - { fetchurl }: 2 - 3 - rec { 4 - fetchSrc = {name, hash}: fetchurl { 5 - url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; 6 - inherit hash; 7 - }; 8 - 9 - major = "7"; 10 - minor = "4"; 11 - patch = "7"; 12 - tweak = "2"; 13 - 14 - subdir = "${major}.${minor}.${patch}"; 15 - 16 - version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; 17 - 18 - src = fetchurl { 19 - url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; 20 - hash = "sha256-dD2R8qE4png4D6eo7LWyQB2ZSwZ7MwdQ8DrY9SOi+yA="; 21 - }; 22 - 23 - # FIXME rename 24 - translations = fetchSrc { 25 - name = "translations"; 26 - hash = "sha256-7wea0EClmvwcPvgQDGagkOF7eBVvYTZScCEEpirdXnE="; 27 - }; 28 - 29 - # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from 30 - # it and LibreOffice can use these by pointing DICPATH environment variable at the hunspell directory 31 - 32 - help = fetchSrc { 33 - name = "help"; 34 - hash = "sha256-vcQWE3mBZx2sBQ9KzTh6zM7277mK9twfvyESTzTiII8="; 35 - }; 36 - }

+4

pkgs/applications/office/libreoffice/src-still/translations.nix

··· 1 + { 2 + sha256 = "1zxhnn8sslrlyb1cyg319slza2kn6mcc4h3li9ssnlfzkrzvxhc4"; 3 + url = "https://download.documentfoundation.org/libreoffice/src/7.5.7/libreoffice-translations-7.5.7.1.tar.xz"; 4 + }

+1

pkgs/applications/office/libreoffice/src-still/version.nix

··· 1 + "7.5.7.1"

+74

pkgs/applications/office/libreoffice/update.sh

··· 1 + #!/usr/bin/env nix-shell 2 + #!nix-shell -i bash -p python3 pup curl jq nix 3 + 4 + set -euo pipefail 5 + echoerr() { echo "$@" 1>&2; } 6 + 7 + fname="$1" 8 + echoerr got fname $fname 9 + shift 10 + 11 + variant="$1" 12 + # See comment near version_major variable 13 + if [[ $variant == fresh ]]; then 14 + head_tail=head 15 + elif [[ $variant == still ]]; then 16 + head_tail=tail 17 + else 18 + echoerr got unknown variant $variant 19 + exit 3 20 + fi 21 + echoerr got variant $variant 22 + shift 23 + 24 + # Not totally needed, but makes it easy to run the update in case tis folder is 25 + # deleted. 26 + mkdir -p "$(dirname $fname)/src-$variant" 27 + cd "$(dirname $fname)/src-$variant" 28 + 29 + # The pup command prints both fresh and still versions one after another, and 30 + # we use either head -1 or tail -1 to get the right version, per the if elif 31 + # above. 32 + version_major="$(curl --silent https://www.libreoffice.org/download/download-libreoffice/ |\ 33 + pup '.dl_version_number text{}' | $head_tail -1)" 34 + echoerr got from website ${variant}_version $version_major 35 + baseurl=https://download.documentfoundation.org/libreoffice/src/$version_major 36 + tarballs=($(curl --silent $baseurl/ |\ 37 + pup 'table json{}' |\ 38 + jq --raw-output '.. | .href? | strings' |\ 39 + grep "$version_major.*.tar.xz$")) 40 + 41 + full_version="$(echo ${tarballs[0]} | sed -e 's/^libreoffice-//' -e 's/.tar.xz$//')" 42 + echoerr full version is $full_version 43 + echo \"$full_version\" > version.nix 44 + 45 + for t in help translations; do 46 + echo "{" > $t.nix 47 + echo " sha256 = "\"$(nix-prefetch-url $baseurl/libreoffice-$t-$full_version.tar.xz)'";' >> $t.nix 48 + echo " url = "\"$baseurl/libreoffice-$t-$full_version.tar.xz'";' >> $t.nix 49 + echo "}" >> $t.nix 50 + done 51 + 52 + # Out of loop nix-prefetch-url, because there is no $t, and we want the output 53 + # path as well, to get the download.lst file from there afterwards. 54 + main_path_hash=($(nix-prefetch-url --print-path $baseurl/libreoffice-$full_version.tar.xz)) 55 + echo "{" > main.nix 56 + echo " sha256 = "\"${main_path_hash[0]}'";' >> main.nix 57 + echo " url = "\"$baseurl/libreoffice-$full_version.tar.xz'";' >> main.nix 58 + echo "}" >> main.nix 59 + echoerr got filename ${main_path_hash[1]} 60 + 61 + # Environment variable required by ../generate-libreoffice-srcs.py 62 + export downloadList=/tmp/nixpkgs-libreoffice-update-download-$full_version.lst 63 + # Need to extract the file only if it doesn't exist, otherwise spare time be 64 + # skipping this. 65 + if [[ ! -f "$downloadList" ]]; then 66 + tar --extract \ 67 + --file=${main_path_hash[1]} \ 68 + libreoffice-$full_version/download.lst \ 69 + -O > $downloadList 70 + else 71 + echoerr relying on previously downloaded downloadList file 72 + fi 73 + cd .. 74 + python3 ./generate-libreoffice-srcs.py > src-$variant/deps.nix

+3 -1

pkgs/applications/office/libreoffice/wrapper.nix

··· 19 19 }: 20 20 21 21 let 22 - inherit (unwrapped.srcs.primary) major minor; 22 + inherit (unwrapped) version; 23 + major = lib.versions.major version; 24 + minor = lib.versions.minor version; 23 25 24 26 makeWrapperArgs = builtins.concatStringsSep " " ([ 25 27 "--set" "GDK_PIXBUF_MODULE_FILE" "${librsvg}/${gdk-pixbuf.moduleDir}.cache"

+2 -2

pkgs/development/libraries/mdds/default.nix

··· 8 8 9 9 stdenv.mkDerivation (finalAttrs: { 10 10 pname = "mdds"; 11 - version = "2.0.3"; 11 + version = "2.1.1"; 12 12 13 13 src = fetchFromGitLab { 14 14 owner = "mdds"; 15 15 repo = "mdds"; 16 16 rev = finalAttrs.version; 17 - hash = "sha256-Y9uBJKM34UTEj/3c1w69QHhvwFcMNlAohEco0O0B+xI="; 17 + hash = "sha256-a412LpgDiYM8TMToaUrTlHtblYS1HehzrDOwvIAAxiA="; 18 18 }; 19 19 20 20 nativeBuildInputs = [ autoreconfHook ];

Configure Feed

Configure Feed