Unverified Commit b306e97f authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

Libreoffice updates (#354456)

parents 62fa59a6 3fe7c149

pkgs/applications/office/libreoffice/default.nix

+3 −1
Original line number Diff line number Diff line
@@ -548,7 +548,9 @@ in stdenv.mkDerivation (finalAttrs: { 


  buildTargets = [ "build-nocheck" ];



  doCheck = true;

  # Disable tests for the Qt5 build, as they seem even more flaky

  # than usual, and we will drop the Qt5 build after 24.11 anyway.

  doCheck = !(kdeIntegration && qtMajor == "5");



  preCheck = ''

    export HOME=$(pwd)

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

+36 −36
Original line number Diff line number Diff line
@@ -105,11 +105,11 @@ 
    md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz";

  }

  {

    name = "curl-8.9.0.tar.xz";

    url = "https://dev-www.libreoffice.org/src/curl-8.9.0.tar.xz";

    sha256 = "ff09b2791ca56d25fd5c3f3a4927dce7c8a9dc4182200c487ca889fba1fdd412";

    name = "curl-8.10.1.tar.xz";

    url = "https://dev-www.libreoffice.org/src/curl-8.10.1.tar.xz";

    sha256 = "73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee";

    md5 = "";

    md5name = "ff09b2791ca56d25fd5c3f3a4927dce7c8a9dc4182200c487ca889fba1fdd412-curl-8.9.0.tar.xz";

    md5name = "73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee-curl-8.10.1.tar.xz";

  }

  {

    name = "libe-book-0.1.3.tar.xz";
@@ -147,11 +147,11 @@ 
    md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz";

  }

  {

    name = "expat-2.6.2.tar.xz";

    url = "https://dev-www.libreoffice.org/src/expat-2.6.2.tar.xz";

    sha256 = "ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364";

    name = "expat-2.6.3.tar.xz";

    url = "https://dev-www.libreoffice.org/src/expat-2.6.3.tar.xz";

    sha256 = "274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc";

    md5 = "";

    md5name = "ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364-expat-2.6.2.tar.xz";

    md5name = "274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc-expat-2.6.3.tar.xz";

  }

  {

    name = "Firebird-3.0.7.33374-0.tar.bz2";
@@ -658,11 +658,11 @@ 
    md5name = "bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87-lxml-5.2.2.tar.gz";

  }

  {

    name = "mariadb-connector-c-3.3.8-src.tar.gz";

    url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.8-src.tar.gz";

    sha256 = "f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8";

    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";

    md5 = "";

    md5name = "f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8-mariadb-connector-c-3.3.8-src.tar.gz";

    md5name = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a-mariadb-connector-c-3.3.11-src.tar.gz";

  }

  {

    name = "mdds-2.1.1.tar.xz";
@@ -742,11 +742,11 @@ 
    md5name = "48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e-openldap-2.6.8.tgz";

  }

  {

    name = "openssl-3.0.14.tar.gz";

    url = "https://dev-www.libreoffice.org/src/openssl-3.0.14.tar.gz";

    sha256 = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca";

    name = "openssl-3.0.15.tar.gz";

    url = "https://dev-www.libreoffice.org/src/openssl-3.0.15.tar.gz";

    sha256 = "23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533";

    md5 = "";

    md5name = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca-openssl-3.0.14.tar.gz";

    md5name = "23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533-openssl-3.0.15.tar.gz";

  }

  {

    name = "liborcus-0.19.2.tar.xz";
@@ -777,25 +777,25 @@ 
    md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz";

  }

  {

    name = "libpng-1.6.43.tar.xz";

    url = "https://dev-www.libreoffice.org/src/libpng-1.6.43.tar.xz";

    sha256 = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c";

    name = "libpng-1.6.44.tar.xz";

    url = "https://dev-www.libreoffice.org/src/libpng-1.6.44.tar.xz";

    sha256 = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e";

    md5 = "";

    md5name = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c-libpng-1.6.43.tar.xz";

    md5name = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e-libpng-1.6.44.tar.xz";

  }

  {

    name = "tiff-4.6.0t.tar.xz";

    url = "https://dev-www.libreoffice.org/src/tiff-4.6.0t.tar.xz";

    sha256 = "d6da35c9986a4ec845eb96258b3693f8df515f7eb4c1e597ceb03e22788f305b";

    name = "tiff-4.7.0.tar.xz";

    url = "https://dev-www.libreoffice.org/src/tiff-4.7.0.tar.xz";

    sha256 = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017";

    md5 = "";

    md5name = "d6da35c9986a4ec845eb96258b3693f8df515f7eb4c1e597ceb03e22788f305b-tiff-4.6.0t.tar.xz";

    md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz";

  }

  {

    name = "poppler-24.06.0.tar.xz";

    url = "https://dev-www.libreoffice.org/src/poppler-24.06.0.tar.xz";

    sha256 = "0cdabd495cada11f6ee9e75c793f80daf46367b66c25a63ee8c26d0f9ec40c76";

    name = "poppler-24.08.0.tar.xz";

    url = "https://dev-www.libreoffice.org/src/poppler-24.08.0.tar.xz";

    sha256 = "97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174";

    md5 = "";

    md5name = "0cdabd495cada11f6ee9e75c793f80daf46367b66c25a63ee8c26d0f9ec40c76-poppler-24.06.0.tar.xz";

    md5name = "97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174-poppler-24.08.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.15.tar.bz2";

    url = "https://dev-www.libreoffice.org/src/postgresql-13.15.tar.bz2";

    sha256 = "42edd415446d33b8c242be76d1ad057531b2264b2e86939339b7075c6e4ec925";

    name = "postgresql-13.16.tar.bz2";

    url = "https://dev-www.libreoffice.org/src/postgresql-13.16.tar.bz2";

    sha256 = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865";

    md5 = "";

    md5name = "42edd415446d33b8c242be76d1ad057531b2264b2e86939339b7075c6e4ec925-postgresql-13.15.tar.bz2";

    md5name = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865-postgresql-13.16.tar.bz2";

  }

  {

    name = "Python-3.9.19.tar.xz";

    url = "https://dev-www.libreoffice.org/src/Python-3.9.19.tar.xz";

    sha256 = "d4892cd1618f6458cb851208c030df1482779609d0f3939991bd38184f8c679e";

    name = "Python-3.9.20.tar.xz";

    url = "https://dev-www.libreoffice.org/src/Python-3.9.20.tar.xz";

    sha256 = "6b281279efd85294d2d6993e173983a57464c0133956fbbb5536ec9646beaf0c";

    md5 = "";

    md5name = "d4892cd1618f6458cb851208c030df1482779609d0f3939991bd38184f8c679e-Python-3.9.19.tar.xz";

    md5name = "6b281279efd85294d2d6993e173983a57464c0133956fbbb5536ec9646beaf0c-Python-3.9.20.tar.xz";

  }

  {

    name = "libqxp-0.0.2.tar.xz";

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

+2 −2
Original line number Diff line number Diff line 
{ fetchurl, ... }:

fetchurl {

  sha256 = "1vbi2qbap3ccychc0sfn32z46klyzjh0hhk4in0sd7qkl97y6lvn";

  url = "https://download.documentfoundation.org/libreoffice/src/24.8.0/libreoffice-help-24.8.0.3.tar.xz";

  sha256 = "1xlfs1380h9axqx37kp9nwq4bwlg08rm136ayzglaz57vx87vxsg";

  url = "https://download.documentfoundation.org/libreoffice/src/24.8.2/libreoffice-help-24.8.2.1.tar.xz";

}

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

+2 −2
Original line number Diff line number Diff line 
{ fetchurl, ... }:

fetchurl {

  sha256 = "1hbqgpgih3j9ic1dljxz3mz0rsjf0iyws7qm7g1hb35ns664c4av";

  url = "https://download.documentfoundation.org/libreoffice/src/24.8.0/libreoffice-24.8.0.3.tar.xz";

  sha256 = "1ky4ph9g7x9k68px6x4dgfnf5wqbxqabkp75pjhsj521nsp1nc5b";

  url = "https://download.documentfoundation.org/libreoffice/src/24.8.2/libreoffice-24.8.2.1.tar.xz";

}

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

+2 −2
Original line number Diff line number Diff line 
{ fetchurl, ... }:

fetchurl {

  sha256 = "0p75xijrmp44kcda33xg5dr06xl1fcxwhxgvlcj396rkn2k0c9sy";

  url = "https://download.documentfoundation.org/libreoffice/src/24.8.0/libreoffice-translations-24.8.0.3.tar.xz";

  sha256 = "1yvfcwj9dr2216b9fyi89849jy4lw3jg2yqrx4dm30qdn07jqf3j";

  url = "https://download.documentfoundation.org/libreoffice/src/24.8.2/libreoffice-translations-24.8.2.1.tar.xz";

}