diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 475ce0b4897e..afb0ab092652 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -74,11 +74,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "inkscape"; - version = "1.4"; + version = "1.4.1"; src = fetchurl { url = "https://inkscape.org/release/inkscape-${finalAttrs.version}/source/archive/xz/dl/inkscape-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-xZqFRTtpmt3rzVHB3AdoTdlqEMiuxxaxlVHbUFYuE/U="; + sha256 = "sha256-dHlqivThSg1dXBzFjT7B6m1IigQwbdbo0ywR8HSNcjI="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be @@ -88,12 +88,6 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; patches = [ - (fetchpatch { - # fix typo in gobjectptr member function. remove on update - name = "gobjectptr-fix-member-name.patch"; - url = "https://gitlab.com/inkscape/inkscape/-/commit/eb6dadcf1a5c660167ba43f3606c8e7cc6529787.patch"; - hash = "sha256-FvbJV/YrBwhHg0kFdbhyd/Y9g7YV2nPIrRqZt7yJ50Q="; - }) (replaceVars ./fix-python-paths.patch { # Python is used at run-time to execute scripts, # e.g., those from the "Effects" menu. diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index b07a13beb2b4..519a0d5d5fdf 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -2,8 +2,8 @@ stdenv, lib, fetchFromGitHub, - copyDesktopItems, - makeDesktopItem, + cmake, + pkg-config, qmake, qtbase, qtxmlpatterns, @@ -65,20 +65,20 @@ stdenv.mkDerivation (finalAttrs: { }; postPatch = '' - substituteInPlace OpenBoard.pro \ - --replace-fail '/usr/include/quazip5' '${lib.getDev quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ - --replace-fail '-lquazip5' '-lquazip1-qt5' \ - --replace-fail '/usr/include/poppler' '${lib.getDev poppler}/include/poppler' - substituteInPlace resources/etc/OpenBoard.config \ --replace-fail 'EnableAutomaticSoftwareUpdates=true' 'EnableAutomaticSoftwareUpdates=false' \ --replace-fail 'EnableSoftwareUpdates=true' 'EnableAutomaticSoftwareUpdates=false' \ --replace-fail 'HideCheckForSoftwareUpdate=false' 'HideCheckForSoftwareUpdate=true' ''; + # Required by Poppler + cmakeFlags = [ + "-DCMAKE_CXX_STANDARD=20" + ]; + nativeBuildInputs = [ - qmake - copyDesktopItems + cmake + pkg-config wrapQtAppsHook ]; @@ -111,43 +111,6 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ importer ]; - makeFlags = [ "release-install" ]; - - desktopItems = [ - (makeDesktopItem { - name = "OpenBoard"; - exec = "OpenBoard %f"; - icon = "OpenBoard"; - comment = "OpenBoard, an interactive white board application"; - desktopName = "OpenBoard"; - mimeTypes = [ "application/ubz" ]; - categories = [ "Education" ]; - startupNotify = true; - }) - ]; - - installPhase = '' - runHook preInstall - - lrelease OpenBoard.pro - - # Replicated release_scripts/linux/package.sh - mkdir -p $out/opt/openboard/i18n - cp -R resources/customizations build/linux/release/product/* $out/opt/openboard/ - cp resources/i18n/*.qm $out/opt/openboard/i18n/ - install -m644 resources/linux/openboard-ubz.xml $out/opt/openboard/etc/ - install -Dm644 resources/images/OpenBoard.png $out/share/icons/hicolor/64x64/apps/OpenBoard.png - - runHook postInstall - ''; - - dontWrapQtApps = true; - - postFixup = '' - makeWrapper $out/opt/openboard/OpenBoard $out/bin/OpenBoard \ - "''${qtWrapperArgs[@]}" - ''; - meta = with lib; { description = "Interactive whiteboard application"; homepage = "https://openboard.ch/"; @@ -157,6 +120,6 @@ stdenv.mkDerivation (finalAttrs: { fufexan ]; platforms = platforms.linux; - mainProgram = "OpenBoard"; + mainProgram = "openboard"; }; }) diff --git a/pkgs/applications/kde/kitinerary.nix b/pkgs/applications/kde/kitinerary.nix index 0ccc338badb1..d0376e1030f3 100644 --- a/pkgs/applications/kde/kitinerary.nix +++ b/pkgs/applications/kde/kitinerary.nix @@ -18,6 +18,7 @@ mkDerivation { meta = { license = with lib.licenses; [ lgpl21 ]; maintainers = [ lib.maintainers.bkchr ]; + broken = true; # doesn't build with latest Poppler }; nativeBuildInputs = [ extra-cmake-modules diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index dbad506b8c94..e4903a823013 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -343,6 +343,14 @@ stdenv.mkDerivation (finalAttrs: { # Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking ./readd-explicit-zlib-link.patch + + # Backport patch to fix build with Poppler 25.05 + # FIXME: conditionalize/remove as upstream updates + (fetchpatch2 { + url = "https://github.com/LibreOffice/core/commit/0ee2636304ac049f21415c67e92040f7d6c14d35.patch"; + includes = [ "sdext/*" ]; + hash = "sha256-8yipl5ln1yCNfVM8SuWowsw1Iy/SXIwbdT1ZfNw4cJA="; + }) ] ++ lib.optionals (lib.versionOlder version "24.8") [ (fetchpatch2 { @@ -353,7 +361,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (variant == "collabora") [ ./fix-unpack-collabora.patch - ./skip-broken-sentence-breaking-rules.patch ]; postPatch = '' @@ -613,7 +620,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-gtk3-kde5" ] ++ ( - if variant == "fresh" then + if variant == "fresh" || variant == "collabora" then [ "--with-system-rhino" "--with-rhino-jar=${rhino}/share/java/js.jar" diff --git a/pkgs/applications/office/libreoffice/skip-broken-sentence-breaking-rules.patch b/pkgs/applications/office/libreoffice/skip-broken-sentence-breaking-rules.patch deleted file mode 100644 index 0f0973146c28..000000000000 --- a/pkgs/applications/office/libreoffice/skip-broken-sentence-breaking-rules.patch +++ /dev/null @@ -1,48 +0,0 @@ -This part caused build failures in Collabora. - -LibreOffice has just dropped the entire file some time ago. - ---- a/i18npool/source/breakiterator/data/sent.txt 1970-01-01 01:00:01.000000000 +0100 ---- b/i18npool/source/breakiterator/data/sent.txt 1970-01-01 01:00:01.000000000 +0100 -@@ -88,41 +88,3 @@ - [[^$STerm $ATerm $Close $Sp $Sep $Format $Extend $Thai]{bof}] ($Extend | $Format | $Close | $Sp)* [^$Thai]; - [[^$STerm $ATerm $Close $Sp $Sep $Format $Extend]{bof}] ($Extend | $Format | $Close | $Sp)* ([$Sep{eof}] | $CR $LF){100}; - --## ------------------------------------------------- -- --!!reverse; -- --$SpEx_R = ($Extend | $Format)* $Sp; --$ATermEx_R = ($Extend | $Format)* $ATerm; --$STermEx_R = ($Extend | $Format)* $STerm; --$CloseEx_R = ($Extend | $Format)* $Close; -- --# --# Reverse rules. --# For now, use the old style inexact reverse rules, which are easier --# to write, but less efficient. --# TODO: exact reverse rules. It appears that exact reverse rules --# may require improving support for look-ahead breaks in the --# builder. Needs more investigation. --# -- --[{bof}] (.? | $LF $CR) [^$Sep]* [$Sep {eof}] ($SpEx_R* $CloseEx_R* ($STermEx_R | $ATermEx_R))*; --#.*; -- --# Explanation for this rule: --# --# It needs to back over --# The $Sep at which we probably begin --# All of the non $Sep chars leading to the preceding $Sep --# The preceding $Sep, which will be the second one that the rule matches. --# Any immediately preceding STerm or ATerm sequences. We need to see these --# to get the correct rule status when moving forwards again. --# --# [{bof}] inhibit rule chaining. Without this, rule would loop on itself and match --# the entire string. --# --# (.? | $LF $CR) Match one $Sep instance. Use .? rather than $Sep because position might be --# at the beginning of the string at this point, and we don't want to fail. --# Can only use {eof} once, and it is used later. --# -- diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-collabora.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-collabora.patch index 48c8ca880947..9cd2c9799c97 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests-collabora.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests-collabora.patch @@ -1,6 +1,8 @@ +diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk +index 63dc4b92b90d..fc6d83da6448 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk -@@ -69,8 +69,8 @@ endif +@@ -70,8 +70,8 @@ endif ifneq ($(DISABLE_GUI),TRUE) ifeq ($(OS),LINUX) @@ -10,17 +12,43 @@ CppunitTest_sc_tiledrendering2 \ )) endif +diff --git a/sc/qa/extras/vba-macro-test.cxx b/sc/qa/extras/vba-macro-test.cxx +index 4dc1f0fe93c4..46b506131719 100644 --- a/sc/qa/extras/vba-macro-test.cxx +++ b/sc/qa/extras/vba-macro-test.cxx -@@ -364,7 +364,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba) +@@ -355,7 +355,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba) // Failed: : Test change event for Range.FillRight: // Tests passed: 4 // Tests failed: 4 -#if !defined(_WIN32) +#if 0 // flaky, see above - { OUString("Ranges-3.xls"), - OUString( - "vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, + { u"Ranges-3.xls"_ustr, + u"vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"_ustr }, + #endif +diff --git a/sc/qa/unit/subsequent_export_test2.cxx b/sc/qa/unit/subsequent_export_test2.cxx +index 1396cef69fa5..8ca0e4043f72 100644 +--- a/sc/qa/unit/subsequent_export_test2.cxx ++++ b/sc/qa/unit/subsequent_export_test2.cxx +@@ -100,6 +100,8 @@ CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringXLSX) + + CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringConfigXLSX) + { ++ return; // fails consistently ++ + // this doc is configured with CalcA1 ref syntax + createScDoc("xlsx/empty.xlsx"); + +@@ -137,6 +139,8 @@ CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringConfigXLSX) + + CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringUnspecified) + { ++ return; // fails consistently ++ + createScDoc(); + + ScDocument* pDoc = getScDoc(); +diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx +index 40d2c6f174de..9f540581133e 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -1507,6 +1507,8 @@ CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaAnnotateTrimOnDoubleRefs) @@ -29,21 +57,104 @@ { + return; // fails consistently on nixpkgs? + - m_pDoc->InsertTab(0, "Formula"); + m_pDoc->InsertTab(0, u"Formula"_ustr); sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on. ---- a/sw/qa/extras/tiledrendering/tiledrendering.cxx -+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx -@@ -2948,6 +2948,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testHighlightNumbering_shd) +diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx +index 3892b36b5a85..68d5c21fc896 100644 +--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx ++++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx +@@ -1580,6 +1580,8 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testMultiViewInsertDeletePage) - CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testPilcrowRedlining) + CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testMultiViewInsertDeletePage2) + { ++ return; // fails consistently ++ + // Load the document. + SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp"); + SdTestViewCallback aView1; +diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx +index 17055fa287ed..aa27d6969717 100644 +--- a/sw/qa/extras/layout/layout.cxx ++++ b/sw/qa/extras/layout/layout.cxx +@@ -1364,6 +1364,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInHeader) + #if !defined(MACOSX) + CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf150606) { + return; // flaky + - // Load a document where the top left tile contains - // paragraph and line break symbols with redlining. - SwXTextDocument* pXTextDocument = createDoc("pilcrow-redlining.fodt"); -@@ -4100,6 +4104,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip) + createSwDoc("tdf150606-1-min.odt"); + + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); +diff --git a/sw/qa/extras/layout/layout4.cxx b/sw/qa/extras/layout/layout4.cxx +index eb9abea5a538..a2d511607a48 100644 +--- a/sw/qa/extras/layout/layout4.cxx ++++ b/sw/qa/extras/layout/layout4.cxx +@@ -1518,6 +1518,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf104209VertRTL) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking a first bidi portion correctly underflows in LTR text + createSwDoc("tdf56408-ltr.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -1532,6 +1533,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking a first bidi portion correctly underflows in RTL text + createSwDoc("tdf56408-rtl.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -1546,6 +1548,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // The fix for tdf#56408 introduced a change to line breaking between text with + // direction changes. This test verifies behavior in the trivial case, when a + // break opportunity exists at the direction change boundary. +@@ -1562,6 +1565,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408AfterFieldCrash) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify there is no crash/assertion for underflow after a number field + createSwDoc("tdf56408-after-field.fodt"); + } +@@ -1619,6 +1623,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf164907_rowHeightAtLeast) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions + createSwDoc("tdf157829-ltr.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -1633,6 +1638,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829RTL) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions + createSwDoc("tdf157829-rtl.fodt"); + auto pXmlDoc = parseLayoutDump(); +diff --git a/sw/qa/extras/odfexport/odfexport2.cxx b/sw/qa/extras/odfexport/odfexport2.cxx +index b2c844e91f81..46356e02c050 100644 +--- a/sw/qa/extras/odfexport/odfexport2.cxx ++++ b/sw/qa/extras/odfexport/odfexport2.cxx +@@ -1720,6 +1720,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime) + // - Error: "2001-01-01" does not satisfy the "dateTime" type + // because "2001-01-01T00:00:00" became "2001-01-01" on roundtrip. + loadAndReload("midnight_redline.fodt"); ++ return; // fails on aarch64 + + xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr); + assertXPathContent(pXmlDoc, +diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx +index 1e404a1d733a..33e9866dc828 100644 +--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx ++++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx +@@ -3788,6 +3788,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip) // toggling Formatting Marks on/off for one view should have no effect on other views CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testToggleFormattingMarks) { @@ -52,42 +163,40 @@ SwXTextDocument* pXTextDocument = createDoc(); int nView1 = SfxLokHelper::getView(); +diff --git a/unoxml/qa/unit/rdftest.cxx b/unoxml/qa/unit/rdftest.cxx +index 61c556369d21..c91befbbada2 100644 +--- a/unoxml/qa/unit/rdftest.cxx ++++ b/unoxml/qa/unit/rdftest.cxx +@@ -962,6 +962,7 @@ CPPUNIT_TEST_FIXTURE(RDFStreamTest, testTdf123293) + + CPPUNIT_TEST_FIXTURE(RDFStreamTest, testDocumentMetadataAccess) + { ++ return; // fails on aarch64 + loadFromURL(u"private:factory/swriter"_ustr); + + uno::Reference xDocumentMetadataAccess(mxComponent, +diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx +index c8a9e6e7c3cd..c0a2bb33b312 100644 --- a/vcl/qa/cppunit/complextext.cxx +++ b/vcl/qa/cppunit/complextext.cxx -@@ -529,6 +529,8 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testMixedCJKLatinScript_glyph_advanceme +@@ -553,6 +553,8 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testMixedCJKLatinScript_glyph_advanceme CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf107718) { -+ return; // fails to find the font ++ return; // fails in nixpkgs + #if HAVE_MORE_FONTS #if !defined _WIN32 // TODO: Fails on jenkins but passes locally vcl::Font aFont(u"Source Han Sans"_ustr, u"Regular"_ustr, Size(0, 72)); ---- ./sd/qa/unit/tiledrendering/tiledrendering.cxx 2025-03-22 19:42:09.450877126 +0100 -+++ ./sd/qa/unit/tiledrendering/tiledrendering.cxx 2025-03-22 19:47:05.663896648 +0100 -@@ -2496,6 +2496,7 @@ +diff --git a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +index 4909267f7c74..63a177b0a2a5 100644 +--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx ++++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +@@ -6056,6 +6056,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf162750SmallCapsLigature) - CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testGetViewRenderState) + CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf164106SplitReorderedClusters) { -+ return ; // SD;Dark instead of S;Dark is the correct outcome elsewhere? - SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp"); - int nFirstViewId = SfxLokHelper::getView(); - ViewCallback aView1; ---- ./sc/qa/unit/subsequent_export_test2.cxx 2025-03-22 19:51:50.959915451 +0100 -+++ ./sc/qa/unit/subsequent_export_test2.cxx 2025-03-22 19:51:54.691915697 +0100 -@@ -103,6 +103,7 @@ ++ return; // fails due to missing font: Noto Sans + saveAsPDF(u"tdf164106.fodt"); - CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringConfigXLSX) - { -+ return; // Apparently an issue with loading reference config - // this doc is configured with CalcA1 ref syntax - createScDoc("xlsx/empty.xlsx"); - -@@ -140,6 +141,7 @@ - - CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringUnspecified) - { -+ return; // Apparently an issue with loading reference config - createScDoc(); - - ScDocument* pDoc = getScDoc(); + auto pPdfDocument = parsePDFExport(); diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch index e8bd4b1f95f3..47e267ca1b11 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch @@ -1,6 +1,8 @@ +diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk +index 63dc4b92b90d..fc6d83da6448 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk -@@ -69,8 +69,8 @@ endif +@@ -70,8 +70,8 @@ endif ifneq ($(DISABLE_GUI),TRUE) ifeq ($(OS),LINUX) @@ -10,6 +12,8 @@ CppunitTest_sc_tiledrendering2 \ )) endif +diff --git a/sc/qa/extras/vba-macro-test.cxx b/sc/qa/extras/vba-macro-test.cxx +index 4dc1f0fe93c4..46b506131719 100644 --- a/sc/qa/extras/vba-macro-test.cxx +++ b/sc/qa/extras/vba-macro-test.cxx @@ -355,7 +355,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba) @@ -21,6 +25,8 @@ { u"Ranges-3.xls"_ustr, u"vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"_ustr }, #endif +diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx +index 40d2c6f174de..9f540581133e 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -1507,6 +1507,8 @@ CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaAnnotateTrimOnDoubleRefs) @@ -32,9 +38,11 @@ m_pDoc->InsertTab(0, u"Formula"_ustr); sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on. +diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx +index 17055fa287ed..aa27d6969717 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx -@@ -1347,6 +1347,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInHeader) +@@ -1364,6 +1364,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInHeader) #if !defined(MACOSX) CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf150606) { @@ -42,10 +50,89 @@ + createSwDoc("tdf150606-1-min.odt"); - SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get()); + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); +diff --git a/sw/qa/extras/layout/layout4.cxx b/sw/qa/extras/layout/layout4.cxx +index eb9abea5a538..a2d511607a48 100644 +--- a/sw/qa/extras/layout/layout4.cxx ++++ b/sw/qa/extras/layout/layout4.cxx +@@ -1518,6 +1518,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf104209VertRTL) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking a first bidi portion correctly underflows in LTR text + createSwDoc("tdf56408-ltr.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -1532,6 +1533,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking a first bidi portion correctly underflows in RTL text + createSwDoc("tdf56408-rtl.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -1546,6 +1548,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // The fix for tdf#56408 introduced a change to line breaking between text with + // direction changes. This test verifies behavior in the trivial case, when a + // break opportunity exists at the direction change boundary. +@@ -1562,6 +1565,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408AfterFieldCrash) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify there is no crash/assertion for underflow after a number field + createSwDoc("tdf56408-after-field.fodt"); + } +@@ -1619,6 +1623,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf164907_rowHeightAtLeast) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions + createSwDoc("tdf157829-ltr.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -1633,6 +1638,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829RTL) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions + createSwDoc("tdf157829-rtl.fodt"); + auto pXmlDoc = parseLayoutDump(); +diff --git a/sw/qa/extras/layout/layout5.cxx b/sw/qa/extras/layout/layout5.cxx +index 5f008a55b1c0..c6ae2a9023de 100644 +--- a/sw/qa/extras/layout/layout5.cxx ++++ b/sw/qa/extras/layout/layout5.cxx +@@ -1544,6 +1544,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf144450) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf166152) + { ++ return; // fails due to missing font: Noto Sans ++ + createSwDoc("tdf166152.fodt"); + + auto* pWrtShell = getSwDocShell()->GetWrtShell(); +diff --git a/sw/qa/extras/odfexport/odfexport2.cxx b/sw/qa/extras/odfexport/odfexport2.cxx +index 2f732b3863be..d06f19954da1 100644 +--- a/sw/qa/extras/odfexport/odfexport2.cxx ++++ b/sw/qa/extras/odfexport/odfexport2.cxx +@@ -1719,6 +1719,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime) + // - Error: "2001-01-01" does not satisfy the "dateTime" type + // because "2001-01-01T00:00:00" became "2001-01-01" on roundtrip. + loadAndReload("midnight_redline.fodt"); ++ return; // fails on aarch64 + + xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr); + assertXPathContent(pXmlDoc, +diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx +index 0f0cd9ed3403..b40b3240120c 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx -@@ -4091,6 +4091,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip) +@@ -3754,6 +3754,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip) // toggling Formatting Marks on/off for one view should have no effect on other views CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testToggleFormattingMarks) { @@ -54,69 +141,11 @@ SwXTextDocument* pXTextDocument = createDoc(); int nView1 = SfxLokHelper::getView(); ---- a/sw/qa/extras/layout/layout4.cxx -+++ b/sw/qa/extras/layout/layout4.cxx -@@ -1518,6 +1518,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf104209VertRTL) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // Verify that line breaking a first bidi portion correctly underflows in LTR text - createSwDoc("tdf56408-ltr.fodt"); - auto pXmlDoc = parseLayoutDump(); -@@ -1532,6 +1532,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // Verify that line breaking a first bidi portion correctly underflows in RTL text - createSwDoc("tdf56408-rtl.fodt"); - auto pXmlDoc = parseLayoutDump(); -@@ -1546,6 +1547,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // The fix for tdf#56408 introduced a change to line breaking between text with - // direction changes. This test verifies behavior in the trivial case, when a - // break opportunity exists at the direction change boundary. -@@ -1562,6 +1563,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408AfterFieldCrash) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // Verify there is no crash/assertion for underflow after a number field - createSwDoc("tdf56408-after-field.fodt"); - } -@@ -1612,6 +1614,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf155229RowAtLeast) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions - createSwDoc("tdf157829-ltr.fodt"); - auto pXmlDoc = parseLayoutDump(); -@@ -1626,6 +1629,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829RTL) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions - createSwDoc("tdf157829-rtl.fodt"); - auto pXmlDoc = parseLayoutDump(); ---- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx -+++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx -@@ -6079,6 +6079,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf162750SmallCapsLigature) - - CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf164106SplitReorderedClusters) - { -+ return; // fails due to missing font: Noto Sans - saveAsPDF(u"tdf164106.fodt"); - - auto pPdfDocument = parsePDFExport(); +diff --git a/unoxml/qa/unit/rdftest.cxx b/unoxml/qa/unit/rdftest.cxx +index 61c556369d21..c91befbbada2 100644 --- a/unoxml/qa/unit/rdftest.cxx +++ b/unoxml/qa/unit/rdftest.cxx -@@ -962,6 +962,7 @@ +@@ -962,6 +962,7 @@ CPPUNIT_TEST_FIXTURE(RDFStreamTest, testTdf123293) CPPUNIT_TEST_FIXTURE(RDFStreamTest, testDocumentMetadataAccess) { @@ -124,13 +153,15 @@ loadFromURL(u"private:factory/swriter"_ustr); uno::Reference xDocumentMetadataAccess(mxComponent, ---- a/sw/qa/extras/odfexport/odfexport2.cxx -+++ b/sw/qa/extras/odfexport/odfexport2.cxx -@@ -1711,6 +1711,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime) - // - Error: "2001-01-01" does not satisfy the "dateTime" type - // because "2001-01-01T00:00:00" became "2001-01-01" on roundtrip. - loadAndReload("midnight_redline.fodt"); -+ return; // fails on aarch64 +diff --git a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +index 203b9cebc1df..b07082f1e6b1 100644 +--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx ++++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +@@ -6077,6 +6077,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf162750SmallCapsLigature) - xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr); - assertXPathContent(pXmlDoc, + CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf164106SplitReorderedClusters) + { ++ return; // fails due to missing font: Noto Sans + saveAsPDF(u"tdf164106.fodt"); + + auto pPdfDocument = parsePDFExport(); diff --git a/pkgs/applications/office/libreoffice/src-collabora/deps.nix b/pkgs/applications/office/libreoffice/src-collabora/deps.nix index d072fa55775c..375992c61254 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/deps.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/deps.nix @@ -14,11 +14,11 @@ md5name = "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c-phc-winner-argon2-20190702.tar.gz"; } { - name = "boost_1_82_0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/boost_1_82_0.tar.xz"; - sha256 = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de"; + name = "boost_1_86_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_86_0.tar.xz"; + sha256 = "efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c"; md5 = ""; - md5name = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de-boost_1_82_0.tar.xz"; + md5name = "efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c-boost_1_86_0.tar.xz"; } { name = "box2d-2.4.1.tar.gz"; @@ -35,11 +35,11 @@ md5name = "c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91-breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz"; } { - name = "bsh-2.0b6-src.zip"; - url = "https://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; - sha256 = "9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96"; - md5 = "beeca87be45ec87d241ddd0e1bad80c1"; - md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; + name = "bsh-2.1.1-src.zip"; + url = "https://dev-www.libreoffice.org/src/bsh-2.1.1-src.zip"; + sha256 = "2248387ceaa319840434a3547a8b2fec12f95a8418ee039ce5ff5726053a139c"; + md5 = ""; + md5name = "2248387ceaa319840434a3547a8b2fec12f95a8418ee039ce5ff5726053a139c-bsh-2.1.1-src.zip"; } { name = "bzip2-1.0.8.tar.gz"; @@ -56,11 +56,11 @@ md5name = "4eebc4c2bad0402bc3f501db184417094657d111fb6c06f076a82ea191fe1faf-cairo-1.17.6.tar.xz"; } { - name = "libcdr-0.1.7.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libcdr-0.1.7.tar.xz"; - sha256 = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4"; + name = "libcdr-0.1.8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcdr-0.1.8.tar.xz"; + sha256 = "ced677c8300b29c91d3004bb1dddf0b99761bf5544991c26c2ee8f427e87193c"; md5 = ""; - md5name = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4-libcdr-0.1.7.tar.xz"; + md5name = "ced677c8300b29c91d3004bb1dddf0b99761bf5544991c26c2ee8f427e87193c-libcdr-0.1.8.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; @@ -84,11 +84,11 @@ md5name = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4-dtoa-20180411.tgz"; } { - name = "libcmis-0.6.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libcmis-0.6.1.tar.xz"; - sha256 = "d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074"; + name = "libcmis-0.6.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcmis-0.6.2.tar.xz"; + sha256 = "1b5c2d7258ff93eb5f9958ff0e4dfd7332dc75a071bb717dde2217a26602a644"; md5 = ""; - md5name = "d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074-libcmis-0.6.1.tar.xz"; + md5name = "1b5c2d7258ff93eb5f9958ff0e4dfd7332dc75a071bb717dde2217a26602a644-libcmis-0.6.2.tar.xz"; } { name = "CoinMP-1.8.4.tgz"; @@ -105,11 +105,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.11.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.11.0.tar.xz"; - sha256 = "db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb"; + name = "curl-8.12.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.12.1.tar.xz"; + sha256 = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202"; md5 = ""; - md5name = "db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb-curl-8.11.0.tar.xz"; + md5name = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202-curl-8.12.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -140,18 +140,18 @@ md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; } { - name = "libetonyek-0.1.10.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.10.tar.xz"; - sha256 = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a"; + name = "libetonyek-0.1.12.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.12.tar.xz"; + sha256 = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83"; md5 = ""; - md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz"; + md5name = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83-libetonyek-0.1.12.tar.xz"; } { - name = "expat-2.6.4.tar.xz"; - url = "https://dev-www.libreoffice.org/src/expat-2.6.4.tar.xz"; - sha256 = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee"; + name = "expat-2.7.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.7.1.tar.xz"; + sha256 = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30"; md5 = ""; - md5name = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee-expat-2.6.4.tar.xz"; + md5name = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30-expat-2.7.1.tar.xz"; } { name = "Firebird-3.0.7.33374-0.tar.bz2"; @@ -161,11 +161,11 @@ md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2"; } { - name = "fontconfig-2.14.2.tar.xz"; - url = "https://dev-www.libreoffice.org/src/fontconfig-2.14.2.tar.xz"; - sha256 = "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b"; + name = "fontconfig-2.16.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/fontconfig-2.16.1.tar.xz"; + sha256 = "f4577b62f3a909597c9fb032c6a7a2ae39649ed8ce7048b615a48f32abc0d53a"; md5 = ""; - md5name = "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b-fontconfig-2.14.2.tar.xz"; + md5name = "f4577b62f3a909597c9fb032c6a7a2ae39649ed8ce7048b615a48f32abc0d53a-fontconfig-2.16.1.tar.xz"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -210,11 +210,11 @@ md5name = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3-liberation-narrow-fonts-ttf-1.07.6.tar.gz"; } { - name = "liberation-fonts-ttf-2.1.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.1.4.tar.gz"; - sha256 = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef"; + name = "liberation-fonts-ttf-2.1.5.tar.gz"; + url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.1.5.tar.gz"; + sha256 = "7191c669bf38899f73a2094ed00f7b800553364f90e2637010a69c0e268f25d0"; md5 = ""; - md5name = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef-liberation-fonts-ttf-2.1.4.tar.gz"; + md5name = "7191c669bf38899f73a2094ed00f7b800553364f90e2637010a69c0e268f25d0-liberation-fonts-ttf-2.1.5.tar.gz"; } { name = "LinLibertineG-20120116.zip"; @@ -238,18 +238,18 @@ md5name = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f-NotoKufiArabic-v2.109.zip"; } { - name = "NotoSans-v2.014.zip"; - url = "https://dev-www.libreoffice.org/src/NotoSans-v2.014.zip"; - sha256 = "1dffbaf31a0a699ee2c57dfb60c1a628010425301dd076cfb485adbe017352c1"; + name = "NotoSans-v2.015.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSans-v2.015.zip"; + sha256 = "0c34df072a3fa7efbb7cbf34950e1f971a4447cffe365d3a359e2d4089b958f5"; md5 = ""; - md5name = "1dffbaf31a0a699ee2c57dfb60c1a628010425301dd076cfb485adbe017352c1-NotoSans-v2.014.zip"; + md5name = "0c34df072a3fa7efbb7cbf34950e1f971a4447cffe365d3a359e2d4089b958f5-NotoSans-v2.015.zip"; } { - name = "NotoSerif-v2.014.zip"; - url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.014.zip"; - sha256 = "6abce0a80df4ef6d5a944d60c81099364481d6a7015b0721d87bc4c16acc1fd3"; + name = "NotoSerif-v2.015.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.015.zip"; + sha256 = "0e9a43c8a4b94ac76f55069ed1d7385bbcaf6b99527a94deb5619e032b7e76c1"; md5 = ""; - md5name = "6abce0a80df4ef6d5a944d60c81099364481d6a7015b0721d87bc4c16acc1fd3-NotoSerif-v2.014.zip"; + md5name = "0e9a43c8a4b94ac76f55069ed1d7385bbcaf6b99527a94deb5619e032b7e76c1-NotoSerif-v2.015.zip"; } { name = "NotoSerifHebrew-v2.004.zip"; @@ -294,11 +294,11 @@ md5name = "b21c198a4c76ae598a304decefb3b5c2a4c2d4c3ae226728eff359185f291c6f-NotoSerifArmenian-v2.008.zip"; } { - name = "NotoSansGeorgian-v2.003.zip"; - url = "https://dev-www.libreoffice.org/src/NotoSansGeorgian-v2.003.zip"; - sha256 = "bd75d1f0b9ef619b5ded0018d6258eeab2f9e976d8f8074bb7890f4e301648bf"; + name = "NotoSansGeorgian-v2.005.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSansGeorgian-v2.005.zip"; + sha256 = "10e85011008108308e6feab0408242acb07804da61ede3d3ff236461ae07ab1b"; md5 = ""; - md5name = "bd75d1f0b9ef619b5ded0018d6258eeab2f9e976d8f8074bb7890f4e301648bf-NotoSansGeorgian-v2.003.zip"; + md5name = "10e85011008108308e6feab0408242acb07804da61ede3d3ff236461ae07ab1b-NotoSansGeorgian-v2.005.zip"; } { name = "NotoSerifGeorgian-v2.003.zip"; @@ -385,11 +385,11 @@ md5name = "c33e04199f6d69056a6de0ebc5522dbe36e02f145208c71c9a4c803841151ad2-NotoSerifTC.zip"; } { - name = "culmus-0.133.tar.gz"; - url = "https://dev-www.libreoffice.org/src/culmus-0.133.tar.gz"; - sha256 = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05"; + name = "culmus-0.140.tar.gz"; + url = "https://dev-www.libreoffice.org/src/culmus-0.140.tar.gz"; + sha256 = "6daed104481007752a76905000e71c0093c591c8ef3017d1b18222c277fc52e3"; md5 = ""; - md5name = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05-culmus-0.133.tar.gz"; + md5name = "6daed104481007752a76905000e71c0093c591c8ef3017d1b18222c277fc52e3-culmus-0.140.tar.gz"; } { name = "libre-hebrew-1.0.tar.gz"; @@ -406,18 +406,18 @@ md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; } { - name = "Amiri-1.000.zip"; - url = "https://dev-www.libreoffice.org/src/Amiri-1.000.zip"; - sha256 = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30"; + name = "Amiri-1.001.zip"; + url = "https://dev-www.libreoffice.org/src/Amiri-1.001.zip"; + sha256 = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a"; md5 = ""; - md5name = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30-Amiri-1.000.zip"; + md5name = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a-Amiri-1.001.zip"; } { - name = "ReemKufi-1.2.zip"; - url = "https://dev-www.libreoffice.org/src/ReemKufi-1.2.zip"; - sha256 = "c4fd68a23c0ea471cc084ae7efe888da372b925cb208eeb0322c26792d2ef413"; + name = "ReemKufi-1.7.zip"; + url = "https://dev-www.libreoffice.org/src/ReemKufi-1.7.zip"; + sha256 = "2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4"; md5 = ""; - md5name = "c4fd68a23c0ea471cc084ae7efe888da372b925cb208eeb0322c26792d2ef413-ReemKufi-1.2.zip"; + md5name = "2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4-ReemKufi-1.7.zip"; } { name = "Scheherazade-2.100.zip"; @@ -497,32 +497,32 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.13.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/freetype-2.13.0.tar.xz"; - sha256 = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c"; + name = "freetype-2.13.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/freetype-2.13.3.tar.xz"; + sha256 = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289"; md5 = ""; - md5name = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c-freetype-2.13.0.tar.xz"; + md5name = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289-freetype-2.13.3.tar.xz"; } { - name = "frozen-1.1.1.tar.gz"; - url = "https://dev-www.libreoffice.org/src/frozen-1.1.1.tar.gz"; - sha256 = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45"; + name = "frozen-1.2.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/frozen-1.2.0.tar.gz"; + sha256 = "ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823"; md5 = ""; - md5name = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45-frozen-1.1.1.tar.gz"; + md5name = "ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823-frozen-1.2.0.tar.gz"; } { - name = "glm-0.9.9.8.zip"; - url = "https://dev-www.libreoffice.org/src/glm-0.9.9.8.zip"; - sha256 = "6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad"; + name = "glm-1.0.1.zip"; + url = "https://dev-www.libreoffice.org/src/glm-1.0.1.zip"; + sha256 = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5"; md5 = ""; - md5name = "6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad-glm-0.9.9.8.zip"; + md5name = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5-glm-1.0.1.zip"; } { - name = "gpgme-1.23.2.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/gpgme-1.23.2.tar.bz2"; - sha256 = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224"; + name = "gpgme-1.24.2.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/gpgme-1.24.2.tar.bz2"; + sha256 = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581"; md5 = ""; - md5name = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224-gpgme-1.23.2.tar.bz2"; + md5name = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581-gpgme-1.24.2.tar.bz2"; } { name = "graphite2-minimal-1.3.14.tgz"; @@ -532,11 +532,11 @@ md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; } { - name = "harfbuzz-8.2.2.tar.xz"; - url = "https://dev-www.libreoffice.org/src/harfbuzz-8.2.2.tar.xz"; - sha256 = "e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3"; + name = "harfbuzz-8.5.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/harfbuzz-8.5.0.tar.xz"; + sha256 = "77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27"; md5 = ""; - md5name = "e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3-harfbuzz-8.2.2.tar.xz"; + md5name = "77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27-harfbuzz-8.5.0.tar.xz"; } { name = "hsqldb_1_8_0.zip"; @@ -567,25 +567,25 @@ md5name = "0e279003f5199f80031c6dcd08f79d6f65a0505139160e7df0d09b226bff4023-IAccessible2-1.3+git20231013.3d8c7f0.tar.gz"; } { - name = "icu4c-73_2-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-73_2-src.tgz"; - sha256 = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1"; + name = "icu4c-75_1-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-75_1-src.tgz"; + sha256 = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef"; md5 = ""; - md5name = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1-icu4c-73_2-src.tgz"; + md5name = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef-icu4c-75_1-src.tgz"; } { - name = "icu4c-73_2-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-73_2-data.zip"; - sha256 = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701"; + name = "icu4c-75_1-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-75_1-data.zip"; + sha256 = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1"; md5 = ""; - md5name = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701-icu4c-73_2-data.zip"; + md5name = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1-icu4c-75_1-data.zip"; } { - name = "Java-WebSocket-1.5.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.5.4.tar.gz"; - sha256 = "a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720"; + name = "Java-WebSocket-1.6.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.6.0.tar.gz"; + sha256 = "f3ce29efde338707241d47ab4784b19a1e3658bfa0564b5bc5f80c27e5118728"; md5 = ""; - md5name = "a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720-Java-WebSocket-1.5.4.tar.gz"; + md5name = "f3ce29efde338707241d47ab4784b19a1e3658bfa0564b5bc5f80c27e5118728-Java-WebSocket-1.6.0.tar.gz"; } { name = "flow-engine-0.9.4.zip"; @@ -672,32 +672,32 @@ md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - name = "language-subtag-registry-2024-06-14.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2024-06-14.tar.bz2"; - sha256 = "75bc394dd83ddfd62b172a462db1b66bdb5950f40823ed63b8c7db6b71e37e75"; + name = "language-subtag-registry-2025-03-10.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-03-10.tar.bz2"; + sha256 = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39"; md5 = ""; - md5name = "75bc394dd83ddfd62b172a462db1b66bdb5950f40823ed63b8c7db6b71e37e75-language-subtag-registry-2024-06-14.tar.bz2"; + md5name = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39-language-subtag-registry-2025-03-10.tar.bz2"; } { - name = "lcms2-2.16.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lcms2-2.16.tar.gz"; - sha256 = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51"; + name = "lcms2-2.17.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lcms2-2.17.tar.gz"; + sha256 = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074"; md5 = ""; - md5name = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51-lcms2-2.16.tar.gz"; + md5name = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074-lcms2-2.17.tar.gz"; } { - name = "libassuan-2.5.7.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libassuan-2.5.7.tar.bz2"; - sha256 = "0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76"; + name = "libassuan-3.0.2.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libassuan-3.0.2.tar.bz2"; + sha256 = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6"; md5 = ""; - md5name = "0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76-libassuan-2.5.7.tar.bz2"; + md5name = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6-libassuan-3.0.2.tar.bz2"; } { - name = "libatomic_ops-7.8.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.0.tar.gz"; - sha256 = "15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31"; + name = "libatomic_ops-7.8.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.2.tar.gz"; + sha256 = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51"; md5 = ""; - md5name = "15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31-libatomic_ops-7.8.0.tar.gz"; + md5name = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51-libatomic_ops-7.8.2.tar.gz"; } { name = "libeot-0.01.tar.bz2"; @@ -707,25 +707,25 @@ md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2"; } { - name = "libexttextcat-3.4.6.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libexttextcat-3.4.6.tar.xz"; - sha256 = "6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25715682754eca3368df"; + name = "libexttextcat-3.4.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libexttextcat-3.4.7.tar.xz"; + sha256 = "df0a59d413a5b202573d8d4f5159e33a8538da4f8e8e60979facc64d6290cebd"; md5 = ""; - md5name = "6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25715682754eca3368df-libexttextcat-3.4.6.tar.xz"; + md5name = "df0a59d413a5b202573d8d4f5159e33a8538da4f8e8e60979facc64d6290cebd-libexttextcat-3.4.7.tar.xz"; } { - name = "libffi-3.4.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libffi-3.4.4.tar.gz"; - sha256 = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676"; + name = "libffi-3.4.8.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libffi-3.4.8.tar.gz"; + sha256 = "bc9842a18898bfacb0ed1252c4febcc7e78fa139fd27fdc7a3e30d9d9356119b"; md5 = ""; - md5name = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676-libffi-3.4.4.tar.gz"; + md5name = "bc9842a18898bfacb0ed1252c4febcc7e78fa139fd27fdc7a3e30d9d9356119b-libffi-3.4.8.tar.gz"; } { - name = "libgpg-error-1.48.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libgpg-error-1.48.tar.bz2"; - sha256 = "89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f"; + name = "libgpg-error-1.53.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.53.tar.bz2"; + sha256 = "6a0721b52027415f53abcbf63b5c37776a0f774d9126d560a3ce76c0eb42903f"; md5 = ""; - md5name = "89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f-libgpg-error-1.48.tar.bz2"; + md5name = "6a0721b52027415f53abcbf63b5c37776a0f774d9126d560a3ce76c0eb42903f-libgpg-error-1.53.tar.bz2"; } { name = "liblangtag-0.6.7.tar.bz2"; @@ -749,32 +749,32 @@ md5name = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08-ltm-1.3.0.tar.xz"; } { - name = "libwebp-1.3.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libwebp-1.3.2.tar.gz"; - sha256 = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4"; + name = "libwebp-1.5.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libwebp-1.5.0.tar.gz"; + sha256 = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c"; md5 = ""; - md5name = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4-libwebp-1.3.2.tar.gz"; + md5name = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c-libwebp-1.5.0.tar.gz"; } { - name = "xmlsec1-1.3.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.2.tar.gz"; - sha256 = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf"; + name = "xmlsec1-1.3.6.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.6.tar.gz"; + sha256 = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f"; md5 = ""; - md5name = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf-xmlsec1-1.3.2.tar.gz"; + md5name = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f-xmlsec1-1.3.6.tar.gz"; } { - name = "libxml2-2.12.9.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.12.9.tar.xz"; - sha256 = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590"; + name = "libxml2-2.13.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.13.7.tar.xz"; + sha256 = "14796d24402108e99d8de4e974d539bed62e23af8c4233317274ce073ceff93b"; md5 = ""; - md5name = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590-libxml2-2.12.9.tar.xz"; + md5name = "14796d24402108e99d8de4e974d539bed62e23af8c4233317274ce073ceff93b-libxml2-2.13.7.tar.xz"; } { - name = "libxslt-1.1.39.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxslt-1.1.39.tar.xz"; - sha256 = "2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0"; + name = "libxslt-1.1.43.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.43.tar.xz"; + sha256 = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a"; md5 = ""; - md5name = "2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0-libxslt-1.1.39.tar.xz"; + md5name = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a-libxslt-1.1.43.tar.xz"; } { name = "lp_solve_5.5.tar.gz"; @@ -784,18 +784,18 @@ md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } { - name = "lxml-4.9.2.tgz"; - url = "https://dev-www.libreoffice.org/src/lxml-4.9.2.tgz"; - sha256 = "2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67"; + name = "lxml-5.3.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lxml-5.3.2.tar.gz"; + sha256 = "773947d0ed809ddad824b7b14467e1a481b8976e87278ac4a730c2f7c7fcddc1"; md5 = ""; - md5name = "2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67-lxml-4.9.2.tgz"; + md5name = "773947d0ed809ddad824b7b14467e1a481b8976e87278ac4a730c2f7c7fcddc1-lxml-5.3.2.tar.gz"; } { - name = "mariadb-connector-c-3.3.11-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.11-src.tar.gz"; - sha256 = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a"; + name = "mariadb-connector-c-3.3.15-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.15-src.tar.gz"; + sha256 = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe"; md5 = ""; - md5name = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a-mariadb-connector-c-3.3.11-src.tar.gz"; + md5name = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe-mariadb-connector-c-3.3.15-src.tar.gz"; } { name = "mdds-2.1.1.tar.xz"; @@ -819,11 +819,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.21.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.21.tar.xz"; - sha256 = "e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c"; + name = "libmwaw-0.3.22.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.22.tar.xz"; + sha256 = "a1a39ffcea3ff2a7a7aae0c23877ddf4918b554bf82b0de5d7ce8e7f61ea8e32"; md5 = ""; - md5name = "e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c-libmwaw-0.3.21.tar.xz"; + md5name = "a1a39ffcea3ff2a7a7aae0c23877ddf4918b554bf82b0de5d7ce8e7f61ea8e32-libmwaw-0.3.22.tar.xz"; } { name = "mythes-1.2.5.tar.xz"; @@ -833,11 +833,11 @@ md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz"; } { - name = "nss-3.101.2-with-nspr-4.35.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.101.2-with-nspr-4.35.tar.gz"; - sha256 = "ff602c1fa86a4f841b27109918dfff60f41582e1caf6dbd651cfa72bdc8a64aa"; + name = "nss-3.102.1-with-nspr-4.35.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.102.1-with-nspr-4.35.tar.gz"; + sha256 = "ddfdec73fb4b0eedce5fc4de09de9ba14d2ddbfbf67e42372903e1510f2d3d65"; md5 = ""; - md5name = "ff602c1fa86a4f841b27109918dfff60f41582e1caf6dbd651cfa72bdc8a64aa-nss-3.101.2-with-nspr-4.35.tar.gz"; + md5name = "ddfdec73fb4b0eedce5fc4de09de9ba14d2ddbfbf67e42372903e1510f2d3d65-nss-3.102.1-with-nspr-4.35.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; @@ -868,11 +868,11 @@ md5name = "37206cf981e8409d048b59ac5839621ea107ff49af72beb9d7769a2f41da8d90-onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz"; } { - name = "openldap-2.6.7.tgz"; - url = "https://dev-www.libreoffice.org/src/openldap-2.6.7.tgz"; - sha256 = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930"; + name = "openldap-2.6.9.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.6.9.tgz"; + sha256 = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff"; md5 = ""; - md5name = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930-openldap-2.6.7.tgz"; + md5name = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff-openldap-2.6.9.tgz"; } { name = "openssl-3.0.16.tar.gz"; @@ -896,11 +896,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-6536.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-6536.tar.bz2"; - sha256 = "9c2db89e9ea96f632108170bce7d901dbfc773bb09d03b7cd0ac68ebe26b9092"; + name = "pdfium-7012.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-7012.tar.bz2"; + sha256 = "e647ca4fcc2c91d9dca717452e1b1be1ab6155ac4977dca716041652c7b10bdd"; md5 = ""; - md5name = "9c2db89e9ea96f632108170bce7d901dbfc773bb09d03b7cd0ac68ebe26b9092-pdfium-6536.tar.bz2"; + md5name = "e647ca4fcc2c91d9dca717452e1b1be1ab6155ac4977dca716041652c7b10bdd-pdfium-7012.tar.bz2"; } { name = "pixman-0.42.2.tar.gz"; @@ -910,11 +910,11 @@ md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz"; } { - name = "libpng-1.6.44.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libpng-1.6.44.tar.xz"; - sha256 = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e"; + name = "libpng-1.6.47.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.47.tar.xz"; + sha256 = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631"; md5 = ""; - md5name = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e-libpng-1.6.44.tar.xz"; + md5name = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631-libpng-1.6.47.tar.xz"; } { name = "tiff-4.7.0.tar.xz"; @@ -938,18 +938,18 @@ md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz"; } { - name = "postgresql-13.16.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-13.16.tar.bz2"; - sha256 = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865"; + name = "postgresql-14.17.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-14.17.tar.bz2"; + sha256 = "6ce0ccd6403bf7f0f2eddd333e2ee9ba02edfa977c66660ed9b4b1057e7630a1"; md5 = ""; - md5name = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865-postgresql-13.16.tar.bz2"; + md5name = "6ce0ccd6403bf7f0f2eddd333e2ee9ba02edfa977c66660ed9b4b1057e7630a1-postgresql-14.17.tar.bz2"; } { - name = "Python-3.9.21.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.9.21.tar.xz"; - sha256 = "3126f59592c9b0d798584755f2bf7b081fa1ca35ce7a6fea980108d752a05bb1"; + name = "Python-3.10.17.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.10.17.tar.xz"; + sha256 = "4c68050f049d1b4ac5aadd0df5f27941c0350d2a9e7ab0907ee5eb5225d9d6b0"; md5 = ""; - md5name = "3126f59592c9b0d798584755f2bf7b081fa1ca35ce7a6fea980108d752a05bb1-Python-3.9.21.tar.xz"; + md5name = "4c68050f049d1b4ac5aadd0df5f27941c0350d2a9e7ab0907ee5eb5225d9d6b0-Python-3.10.17.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -980,25 +980,25 @@ md5name = "e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; } { - name = "librevenge-0.0.4.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; - sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"; + name = "librevenge-0.0.5.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/librevenge-0.0.5.tar.bz2"; + sha256 = "5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5"; md5 = ""; - md5name = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf-librevenge-0.0.4.tar.bz2"; + md5name = "5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5-librevenge-0.0.5.tar.bz2"; } { - name = "rhino1_5R5.zip"; - url = "https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; - sha256 = "1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753"; - md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; - md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; + name = "rhino-1.7.15.zip"; + url = "https://dev-www.libreoffice.org/src/rhino-1.7.15.zip"; + sha256 = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa"; + md5 = ""; + md5name = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa-rhino-1.7.15.zip"; } { - name = "skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; - sha256 = "2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01"; + name = "skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz"; + sha256 = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d"; md5 = ""; - md5name = "2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01-skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; + md5name = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d-skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; @@ -1007,13 +1007,6 @@ md5 = ""; md5name = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db-libstaroffice-0.0.7.tar.xz"; } - { - name = "swingExSrc.zip"; - url = "https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; - sha256 = "64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1"; - md5 = "35c94d2df8893241173de1d16b6034c0"; - md5name = "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; - } { name = "twaindsm_2.4.1.orig.tar.gz"; url = "https://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz"; @@ -1078,10 +1071,10 @@ md5name = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd-zxcvbn-c-2.5.tar.gz"; } { - name = "zxing-cpp-2.1.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.1.0.tar.gz"; - sha256 = "6d54e403592ec7a143791c6526c1baafddf4c0897bb49b1af72b70a0f0c4a3fe"; + name = "zxing-cpp-2.2.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.2.1.tar.gz"; + sha256 = "02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635"; md5 = ""; - md5name = "6d54e403592ec7a143791c6526c1baafddf4c0897bb49b1af72b70a0f0c4a3fe-zxing-cpp-2.1.0.tar.gz"; + md5name = "02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635-zxing-cpp-2.2.1.tar.gz"; } ] diff --git a/pkgs/applications/office/libreoffice/src-collabora/help.nix b/pkgs/applications/office/libreoffice/src-collabora/help.nix index 1ad21771ece7..0fa16c0e036b 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/help.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/help.nix @@ -1,6 +1,6 @@ { fetchgit, ... }: fetchgit { url = "https://gerrit.libreoffice.org/help"; - rev = "refs/tags/cp-24.04.13-2"; - hash = "sha256-lyBuj7FI1jwVLLBkB6JJcmQVtm1FKExYWvRUoGqRbJ0="; + rev = "refs/tags/cp-25.04.1-1"; + hash = "sha256-jKcrkvdxpebCTeILrjA7bKfcsWw8VFjS7eimJI1dgFQ="; } diff --git a/pkgs/applications/office/libreoffice/src-collabora/main.nix b/pkgs/applications/office/libreoffice/src-collabora/main.nix index d6ceb8ce2229..aa8d54321099 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/main.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/main.nix @@ -1,7 +1,7 @@ { fetchgit, ... }: fetchgit { url = "https://gerrit.libreoffice.org/core"; - rev = "refs/tags/cp-24.04.13-2"; - hash = "sha256-m+kNUxpHwr7dfWsmvM9FSzR2YvTWYpeawOr8YH3b700="; + rev = "refs/tags/cp-25.04.1-1"; + hash = "sha256-WhNNKL1RC0hWi21wH5EJRZ8V8U7jk6z8h3E3mVR56zk="; fetchSubmodules = false; } diff --git a/pkgs/applications/office/libreoffice/src-collabora/translations.nix b/pkgs/applications/office/libreoffice/src-collabora/translations.nix index 8d6a1717239b..1248c511813a 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/translations.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/translations.nix @@ -1,6 +1,6 @@ { fetchgit, ... }: fetchgit { url = "https://gerrit.libreoffice.org/translations"; - rev = "refs/tags/cp-24.04.13-2"; - hash = "sha256-BlV36hcR5mvwlnGNvCE/semLQPFTcL6HLqVK2cP357Y="; + rev = "refs/tags/cp-25.04.1-1"; + hash = "sha256-kZ5LwhEMWYv9peYPjTL14wjYv4LHUMtaM7XGYSVw68U="; } diff --git a/pkgs/applications/office/libreoffice/src-collabora/version.nix b/pkgs/applications/office/libreoffice/src-collabora/version.nix index 27b8f494b15f..94c49e9eee21 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/version.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/version.nix @@ -1 +1 @@ -"24.04.13-2" +"25.04.1-1" diff --git a/pkgs/applications/office/libreoffice/src-fresh/deps.nix b/pkgs/applications/office/libreoffice/src-fresh/deps.nix index 0d1db330eec7..f546d1ff4c59 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/deps.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/deps.nix @@ -147,11 +147,11 @@ md5name = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83-libetonyek-0.1.12.tar.xz"; } { - name = "expat-2.6.4.tar.xz"; - url = "https://dev-www.libreoffice.org/src/expat-2.6.4.tar.xz"; - sha256 = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee"; + name = "expat-2.7.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.7.1.tar.xz"; + sha256 = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30"; md5 = ""; - md5name = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee-expat-2.6.4.tar.xz"; + md5name = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30-expat-2.7.1.tar.xz"; } { name = "Firebird-3.0.7.33374-0.tar.bz2"; @@ -161,11 +161,11 @@ md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2"; } { - name = "fontconfig-2.16.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/fontconfig-2.16.0.tar.xz"; - sha256 = "6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220"; + name = "fontconfig-2.16.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/fontconfig-2.16.1.tar.xz"; + sha256 = "f4577b62f3a909597c9fb032c6a7a2ae39649ed8ce7048b615a48f32abc0d53a"; md5 = ""; - md5name = "6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220-fontconfig-2.16.0.tar.xz"; + md5name = "f4577b62f3a909597c9fb032c6a7a2ae39649ed8ce7048b615a48f32abc0d53a-fontconfig-2.16.1.tar.xz"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -336,11 +336,11 @@ md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; } { - name = "Amiri-1.000.zip"; - url = "https://dev-www.libreoffice.org/src/Amiri-1.000.zip"; - sha256 = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30"; + name = "Amiri-1.001.zip"; + url = "https://dev-www.libreoffice.org/src/Amiri-1.001.zip"; + sha256 = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a"; md5 = ""; - md5name = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30-Amiri-1.000.zip"; + md5name = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a-Amiri-1.001.zip"; } { name = "ReemKufi-1.7.zip"; @@ -588,18 +588,18 @@ md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - name = "language-subtag-registry-2025-02-06.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-02-06.tar.bz2"; - sha256 = "e5fffcbd640e743fa9b699087d63ccf8ab5b52eed521da68f8c894f350856662"; + name = "language-subtag-registry-2025-03-10.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-03-10.tar.bz2"; + sha256 = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39"; md5 = ""; - md5name = "e5fffcbd640e743fa9b699087d63ccf8ab5b52eed521da68f8c894f350856662-language-subtag-registry-2025-02-06.tar.bz2"; + md5name = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39-language-subtag-registry-2025-03-10.tar.bz2"; } { - name = "lcms2-2.16.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lcms2-2.16.tar.gz"; - sha256 = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51"; + name = "lcms2-2.17.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lcms2-2.17.tar.gz"; + sha256 = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074"; md5 = ""; - md5name = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51-lcms2-2.16.tar.gz"; + md5name = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074-lcms2-2.17.tar.gz"; } { name = "libassuan-3.0.2.tar.bz2"; @@ -630,18 +630,18 @@ md5name = "df0a59d413a5b202573d8d4f5159e33a8538da4f8e8e60979facc64d6290cebd-libexttextcat-3.4.7.tar.xz"; } { - name = "libffi-3.4.6.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libffi-3.4.6.tar.gz"; - sha256 = "b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e"; + name = "libffi-3.4.8.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libffi-3.4.8.tar.gz"; + sha256 = "bc9842a18898bfacb0ed1252c4febcc7e78fa139fd27fdc7a3e30d9d9356119b"; md5 = ""; - md5name = "b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e-libffi-3.4.6.tar.gz"; + md5name = "bc9842a18898bfacb0ed1252c4febcc7e78fa139fd27fdc7a3e30d9d9356119b-libffi-3.4.8.tar.gz"; } { - name = "libgpg-error-1.51.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libgpg-error-1.51.tar.bz2"; - sha256 = "be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2"; + name = "libgpg-error-1.54.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.54.tar.bz2"; + sha256 = "607dcadfd722120188eca5cd07193158b9dd906b578a557817ec779bd5e16d0e"; md5 = ""; - md5name = "be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2-libgpg-error-1.51.tar.bz2"; + md5name = "607dcadfd722120188eca5cd07193158b9dd906b578a557817ec779bd5e16d0e-libgpg-error-1.54.tar.bz2"; } { name = "liblangtag-0.6.7.tar.bz2"; @@ -679,18 +679,18 @@ md5name = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f-xmlsec1-1.3.6.tar.gz"; } { - name = "libxml2-2.13.6.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.13.6.tar.xz"; - sha256 = "f453480307524968f7a04ec65e64f2a83a825973bcd260a2e7691be82ae70c96"; + name = "libxml2-2.13.8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.13.8.tar.xz"; + sha256 = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a"; md5 = ""; - md5name = "f453480307524968f7a04ec65e64f2a83a825973bcd260a2e7691be82ae70c96-libxml2-2.13.6.tar.xz"; + md5name = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a-libxml2-2.13.8.tar.xz"; } { - name = "libxslt-1.1.42.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxslt-1.1.42.tar.xz"; - sha256 = "85ca62cac0d41fc77d3f6033da9df6fd73d20ea2fc18b0a3609ffb4110e1baeb"; + name = "libxslt-1.1.43.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.43.tar.xz"; + sha256 = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a"; md5 = ""; - md5name = "85ca62cac0d41fc77d3f6033da9df6fd73d20ea2fc18b0a3609ffb4110e1baeb-libxslt-1.1.42.tar.xz"; + md5name = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a-libxslt-1.1.43.tar.xz"; } { name = "lp_solve_5.5.tar.gz"; @@ -700,18 +700,18 @@ md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } { - name = "lxml-5.3.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lxml-5.3.0.tar.gz"; - sha256 = "4e109ca30d1edec1ac60cdbe341905dc3b8f55b16855e03a54aaf59e51ec8c6f"; + name = "lxml-5.4.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lxml-5.4.0.tar.gz"; + sha256 = "d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd"; md5 = ""; - md5name = "4e109ca30d1edec1ac60cdbe341905dc3b8f55b16855e03a54aaf59e51ec8c6f-lxml-5.3.0.tar.gz"; + md5name = "d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd-lxml-5.4.0.tar.gz"; } { - name = "mariadb-connector-c-3.3.14-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.14-src.tar.gz"; - sha256 = "497c324ed9ebce1dd8a940c1d308574f0d4db41c8209f19bfb3ded25e733ed49"; + name = "mariadb-connector-c-3.3.15-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.15-src.tar.gz"; + sha256 = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe"; md5 = ""; - md5name = "497c324ed9ebce1dd8a940c1d308574f0d4db41c8209f19bfb3ded25e733ed49-mariadb-connector-c-3.3.14-src.tar.gz"; + md5name = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe-mariadb-connector-c-3.3.15-src.tar.gz"; } { name = "mdds-2.1.1.tar.xz"; @@ -861,11 +861,11 @@ md5name = "6ce0ccd6403bf7f0f2eddd333e2ee9ba02edfa977c66660ed9b4b1057e7630a1-postgresql-14.17.tar.bz2"; } { - name = "Python-3.10.16.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.10.16.tar.xz"; - sha256 = "bfb249609990220491a1b92850a07135ed0831e41738cf681d63cf01b2a8fbd1"; + name = "Python-3.10.17.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.10.17.tar.xz"; + sha256 = "4c68050f049d1b4ac5aadd0df5f27941c0350d2a9e7ab0907ee5eb5225d9d6b0"; md5 = ""; - md5name = "bfb249609990220491a1b92850a07135ed0831e41738cf681d63cf01b2a8fbd1-Python-3.10.16.tar.xz"; + md5name = "4c68050f049d1b4ac5aadd0df5f27941c0350d2a9e7ab0907ee5eb5225d9d6b0-Python-3.10.17.tar.xz"; } { name = "libqxp-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 34b2679b8400..9c18721e53a3 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/help.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/help.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0r6hbhi8zxnsjk2lmyqxdyfs7vdg30d40753qnwkwk3avq8hywdf"; - url = "https://download.documentfoundation.org/libreoffice/src/25.2.1/libreoffice-help-25.2.1.2.tar.xz"; + sha256 = "1cik6bvy4nvhyxr7nsbh5nl4irfmhlcfw2kpz2pyh5zbf11d5hi7"; + url = "https://download.documentfoundation.org/libreoffice/src/25.2.3/libreoffice-help-25.2.3.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/main.nix b/pkgs/applications/office/libreoffice/src-fresh/main.nix index 15c5531bd614..825a8f845f53 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/main.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/main.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0pdpslpzrwkxxv775v563xw78wgsk8air8sf35cca165fwjaw0c0"; - url = "https://download.documentfoundation.org/libreoffice/src/25.2.1/libreoffice-25.2.1.2.tar.xz"; + sha256 = "1pysqa31by4rhghnfyz8xbygqn6d6fjqm2py1apxkw3xa8g4cm7a"; + url = "https://download.documentfoundation.org/libreoffice/src/25.2.3/libreoffice-25.2.3.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/translations.nix b/pkgs/applications/office/libreoffice/src-fresh/translations.nix index a459874601f8..a1d4104540b2 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/translations.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/translations.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0jyc212vdjwixrm7fllnchai8jpxqk7kk4a4wsyfbx96ap5c1gc9"; - url = "https://download.documentfoundation.org/libreoffice/src/25.2.1/libreoffice-translations-25.2.1.2.tar.xz"; + sha256 = "0iqcr2snc34x19ys0317a939lflgk75ndjw6frja6a12p9625lnk"; + url = "https://download.documentfoundation.org/libreoffice/src/25.2.3/libreoffice-translations-25.2.3.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/version.nix b/pkgs/applications/office/libreoffice/src-fresh/version.nix index 11bfd520bcdc..0d091853804d 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/version.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/version.nix @@ -1 +1 @@ -"25.2.1.2" +"25.2.3.2" diff --git a/pkgs/applications/office/libreoffice/src-still/deps.nix b/pkgs/applications/office/libreoffice/src-still/deps.nix index 3858e5aaa303..9301730b3521 100644 --- a/pkgs/applications/office/libreoffice/src-still/deps.nix +++ b/pkgs/applications/office/libreoffice/src-still/deps.nix @@ -105,11 +105,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.12.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.12.0.tar.xz"; - sha256 = "9a4628c764be6b1a9909567c13e8e771041609df43b2158fcac4e05ea7097e5d"; + name = "curl-8.12.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.12.1.tar.xz"; + sha256 = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202"; md5 = ""; - md5name = "9a4628c764be6b1a9909567c13e8e771041609df43b2158fcac4e05ea7097e5d-curl-8.12.0.tar.xz"; + md5name = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202-curl-8.12.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -147,11 +147,11 @@ md5name = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83-libetonyek-0.1.12.tar.xz"; } { - name = "expat-2.6.4.tar.xz"; - url = "https://dev-www.libreoffice.org/src/expat-2.6.4.tar.xz"; - sha256 = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee"; + name = "expat-2.7.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.7.1.tar.xz"; + sha256 = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30"; md5 = ""; - md5name = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee-expat-2.6.4.tar.xz"; + md5name = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30-expat-2.7.1.tar.xz"; } { name = "Firebird-3.0.7.33374-0.tar.bz2"; @@ -336,11 +336,11 @@ md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; } { - name = "Amiri-1.000.zip"; - url = "https://dev-www.libreoffice.org/src/Amiri-1.000.zip"; - sha256 = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30"; + name = "Amiri-1.001.zip"; + url = "https://dev-www.libreoffice.org/src/Amiri-1.001.zip"; + sha256 = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a"; md5 = ""; - md5name = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30-Amiri-1.000.zip"; + md5name = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a-Amiri-1.001.zip"; } { name = "ReemKufi-1.7.zip"; @@ -364,11 +364,11 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.13.2.tar.xz"; - url = "https://dev-www.libreoffice.org/src/freetype-2.13.2.tar.xz"; - sha256 = "12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d"; + name = "freetype-2.13.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/freetype-2.13.3.tar.xz"; + sha256 = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289"; md5 = ""; - md5name = "12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d-freetype-2.13.2.tar.xz"; + md5name = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289-freetype-2.13.3.tar.xz"; } { name = "frozen-1.1.1.tar.gz"; @@ -539,11 +539,11 @@ md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - name = "language-subtag-registry-2025-02-06.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-02-06.tar.bz2"; - sha256 = "e5fffcbd640e743fa9b699087d63ccf8ab5b52eed521da68f8c894f350856662"; + name = "language-subtag-registry-2025-03-10.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-03-10.tar.bz2"; + sha256 = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39"; md5 = ""; - md5name = "e5fffcbd640e743fa9b699087d63ccf8ab5b52eed521da68f8c894f350856662-language-subtag-registry-2025-02-06.tar.bz2"; + md5name = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39-language-subtag-registry-2025-03-10.tar.bz2"; } { name = "lcms2-2.16.tar.gz"; @@ -553,11 +553,11 @@ md5name = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51-lcms2-2.16.tar.gz"; } { - name = "libassuan-3.0.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libassuan-3.0.1.tar.bz2"; - sha256 = "c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1"; + name = "libassuan-3.0.2.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libassuan-3.0.2.tar.bz2"; + sha256 = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6"; md5 = ""; - md5name = "c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1-libassuan-3.0.1.tar.bz2"; + md5name = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6-libassuan-3.0.2.tar.bz2"; } { name = "libatomic_ops-7.8.2.tar.gz"; @@ -588,11 +588,11 @@ md5name = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676-libffi-3.4.4.tar.gz"; } { - name = "libgpg-error-1.51.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libgpg-error-1.51.tar.bz2"; - sha256 = "be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2"; + name = "libgpg-error-1.55.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.55.tar.bz2"; + sha256 = "95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78"; md5 = ""; - md5name = "be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2-libgpg-error-1.51.tar.bz2"; + md5name = "95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78-libgpg-error-1.55.tar.bz2"; } { name = "liblangtag-0.6.7.tar.bz2"; @@ -630,18 +630,18 @@ md5name = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917-xmlsec1-1.3.5.tar.gz"; } { - name = "libxml2-2.12.9.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.12.9.tar.xz"; - sha256 = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590"; + name = "libxml2-2.13.8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.13.8.tar.xz"; + sha256 = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a"; md5 = ""; - md5name = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590-libxml2-2.12.9.tar.xz"; + md5name = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a-libxml2-2.13.8.tar.xz"; } { - name = "libxslt-1.1.41.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxslt-1.1.41.tar.xz"; - sha256 = "3ad392af91115b7740f7b50d228cc1c5fc13afc1da7f16cb0213917a37f71bda"; + name = "libxslt-1.1.43.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.43.tar.xz"; + sha256 = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a"; md5 = ""; - md5name = "3ad392af91115b7740f7b50d228cc1c5fc13afc1da7f16cb0213917a37f71bda-libxslt-1.1.41.tar.xz"; + md5name = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a-libxslt-1.1.43.tar.xz"; } { name = "lp_solve_5.5.tar.gz"; @@ -651,18 +651,18 @@ md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } { - name = "lxml-5.2.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lxml-5.2.2.tar.gz"; - sha256 = "bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87"; + name = "lxml-5.4.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lxml-5.4.0.tar.gz"; + sha256 = "d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd"; md5 = ""; - md5name = "bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87-lxml-5.2.2.tar.gz"; + md5name = "d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd-lxml-5.4.0.tar.gz"; } { - name = "mariadb-connector-c-3.3.14-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.14-src.tar.gz"; - sha256 = "497c324ed9ebce1dd8a940c1d308574f0d4db41c8209f19bfb3ded25e733ed49"; + name = "mariadb-connector-c-3.3.15-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.15-src.tar.gz"; + sha256 = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe"; md5 = ""; - md5name = "497c324ed9ebce1dd8a940c1d308574f0d4db41c8209f19bfb3ded25e733ed49-mariadb-connector-c-3.3.14-src.tar.gz"; + md5name = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe-mariadb-connector-c-3.3.15-src.tar.gz"; } { name = "mdds-2.1.1.tar.xz"; @@ -777,11 +777,11 @@ md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz"; } { - name = "libpng-1.6.46.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libpng-1.6.46.tar.xz"; - sha256 = "f3aa8b7003998ab92a4e9906c18d19853e999f9d3bca9bd1668f54fa81707cb1"; + name = "libpng-1.6.47.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.47.tar.xz"; + sha256 = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631"; md5 = ""; - md5name = "f3aa8b7003998ab92a4e9906c18d19853e999f9d3bca9bd1668f54fa81707cb1-libpng-1.6.46.tar.xz"; + md5name = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631-libpng-1.6.47.tar.xz"; } { name = "tiff-4.7.0.tar.xz"; @@ -791,11 +791,11 @@ md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz"; } { - name = "poppler-25.01.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-25.01.0.tar.xz"; - sha256 = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112"; + name = "poppler-25.04.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-25.04.0.tar.xz"; + sha256 = "b010c596dce127fba88532fd2f1043e55ea30601767952d0f2c0a80e7dc0da3d"; md5 = ""; - md5name = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112-poppler-25.01.0.tar.xz"; + md5name = "b010c596dce127fba88532fd2f1043e55ea30601767952d0f2c0a80e7dc0da3d-poppler-25.04.0.tar.xz"; } { name = "poppler-data-0.4.12.tar.gz"; @@ -805,18 +805,18 @@ md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz"; } { - name = "postgresql-13.18.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-13.18.tar.bz2"; - sha256 = "ceea92abee2a8c19408d278b68de6a78b6bd3dbb4fa2d653fa7ca745d666aab1"; + name = "postgresql-13.19.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-13.19.tar.bz2"; + sha256 = "482cce0a9f8d24c2447cfc7b2817e55f86d51afe5f7f1a85214bf93644e774ea"; md5 = ""; - md5name = "ceea92abee2a8c19408d278b68de6a78b6bd3dbb4fa2d653fa7ca745d666aab1-postgresql-13.18.tar.bz2"; + md5name = "482cce0a9f8d24c2447cfc7b2817e55f86d51afe5f7f1a85214bf93644e774ea-postgresql-13.19.tar.bz2"; } { - name = "Python-3.9.21.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.9.21.tar.xz"; - sha256 = "3126f59592c9b0d798584755f2bf7b081fa1ca35ce7a6fea980108d752a05bb1"; + name = "Python-3.9.22.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.9.22.tar.xz"; + sha256 = "8c136d199d3637a1fce98a16adc809c1d83c922d02d41f3614b34f8b6e7d38ec"; md5 = ""; - md5name = "3126f59592c9b0d798584755f2bf7b081fa1ca35ce7a6fea980108d752a05bb1-Python-3.9.21.tar.xz"; + md5name = "8c136d199d3637a1fce98a16adc809c1d83c922d02d41f3614b34f8b6e7d38ec-Python-3.9.22.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-still/help.nix b/pkgs/applications/office/libreoffice/src-still/help.nix index 62a68fbcfaa7..dc23461a2d8d 100644 --- a/pkgs/applications/office/libreoffice/src-still/help.nix +++ b/pkgs/applications/office/libreoffice/src-still/help.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "1g1fzp5bd5rim3wdqjwfgzyw14g7bdkc4i0pdfymybgsgxdrcc5z"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.5/libreoffice-help-24.8.5.2.tar.xz"; + sha256 = "0139rsgny1n554qycwmwsxyirr4afbw2q0r326s2mz6bxfg817qm"; + url = "https://download.documentfoundation.org/libreoffice/src/24.8.7/libreoffice-help-24.8.7.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/main.nix b/pkgs/applications/office/libreoffice/src-still/main.nix index ff9a0742d778..cec518b7d4df 100644 --- a/pkgs/applications/office/libreoffice/src-still/main.nix +++ b/pkgs/applications/office/libreoffice/src-still/main.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0sdqap232lcs8jkrxxs4h29zncyg9pibx8w6bczwa2nr2i0vv2ls"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.5/libreoffice-24.8.5.2.tar.xz"; + sha256 = "1swl16qznhzbchjzx6rp0a388s1ndwpdqswjpz1mxga514dlgpzh"; + url = "https://download.documentfoundation.org/libreoffice/src/24.8.7/libreoffice-24.8.7.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/translations.nix b/pkgs/applications/office/libreoffice/src-still/translations.nix index b1b69e9fe10d..878b8f3ae73b 100644 --- a/pkgs/applications/office/libreoffice/src-still/translations.nix +++ b/pkgs/applications/office/libreoffice/src-still/translations.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "108qfnxdz9xw9njkq1lmiwa72ygiwnpzb5ghzr13v8jmhlk1a3fd"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.5/libreoffice-translations-24.8.5.2.tar.xz"; + sha256 = "0r4zvy4xlhz23bk4vmh03qa1d5qdrcjg4fppy0q92yclxkrnzlgh"; + url = "https://download.documentfoundation.org/libreoffice/src/24.8.7/libreoffice-translations-24.8.7.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/version.nix b/pkgs/applications/office/libreoffice/src-still/version.nix index 18bff564ccc3..1ca4acb8d8c9 100644 --- a/pkgs/applications/office/libreoffice/src-still/version.nix +++ b/pkgs/applications/office/libreoffice/src-still/version.nix @@ -1 +1 @@ -"24.8.5.2" +"24.8.7.2" diff --git a/pkgs/by-name/di/dia/package.nix b/pkgs/by-name/di/dia/package.nix index fbb11047880d..fb9b8df29c84 100644 --- a/pkgs/by-name/di/dia/package.nix +++ b/pkgs/by-name/di/dia/package.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation { hash = "sha256-U+8TUE1ULt6MNxnvw9kFjCAVBecUy2Sarof6H9+kR7Q="; }; - # Required for the PDF plugin when building with clang. - CXXFLAGS = "-std=c++17"; + # Required for the PDF plugin + CXXFLAGS = "-std=c++20"; preConfigure = '' patchShebangs . diff --git a/pkgs/by-name/gd/gdal/package.nix b/pkgs/by-name/gd/gdal/package.nix index 05690ae7be12..7b6200793c58 100644 --- a/pkgs/by-name/gd/gdal/package.nix +++ b/pkgs/by-name/gd/gdal/package.nix @@ -83,13 +83,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal"; - version = "3.10.3"; + version = "3.11.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; tag = "v${finalAttrs.version}"; - hash = "sha256-dILIEg5BXRbRcHEh6U1FfPgR/U3J0q4ypRMM6yakuwc="; + hash = "sha256-8HcbA9Cj2i6DuqcJGiwqd6GkqbJP9oLdmA34g7kc/ng="; }; nativeBuildInputs = @@ -284,6 +284,8 @@ stdenv.mkDerivation (finalAttrs: { "test_ogr_gpkg_background_rtree_build" "test_vsiaz_fake_write" "test_vsioss_6" + # flaky? + "test_tiledb_read_arbitrary_array" ] ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ # likely precision-related expecting x87 behaviour diff --git a/pkgs/by-name/pd/pdal/package.nix b/pkgs/by-name/pd/pdal/package.nix index 8fae42c069e9..c48bf2584bdd 100644 --- a/pkgs/by-name/pd/pdal/package.nix +++ b/pkgs/by-name/pd/pdal/package.nix @@ -116,6 +116,9 @@ stdenv.mkDerivation (finalAttrs: { # Failure "pdal_app_plugin_test" + + # Removed in GDAL 3.11 + "pdal_io_gdal_writer_test" ]; nativeCheckInputs = [ diff --git a/pkgs/by-name/pd/pdf2djvu/package.nix b/pkgs/by-name/pd/pdf2djvu/package.nix index e92663ad2239..2d617b6664f6 100644 --- a/pkgs/by-name/pd/pdf2djvu/package.nix +++ b/pkgs/by-name/pd/pdf2djvu/package.nix @@ -56,9 +56,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Required by Poppler on darwin - # https://github.com/jwilk/pdf2djvu/commit/373e065faf2f0d868a3700788d20a96e9528bb12 - CXXFLAGS = "-std=c++17"; + # Required by Poppler + CXXFLAGS = "-std=c++20"; meta = with lib; { description = "Creates djvu files from PDF files"; diff --git a/pkgs/by-name/pd/pdftoipe/package.nix b/pkgs/by-name/pd/pdftoipe/package.nix index 70e3fc58f3d9..3f4219e83d20 100644 --- a/pkgs/by-name/pd/pdftoipe/package.nix +++ b/pkgs/by-name/pd/pdftoipe/package.nix @@ -9,33 +9,15 @@ stdenv.mkDerivation rec { pname = "pdftoipe"; - version = "7.2.24.1"; + version = "7.2.29.1"; src = fetchFromGitHub { owner = "otfried"; repo = "ipe-tools"; rev = "v${version}"; - hash = "sha256-jlrjrjzZQo79CKMySayhCm1dqLh89wOQuXrXa2aqc0k="; + hash = "sha256-6FI0ZLRrDmNFAKyht7hB94MsCy+TasD6Mb/rx6sdCdg="; }; - patches = [ - # Fix build with poppler > 22.03.0 - # https://github.com/otfried/ipe-tools/pull/48 - (fetchpatch { - url = "https://github.com/otfried/ipe-tools/commit/14335180432152ad094300d0afd00d8e390469b2.patch"; - hash = "sha256-V3FmwG3bR6io/smxjasFJ5K0/u8RSFfdUX41ClGXhFc="; - stripLen = 1; - name = "poppler_fix_build_48.patch"; - }) - # https://github.com/otfried/ipe-tools/pull/55 - (fetchpatch { - url = "https://github.com/otfried/ipe-tools/commit/65586fcd9cc39e482ae5a9abdb6f4932d9bb88c4.patch"; - hash = "sha256-qr1AQyWHz1e2a65m05xSHFnP6oSP6qSmMVekNk2flRc="; - stripLen = 1; - name = "poppler_fix_build_55.patch"; - }) - ]; - sourceRoot = "${src.name}/pdftoipe"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 0345863b00d3..4f8c2a880aab 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -56,13 +56,13 @@ let domain = "gitlab.freedesktop.org"; owner = "poppler"; repo = "test"; - rev = "400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1"; - hash = "sha256-Y4aNOJLqo4g6tTW6TAb60jAWtBhRgT/JXsub12vi3aU="; + rev = "91ee031c882634c36f2f0f2f14eb6646dd542fb9"; + hash = "sha256-bImTdlhMAA79kwbKPrHN3a9vVrtsgBh3rFjH3B7tEbQ="; }; in stdenv.mkDerivation (finalAttrs: rec { pname = "poppler-${suffix}"; - version = "24.02.0"; # beware: updates often break cups-filters build, check scribus too! + version = "25.05.0"; # beware: updates often break cups-filters build, check scribus too! outputs = [ "out" @@ -71,32 +71,9 @@ stdenv.mkDerivation (finalAttrs: rec { src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - hash = "sha256-GRh6P90F8z59YExHmcGD3lygEYZAyIs3DdzzE2NDIi4="; + hash = "sha256-mxYnxbdoFqxeQFKgP1tgW6QLRc8GsCyt0EeWILSZqzg="; }; - patches = [ - (fetchpatch { - # https://access.redhat.com/security/cve/CVE-2024-6239 - name = "CVE-2024-6239.patch"; - url = "https://gitlab.freedesktop.org/poppler/poppler/-/commit/0554731052d1a97745cb179ab0d45620589dd9c4.patch"; - hash = "sha256-I78wJ4l1DSh+x/e00ZL8uvrGdBH+ufp+EDm0A1XWyCU="; - }) - (fetchpatch { - # https://nvd.nist.gov/vuln/detail/CVE-2025-43903 - name = "CVE-2025-43903.patch"; - url = "https://gitlab.freedesktop.org/poppler/poppler/-/commit/f1b9c830f145a0042e853d6462b2f9ca4016c669.patch"; - hash = "sha256-wZ8fqIAmMnQDf64sWXjfpkhk8TLDWMPUGxz40ktAzFI="; - }) - - (fetchpatch { - # fixes build on clang-19 - # https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/1526 - name = "char16_t-not-short.patch"; - url = "https://gitlab.freedesktop.org/poppler/poppler/-/commit/b4ac7d9af7cb5edfcfcbda035ed8b8c218ba8564.patch"; - hash = "sha256-2aEq3VDITJabvB/+bcdULBXbqVbDdL0xJr2TWLiWqX8="; - }) - ]; - nativeBuildInputs = [ cmake diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix index 542cb22f335a..1b3b5f236f96 100644 --- a/pkgs/development/python-modules/inkex/default.nix +++ b/pkgs/development/python-modules/inkex/default.nix @@ -7,7 +7,6 @@ cssselect, lxml, numpy, - packaging, pillow, pygobject3, pyparsing, @@ -17,7 +16,6 @@ gobject-introspection, pytestCheckHook, gtk3, - fetchpatch2, }: buildPythonPackage { @@ -27,16 +25,6 @@ buildPythonPackage { inherit (inkscape) src; - patches = [ - (fetchpatch2 { - name = "add-numpy-2-support.patch"; - url = "https://gitlab.com/inkscape/extensions/-/commit/13ebc1e957573fea2c3360f676b0f1680fad395d.patch"; - hash = "sha256-0n8L8dUaYYPBsmHlAxd60c5zqfK6NmXJfWZVBXPbiek="; - stripLen = 1; - extraPrefix = "share/extensions/"; - }) - ]; - build-system = [ poetry-core ]; pythonRelaxDeps = [ "numpy" ]; diff --git a/pkgs/development/python-modules/pyogrio/default.nix b/pkgs/development/python-modules/pyogrio/default.nix index ffba2dbdfcb9..3ada3c1488eb 100644 --- a/pkgs/development/python-modules/pyogrio/default.nix +++ b/pkgs/development/python-modules/pyogrio/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pyogrio"; - version = "0.10.0"; + version = "0.11.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "geopandas"; repo = "pyogrio"; tag = "v${version}"; - hash = "sha256-AyKBktZWzUxD1HKKp89gQ97c4WPB5PkXnkFqN+RHx7c="; + hash = "sha256-3XrP3/sqGRtA+sfaoOV/ByGAtfpGZB5RYRr5lyYZUj0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-poppler/default.nix b/pkgs/development/python-modules/python-poppler/default.nix index d817dccfae79..d505bf39af50 100644 --- a/pkgs/development/python-modules/python-poppler/default.nix +++ b/pkgs/development/python-modules/python-poppler/default.nix @@ -4,10 +4,8 @@ fetchPypi, pythonOlder, pytestCheckHook, - setuptools, meson-python, ninja, - meson, poppler, pkg-config, pybind11, @@ -29,6 +27,9 @@ buildPythonPackage rec { patches = [ # Prevent Meson from downloading pybind11, use system version instead ./use_system_pybind11.patch + # Fix build with Poppler 25.01+ + # See: https://github.com/cbrunet/python-poppler/pull/92 + ./poppler-25.patch ]; build-system = [ meson-python ]; diff --git a/pkgs/development/python-modules/python-poppler/poppler-25.patch b/pkgs/development/python-modules/python-poppler/poppler-25.patch new file mode 100644 index 000000000000..218dc60883f8 --- /dev/null +++ b/pkgs/development/python-modules/python-poppler/poppler-25.patch @@ -0,0 +1,39 @@ +diff --git a/src/cpp/image.cpp b/src/cpp/image.cpp +index 725359b..91131f4 100644 +--- a/src/cpp/image.cpp ++++ b/src/cpp/image.cpp +@@ -102,7 +102,11 @@ PYBIND11_MODULE(image, m) + .def(py::init(), py::arg("iwidth"), py::arg("iheight"), py::arg("iformat")) + .def("bytes_per_row", &image::bytes_per_row) + // .def("const_data", &image::const_data) ++#if HAS_VERSION(25, 1) ++ .def("copy", &image::copy) ++#else + .def("copy", &image::copy, py::arg("rect") = rect()) ++#endif + .def("data", &data) + .def("set_data", &set_data) + .def("format", &image::format) +diff --git a/src/poppler/image.py b/src/poppler/image.py +index a8c27e2..0a6834c 100644 +--- a/src/poppler/image.py ++++ b/src/poppler/image.py +@@ -16,7 +16,6 @@ + # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + from poppler.cpp import image +-from poppler.rectangle import Rectangle + + + class Image: +@@ -47,8 +46,8 @@ def bytes_per_row(self): + def const_data(self): + return self._image.data() + +- def copy(self, rect=None): +- image = self._image.copy(rect or Rectangle()._rect) ++ def copy(self): ++ image = self._image.copy() + return Image.from_object(image) + + @property diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 448adcc5d7b8..9ed522c5a898 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -93,6 +93,10 @@ buildPythonPackage rec { "test_issue1982" "test_opener_fsspec_http_fs" "test_fsspec_http_msk_sidecar" + # expect specific magic numbers that our version of GDAL does not produce + "test_warp" + "test_warpedvrt" + "test_rio_warp" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_reproject_error_propagation" ]; pythonImportsCheck = [ "rasterio" ]; diff --git a/pkgs/development/python-modules/rioxarray/default.nix b/pkgs/development/python-modules/rioxarray/default.nix index 908a2b7b372f..e7e761cd78eb 100644 --- a/pkgs/development/python-modules/rioxarray/default.nix +++ b/pkgs/development/python-modules/rioxarray/default.nix @@ -52,6 +52,11 @@ buildPythonPackage rec { [ # AssertionError: assert 535727386 == 535691205 "test_clip_geojson__no_drop" + # Fails with GDAL 3.11 warning + "test_rasterio_vrt" + # Fails with small numerical errors on GDAL 3.11 + "test_rasterio_vrt_gcps" + "test_reproject__gcps" ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # numerical errors diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 40eb1799aab4..2fde76e12fa1 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -4,7 +4,7 @@ cunit, docbook5, fetchFromGitHub, - file, + fetchpatch, gdalMinimal, geos, jitSupport, @@ -50,6 +50,15 @@ postgresqlBuildExtension (finalAttrs: { hash = "sha256-1kOLtG6AMavbWQ1lHG2ABuvIcyTYhgcbjuVmqMR4X+g="; }; + patches = [ + # Backport patch for compatibility with GDAL 3.11 + # FIXME: remove in next update + (fetchpatch { + url = "https://git.osgeo.org/gitea/postgis/postgis/commit/614eca7c169cd6e9819801d3ea99d5258262c58b.patch"; + hash = "sha256-VkNZFANAt8Jv+ExCusGvi+ZWB7XLcAheefSx7akA7Go="; + }) + ]; + buildInputs = [ geos