diff options
author | Doron Behar <doron.behar@gmail.com> | 2023-03-14 19:34:22 +0200 |
---|---|---|
committer | Doron Behar <doron.behar@gmail.com> | 2023-04-02 18:15:53 +0300 |
commit | c613b68e4ce0ce94393e0b1886123348665d8961 (patch) | |
tree | acf63f43ed5f665910d59c99ac342056dec909ca | |
parent | 272f3d39144149a7adc62873ed21f09da9c8f2e9 (diff) |
libreoffice-still: 7.3.7.2 -> 7.4.6.2
3 files changed, 122 insertions, 144 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a8a6fb8bf963f..67cbbdbce2f88 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -216,9 +216,6 @@ in tar -xf ${srcs.translations} ''; - patches = optionals (variant == "still") [ ./skip-failed-test-with-icu70.patch ./gpgme-1.18.patch ] - ; - ### QT/KDE # # configure.ac assumes that the first directory that contains headers and @@ -449,6 +446,8 @@ in "--without-system-libstaroffice" "--without-system-libepubgen" "--without-system-libqxp" + "--without-system-dragonbox" + "--without-system-libfixmath" "--with-system-mdds" # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" diff --git a/pkgs/applications/office/libreoffice/src-still/download.nix b/pkgs/applications/office/libreoffice/src-still/download.nix index 940a648549235..45c3d3494989a 100644 --- a/pkgs/applications/office/libreoffice/src-still/download.nix +++ b/pkgs/applications/office/libreoffice/src-still/download.nix @@ -7,32 +7,18 @@ md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; } { - name = "apr-1.5.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz"; - sha256 = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb"; + name = "boost_1_79_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_79_0.tar.xz"; + sha256 = "2058aa88758a0e1aaac1759b3c4bad2526f899c6ecc6eeea79aa5e8fd3ea95dc"; md5 = ""; - md5name = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb-apr-1.5.2.tar.gz"; + md5name = "2058aa88758a0e1aaac1759b3c4bad2526f899c6ecc6eeea79aa5e8fd3ea95dc-boost_1_79_0.tar.xz"; } { - name = "apr-util-1.5.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz"; - sha256 = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19"; + name = "box2d-2.4.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/box2d-2.4.1.tar.gz"; + sha256 = "d6b4650ff897ee1ead27cf77a5933ea197cbeef6705638dd181adc2e816b23c2"; md5 = ""; - md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; - } - { - name = "boost_1_77_0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/boost_1_77_0.tar.xz"; - sha256 = "9b334d6c6d7af5a0687280788cd84444398b8e0b472cd88e52bbc3c3ef11d98e"; - md5 = ""; - md5name = "9b334d6c6d7af5a0687280788cd84444398b8e0b472cd88e52bbc3c3ef11d98e-boost_1_77_0.tar.xz"; - } - { - name = "box2d-2.3.1.tar.gz"; - url = "https://dev-www.libreoffice.org/src/box2d-2.3.1.tar.gz"; - sha256 = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c"; - md5 = ""; - md5name = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c-box2d-2.3.1.tar.gz"; + md5name = "d6b4650ff897ee1ead27cf77a5933ea197cbeef6705638dd181adc2e816b23c2-box2d-2.4.1.tar.gz"; } { name = "breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz"; @@ -56,11 +42,11 @@ md5name = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269-bzip2-1.0.8.tar.gz"; } { - name = "cairo-1.17.4.tar.xz"; - url = "https://dev-www.libreoffice.org/src/cairo-1.17.4.tar.xz"; - sha256 = "74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705"; + name = "cairo-1.17.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/cairo-1.17.6.tar.xz"; + sha256 = "4eebc4c2bad0402bc3f501db184417094657d111fb6c06f076a82ea191fe1faf"; md5 = ""; - md5name = "74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705-cairo-1.17.4.tar.xz"; + md5name = "4eebc4c2bad0402bc3f501db184417094657d111fb6c06f076a82ea191fe1faf-cairo-1.17.6.tar.xz"; } { name = "libcdr-0.1.7.tar.xz"; @@ -77,6 +63,13 @@ md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; } { + name = "dragonbox-1.1.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/dragonbox-1.1.3.tar.gz"; + sha256 = "09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384"; + md5 = ""; + md5name = "09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384-dragonbox-1.1.3.tar.gz"; + } + { name = "dtoa-20180411.tgz"; url = "https://dev-www.libreoffice.org/src/dtoa-20180411.tgz"; sha256 = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4"; @@ -105,18 +98,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "converttexttonumber-1-5-0.oxt"; - url = "https://dev-www.libreoffice.org/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; - sha256 = "71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3"; - md5 = "1f467e5bb703f12cbbb09d5cf67ecf4a"; - md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; - } - { - name = "curl-7.86.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-7.86.0.tar.xz"; - sha256 = "2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b"; + name = "curl-7.88.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-7.88.1.tar.xz"; + sha256 = "1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f"; md5 = ""; - md5name = "2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b-curl-7.86.0.tar.xz"; + md5name = "1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f-curl-7.88.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -154,11 +140,11 @@ md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz"; } { - name = "expat-2.4.9.tar.xz"; - url = "https://dev-www.libreoffice.org/src/expat-2.4.9.tar.xz"; - sha256 = "6e8c0728fe5c7cd3f93a6acce43046c5e4736c7b4b68e032e9350daa0efc0354"; + name = "expat-2.5.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.5.0.tar.xz"; + sha256 = "ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe"; md5 = ""; - md5name = "6e8c0728fe5c7cd3f93a6acce43046c5e4736c7b4b68e032e9350daa0efc0354-expat-2.4.9.tar.xz"; + md5name = "ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe-expat-2.5.0.tar.xz"; } { name = "Firebird-3.0.7.33374-0.tar.bz2"; @@ -315,11 +301,11 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.11.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/freetype-2.11.0.tar.xz"; - sha256 = "8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7"; + name = "freetype-2.12.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/freetype-2.12.0.tar.xz"; + sha256 = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033"; md5 = ""; - md5name = "8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7-freetype-2.11.0.tar.xz"; + md5name = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033-freetype-2.12.0.tar.xz"; } { name = "glm-0.9.9.8.zip"; @@ -329,11 +315,11 @@ md5name = "6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad-glm-0.9.9.8.zip"; } { - name = "gpgme-1.16.0.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/gpgme-1.16.0.tar.bz2"; - sha256 = "6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0"; + name = "gpgme-1.18.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/gpgme-1.18.0.tar.bz2"; + sha256 = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e"; md5 = ""; - md5name = "6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0-gpgme-1.16.0.tar.bz2"; + md5name = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e-gpgme-1.18.0.tar.bz2"; } { name = "graphite2-minimal-1.3.14.tgz"; @@ -343,11 +329,11 @@ md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; } { - name = "harfbuzz-2.8.2.tar.xz"; - url = "https://dev-www.libreoffice.org/src/harfbuzz-2.8.2.tar.xz"; - sha256 = "d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7"; + name = "harfbuzz-4.3.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/harfbuzz-4.3.0.tar.xz"; + sha256 = "a49628f4c4c8e6d8df95ef44935a93446cf2e46366915b0e3ca30df21fffb530"; md5 = ""; - md5name = "d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7-harfbuzz-2.8.2.tar.xz"; + md5name = "a49628f4c4c8e6d8df95ef44935a93446cf2e46366915b0e3ca30df21fffb530-harfbuzz-4.3.0.tar.xz"; } { name = "hsqldb_1_8_0.zip"; @@ -371,18 +357,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-70_1-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-70_1-src.tgz"; - sha256 = "8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5"; + name = "icu4c-71_1-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-71_1-src.tgz"; + sha256 = "67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf"; md5 = ""; - md5name = "8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5-icu4c-70_1-src.tgz"; + md5name = "67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf-icu4c-71_1-src.tgz"; } { - name = "icu4c-70_1-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-70_1-data.zip"; - sha256 = "c72723ddba3300ffb231d6b09e2a728ea6e89de10ed5927f74bacbd77042336e"; + name = "icu4c-71_1-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-71_1-data.zip"; + sha256 = "e3882b4fece6e5e039f22c3189b7ba224180fd26fdbfa9db284617455b93e804"; md5 = ""; - md5name = "c72723ddba3300ffb231d6b09e2a728ea6e89de10ed5927f74bacbd77042336e-icu4c-70_1-data.zip"; + md5name = "e3882b4fece6e5e039f22c3189b7ba224180fd26fdbfa9db284617455b93e804-icu4c-71_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -462,25 +448,18 @@ md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { - name = "libjpeg-turbo-2.1.1.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.1.tar.gz"; - sha256 = "20e9cd3e5f517950dfb7a300ad344543d88719c254407ffb5ad88d891bf701c4"; + name = "libjpeg-turbo-2.1.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.2.tar.gz"; + sha256 = "09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5"; md5 = ""; - md5name = "20e9cd3e5f517950dfb7a300ad344543d88719c254407ffb5ad88d891bf701c4-libjpeg-turbo-2.1.1.tar.gz"; + md5name = "09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5-libjpeg-turbo-2.1.2.tar.gz"; } { - name = "language-subtag-registry-2021-12-29.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-12-29.tar.bz2"; - sha256 = "d9dcf20be5ad4856daef023087421bedc1477f9b4247fc8ea53bb32e07c97837"; + name = "language-subtag-registry-2022-08-08.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2022-08-08.tar.bz2"; + sha256 = "e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00"; md5 = ""; - md5name = "d9dcf20be5ad4856daef023087421bedc1477f9b4247fc8ea53bb32e07c97837-language-subtag-registry-2021-12-29.tar.bz2"; - } - { - name = "JLanguageTool-1.7.0.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; - sha256 = "48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d"; - md5 = "b63e6340a02ff1cacfeadb2c42286161"; - md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; + md5name = "e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00-language-subtag-registry-2022-08-08.tar.bz2"; } { name = "lcms2-2.12.tar.gz"; @@ -539,11 +518,11 @@ md5name = "1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd-liblangtag-0.6.3.tar.bz2"; } { - name = "libnumbertext-1.0.10.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.10.tar.xz"; - sha256 = "a285573864eaac8d36a0f66d946e9b1d3cf01c5d93d31fda00264a76f2633beb"; + name = "libnumbertext-1.0.11.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.11.tar.xz"; + sha256 = "5dcb4db3b2340f81f601ce86d8d76b69e34d70f84f804192c901e4b7f84d5fb0"; md5 = ""; - md5name = "a285573864eaac8d36a0f66d946e9b1d3cf01c5d93d31fda00264a76f2633beb-libnumbertext-1.0.10.tar.xz"; + md5name = "5dcb4db3b2340f81f601ce86d8d76b69e34d70f84f804192c901e4b7f84d5fb0-libnumbertext-1.0.11.tar.xz"; } { name = "ltm-1.0.zip"; @@ -553,11 +532,18 @@ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.33.tar.gz"; - url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.33.tar.gz"; - sha256 = "26041d35a20a245ed5a2fb9ee075f10825664d274220cb5190340fa87a4d0931"; + name = "libwebp-1.2.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libwebp-1.2.4.tar.gz"; + sha256 = "7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df"; md5 = ""; - md5name = "26041d35a20a245ed5a2fb9ee075f10825664d274220cb5190340fa87a4d0931-xmlsec1-1.2.33.tar.gz"; + md5name = "7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df-libwebp-1.2.4.tar.gz"; + } + { + name = "xmlsec1-1.2.34.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.34.tar.gz"; + sha256 = "52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262"; + md5 = ""; + md5name = "52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262-xmlsec1-1.2.34.tar.gz"; } { name = "libxml2-2.10.3.tar.xz"; @@ -630,18 +616,11 @@ md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; } { - name = "neon-0.31.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/neon-0.31.2.tar.gz"; - sha256 = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678"; - md5 = ""; - md5name = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678-neon-0.31.2.tar.gz"; - } - { - name = "nss-3.83-with-nspr-4.34.1.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.83-with-nspr-4.34.1.tar.gz"; - sha256 = "b1e1198fa7ee4e0fe4fa6937245c94820fd3c3c6897779493858af1bf6310b30"; + name = "nss-3.88.1-with-nspr-4.35.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.88.1-with-nspr-4.35.tar.gz"; + sha256 = "fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a"; md5 = ""; - md5name = "b1e1198fa7ee4e0fe4fa6937245c94820fd3c3c6897779493858af1bf6310b30-nss-3.83-with-nspr-4.34.1.tar.gz"; + md5name = "fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a-nss-3.88.1-with-nspr-4.35.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; @@ -672,11 +651,11 @@ md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz"; } { - name = "openssl-1.1.1q.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-1.1.1q.tar.gz"; - sha256 = "d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca"; + name = "openssl-1.1.1t.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-1.1.1t.tar.gz"; + sha256 = "8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b"; md5 = ""; - md5name = "d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca-openssl-1.1.1q.tar.gz"; + md5name = "8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b-openssl-1.1.1t.tar.gz"; } { name = "liborcus-0.17.2.tar.bz2"; @@ -693,32 +672,39 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-4699.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-4699.tar.bz2"; - sha256 = "ee80fe0a3b20ef5c5babc494cd655d1b1a0bdec710acb04524789df500c563bf"; + name = "pdfium-5058.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-5058.tar.bz2"; + sha256 = "eaf4ce9fad32b5d951c524139df23119b66c67720057defb97acab2dfb2582ac"; md5 = ""; - md5name = "ee80fe0a3b20ef5c5babc494cd655d1b1a0bdec710acb04524789df500c563bf-pdfium-4699.tar.bz2"; + md5name = "eaf4ce9fad32b5d951c524139df23119b66c67720057defb97acab2dfb2582ac-pdfium-5058.tar.bz2"; } { - name = "pixman-0.40.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/pixman-0.40.0.tar.gz"; - sha256 = "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc"; + name = "pixman-0.42.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/pixman-0.42.2.tar.gz"; + sha256 = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e"; md5 = ""; - md5name = "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc-pixman-0.40.0.tar.gz"; + md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz"; } { - name = "libpng-1.6.38.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libpng-1.6.38.tar.xz"; - sha256 = "b3683e8b8111ebf6f1ac004ebb6b0c975cd310ec469d98364388e9cedbfa68be"; + name = "libpng-1.6.39.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.39.tar.xz"; + sha256 = "1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937"; md5 = ""; - md5name = "b3683e8b8111ebf6f1ac004ebb6b0c975cd310ec469d98364388e9cedbfa68be-libpng-1.6.38.tar.xz"; + md5name = "1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937-libpng-1.6.39.tar.xz"; } { - name = "poppler-22.09.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-22.09.0.tar.xz"; - sha256 = "d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e"; + name = "tiff-4.5.0rc3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/tiff-4.5.0rc3.tar.xz"; + sha256 = "dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c"; md5 = ""; - md5name = "d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e-poppler-22.09.0.tar.xz"; + md5name = "dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c-tiff-4.5.0rc3.tar.xz"; + } + { + name = "poppler-22.12.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-22.12.0.tar.xz"; + sha256 = "d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0"; + md5 = ""; + md5name = "d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0-poppler-22.12.0.tar.xz"; } { name = "poppler-data-0.4.11.tar.gz"; @@ -728,18 +714,18 @@ md5name = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c-poppler-data-0.4.11.tar.gz"; } { - name = "postgresql-13.8.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-13.8.tar.bz2"; - sha256 = "73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded"; + name = "postgresql-13.10.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-13.10.tar.bz2"; + sha256 = "5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2"; md5 = ""; - md5name = "73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded-postgresql-13.8.tar.bz2"; + md5name = "5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2-postgresql-13.10.tar.bz2"; } { - name = "Python-3.8.15.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.8.15.tar.xz"; - sha256 = "5114fc7918a2a5e20eb5aac696b30c36f412c6ef24b13f5c9eb9e056982d9550"; + name = "Python-3.8.16.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.8.16.tar.xz"; + sha256 = "d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562"; md5 = ""; - md5name = "5114fc7918a2a5e20eb5aac696b30c36f412c6ef24b13f5c9eb9e056982d9550-Python-3.8.15.tar.xz"; + md5name = "d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562-Python-3.8.16.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -784,18 +770,11 @@ md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; } { - name = "serf-1.3.9.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/serf-1.3.9.tar.bz2"; - sha256 = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc"; - md5 = ""; - md5name = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc-serf-1.3.9.tar.bz2"; - } - { - name = "skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"; - sha256 = "97e859e8467eca9d2441cd23079b61c2c3863b5687620f18cc31a9f966740177"; + name = "skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"; + sha256 = "c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9"; md5 = ""; - md5name = "97e859e8467eca9d2441cd23079b61c2c3863b5687620f18cc31a9f966740177-skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"; + md5name = "c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9-skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix index dd51866033978..184fb6b651957 100644 --- a/pkgs/applications/office/libreoffice/src-still/primary.nix +++ b/pkgs/applications/office/libreoffice/src-still/primary.nix @@ -1,14 +1,14 @@ { fetchurl }: rec { - fetchSrc = {name, sha256}: fetchurl { + fetchSrc = {name, hash}: fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; - inherit sha256; + inherit hash; }; major = "7"; - minor = "3"; - patch = "7"; + minor = "4"; + patch = "6"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - hash = "sha256-UphmAklfbZdWGlTgmBGsXv53vYPY+oyRpFKfBhBX9Ls="; + hash = "sha256-GHOuiYbww/DSK/DpSqAaB/jgppKacjGSYIOPqGnmIJM="; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "sha256-WRgPzLGywfQI6uFRBNhPZ2G1nhhiWa8WbaCYp2XRALk="; + hash = "sha256-ES4r9Pk7DYeFTPg8iPXQP84SpGn6x8G10Pfs1WQVixM="; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "sha256-yBnnR0mTexkyWnJnSf2zC6w+DsdBTHU8frOTmPfEedA="; + hash = "sha256-o0JnybhmMFZhcbTrWRllJ+J9+tcUbFLcbftymgECT9E="; }; } |