diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 43a1571b46eb..0e848e1c15b1 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -94,6 +94,7 @@ , ncurses , libepoxy , gpgme +, libwebp , abseil-cpp , langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "uk" "zh-CN" ] , withHelp ? true @@ -453,6 +454,8 @@ in # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" "--without-system-xmlsec" + "--without-system-cuckoo" + "--without-system-zxing" ] ++ optionals kdeIntegration [ "--enable-kf5" "--enable-qt5" @@ -573,7 +576,8 @@ in gst-plugins-ugly gstreamer ]) - ++ optionals kdeIntegration [ qtbase qtx11extras kcoreaddons kio ]; + ++ optionals kdeIntegration [ qtbase qtx11extras kcoreaddons kio ] + ++ optionals (lib.versionAtLeast (lib.versions.majorMinor version) "7.4") [ libwebp ]; passthru = { inherit srcs; diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index 5ed0517e944c..2834ca04c6f4 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/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"; @@ -76,6 +62,13 @@ md5 = "48d647fbd8ef8889e5a7f422c1bfda94"; md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; } + { + name = "dragonbox-1.1.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/dragonbox-1.1.0.tar.gz"; + sha256 = "293247ccba995ec47ae3abb52c3e83904a7d71efb7093d4c0d2c6367c1cc1e20"; + md5 = ""; + md5name = "293247ccba995ec47ae3abb52c3e83904a7d71efb7093d4c0d2c6367c1cc1e20-dragonbox-1.1.0.tar.gz"; + } { name = "dtoa-20180411.tgz"; url = "https://dev-www.libreoffice.org/src/dtoa-20180411.tgz"; @@ -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.79.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-7.79.1.tar.xz"; - sha256 = "0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689"; + name = "curl-7.83.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-7.83.1.tar.xz"; + sha256 = "2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4"; md5 = ""; - md5name = "0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689-curl-7.79.1.tar.xz"; + md5name = "2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4-curl-7.83.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -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.11.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/freetype-2.11.1.tar.xz"; + sha256 = "3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8"; md5 = ""; - md5name = "8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7-freetype-2.11.0.tar.xz"; + md5name = "3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8-freetype-2.11.1.tar.xz"; } { name = "glm-0.9.9.8.zip"; @@ -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,11 +448,11 @@ 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"; @@ -475,13 +461,6 @@ 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"; - } { name = "lcms2-2.12.tar.gz"; url = "https://dev-www.libreoffice.org/src/lcms2-2.12.tar.gz"; @@ -553,18 +532,25 @@ 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.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libwebp-1.2.2.tar.gz"; + sha256 = "7656532f837af5f4cec3ff6bafe552c044dc39bf453587bd5b77450802f4aee6"; md5 = ""; - md5name = "26041d35a20a245ed5a2fb9ee075f10825664d274220cb5190340fa87a4d0931-xmlsec1-1.2.33.tar.gz"; + md5name = "7656532f837af5f4cec3ff6bafe552c044dc39bf453587bd5b77450802f4aee6-libwebp-1.2.2.tar.gz"; } { - name = "libxml2-2.9.13.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.9.13.tar.xz"; - sha256 = "276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e"; + name = "xmlsec1-1.2.34.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.34.tar.gz"; + sha256 = "52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262"; md5 = ""; - md5name = "276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e-libxml2-2.9.13.tar.xz"; + md5name = "52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262-xmlsec1-1.2.34.tar.gz"; + } + { + name = "libxml2-2.9.14.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.9.14.tar.xz"; + sha256 = "60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee"; + md5 = ""; + md5name = "60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee-libxml2-2.9.14.tar.xz"; } { name = "libxslt-1.1.35.tar.xz"; @@ -595,11 +581,11 @@ md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz"; } { - name = "mdds-2.0.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/mdds-2.0.1.tar.bz2"; - sha256 = "3ab33fce58e6acf9540cc1a52264be6863ef80f55ac287194cc98cda48e71fe6"; + name = "mdds-2.0.3.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/mdds-2.0.3.tar.bz2"; + sha256 = "9771fe42e133443c13ca187253763e17c8bc96a1a02aec9e1e8893367ffa9ce5"; md5 = ""; - md5name = "3ab33fce58e6acf9540cc1a52264be6863ef80f55ac287194cc98cda48e71fe6-mdds-2.0.1.tar.bz2"; + md5name = "9771fe42e133443c13ca187253763e17c8bc96a1a02aec9e1e8893367ffa9ce5-mdds-2.0.3.tar.bz2"; } { name = "mDNSResponder-878.200.35.tar.gz"; @@ -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"; + name = "nss-3.79-with-nspr-4.34.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.79-with-nspr-4.34.tar.gz"; + sha256 = "5369ed274a19f480ec94e1faef04da63e3cbac1a82e15bb1751e58b2f274b835"; md5 = ""; - md5name = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678-neon-0.31.2.tar.gz"; - } - { - name = "nss-3.73-with-nspr-4.32.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.73-with-nspr-4.32.tar.gz"; - sha256 = "07a9e5b70f121a62706140d4cacc3006d3efb869da40f3a2bf7a65d37847f4d9"; - md5 = ""; - md5name = "07a9e5b70f121a62706140d4cacc3006d3efb869da40f3a2bf7a65d37847f4d9-nss-3.73-with-nspr-4.32.tar.gz"; + md5name = "5369ed274a19f480ec94e1faef04da63e3cbac1a82e15bb1751e58b2f274b835-nss-3.79-with-nspr-4.34.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; @@ -672,11 +651,11 @@ md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz"; } { - name = "openssl-1.1.1l.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-1.1.1l.tar.gz"; - sha256 = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1"; + name = "openssl-1.1.1m.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-1.1.1m.tar.gz"; + sha256 = "f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96"; md5 = ""; - md5name = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1-openssl-1.1.1l.tar.gz"; + md5name = "f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96-openssl-1.1.1m.tar.gz"; } { name = "liborcus-0.17.2.tar.bz2"; @@ -693,11 +672,11 @@ 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"; @@ -714,18 +693,25 @@ md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { - name = "poppler-21.11.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-21.11.0.tar.xz"; - sha256 = "31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584"; + name = "tiff-4.4.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/tiff-4.4.0.tar.xz"; + sha256 = "49307b510048ccc7bc40f2cba6e8439182fe6e654057c1a1683139bf2ecb1dc1"; md5 = ""; - md5name = "31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584-poppler-21.11.0.tar.xz"; + md5name = "49307b510048ccc7bc40f2cba6e8439182fe6e654057c1a1683139bf2ecb1dc1-tiff-4.4.0.tar.xz"; } { - name = "poppler-data-0.4.10.tar.gz"; - url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.10.tar.gz"; - sha256 = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30"; + name = "poppler-22.01.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-22.01.0.tar.xz"; + sha256 = "7d3493056b5b86413e5c693c2cae02c5c06cd8e618d14c2c31e2c84b67b2313e"; md5 = ""; - md5name = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30-poppler-data-0.4.10.tar.gz"; + md5name = "7d3493056b5b86413e5c693c2cae02c5c06cd8e618d14c2c31e2c84b67b2313e-poppler-22.01.0.tar.xz"; + } + { + name = "poppler-data-0.4.11.tar.gz"; + url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.11.tar.gz"; + sha256 = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c"; + md5 = ""; + md5name = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c-poppler-data-0.4.11.tar.gz"; } { name = "postgresql-13.5.tar.bz2"; @@ -735,11 +721,11 @@ md5name = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3-postgresql-13.5.tar.bz2"; } { - name = "Python-3.8.10.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.8.10.tar.xz"; - sha256 = "6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9"; + name = "Python-3.8.12.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.8.12.tar.xz"; + sha256 = "b1d3a76420375343b5e8a22fceb1ac65b77193e9ed27146524f0a9db058728ea"; md5 = ""; - md5name = "6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9-Python-3.8.10.tar.xz"; + md5name = "b1d3a76420375343b5e8a22fceb1ac65b77193e9ed27146524f0a9db058728ea-Python-3.8.12.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"; + name = "skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"; + sha256 = "c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9"; 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"; - 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-fresh/override.nix b/pkgs/applications/office/libreoffice/src-fresh/override.nix index ace442176dd9..148c674f5071 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/override.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/override.nix @@ -16,8 +16,7 @@ attrs: sed -e '/CPPUNIT_ASSERT_EQUAL(22, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' ''; configureFlags = attrs.configureFlags ++ [ - (lib.enableFeature kdeIntegration "kf5") - "--without-system-zxing" - "--without-system-cuckoo" + "--without-system-dragonbox" + "--without-system-libfixmath" ]; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index 50b28e6cf6b5..7771b3eb5130 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -7,9 +7,9 @@ rec { }; major = "7"; - minor = "3"; - patch = "3"; - tweak = "2"; + minor = "4"; + patch = "0"; + tweak = "3"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "sha256-7hK9vhYhwg4nRLxbbFlngQ8lpXYLmKxYEtVQqwCWhoU="; + hash = "sha256-rMODpDhuHOt0JmovZAbe5LOnhXa9prxxYw9inqIOPBk="; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "sha256-uRsKSC+kLVnhYF85o5FxZuf/dr+o6bYtbu8KmwSzNRw="; + sha256 = "sha256-5vxLi0rfbDsj9VXwokXvU1rRdxo4ZIDsFMq3HnAXnYw="; }; # 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-aIY07MuALBVklhJLOUwOxeIQWam2zQCVkw+edvnu/ps="; + sha256 = "sha256-qhkilAsXQqgz8078LMImfdWSNjUwdk3P01IRLJsylUc="; }; }