From dfd3754f612a2e563ada9eaa4554e451040939a1 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sun, 8 May 2022 10:47:47 +0200 Subject: [PATCH] libreoffice-still: 7.1.8.1 -> 7.2.6.2 fixes #171907 Signed-off-by: Florian Brandes --- .../office/libreoffice/src-still/download.nix | 231 +++++++++--------- .../office/libreoffice/src-still/override.nix | 8 +- .../office/libreoffice/src-still/primary.nix | 12 +- 3 files changed, 122 insertions(+), 129 deletions(-) diff --git a/pkgs/applications/office/libreoffice/src-still/download.nix b/pkgs/applications/office/libreoffice/src-still/download.nix index 57eebe6ec6d..dddb89671b0 100644 --- a/pkgs/applications/office/libreoffice/src-still/download.nix +++ b/pkgs/applications/office/libreoffice/src-still/download.nix @@ -6,13 +6,6 @@ md5 = ""; md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; } - { - name = "commons-logging-1.2-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; - sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81"; - md5 = ""; - md5name = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81-commons-logging-1.2-src.tar.gz"; - } { name = "apr-1.5.2.tar.gz"; url = "https://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz"; @@ -28,11 +21,11 @@ md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_71_0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/boost_1_71_0.tar.xz"; - sha256 = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543"; + name = "boost_1_75_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_75_0.tar.xz"; + sha256 = "cc378a036a1cfd3af289f3da24deeb8dba7a729f61ab104c7b018a622e22d21b"; md5 = ""; - md5name = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543-boost_1_71_0.tar.xz"; + md5name = "cc378a036a1cfd3af289f3da24deeb8dba7a729f61ab104c7b018a622e22d21b-boost_1_75_0.tar.xz"; } { name = "box2d-2.3.1.tar.gz"; @@ -42,11 +35,11 @@ md5name = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c-box2d-2.3.1.tar.gz"; } { - name = "breakpad.zip"; - url = "https://dev-www.libreoffice.org/src/breakpad.zip"; - sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9"; + name = "breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz"; + url = "https://dev-www.libreoffice.org/src/breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz"; + sha256 = "c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91"; md5 = ""; - md5name = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9-breakpad.zip"; + md5name = "c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91-breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz"; } { name = "bsh-2.0b6-src.zip"; @@ -56,11 +49,11 @@ md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; } { - name = "bzip2-1.0.6.tar.gz"; - url = "https://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; - sha256 = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"; - md5 = "00b516f4704d4a7cb50a1d97e6e8e15b"; - md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; + name = "bzip2-1.0.8.tar.gz"; + url = "https://dev-www.libreoffice.org/src/bzip2-1.0.8.tar.gz"; + sha256 = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269"; + md5 = ""; + md5name = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269-bzip2-1.0.8.tar.gz"; } { name = "cairo-1.16.0.tar.xz"; @@ -70,11 +63,11 @@ md5name = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331-cairo-1.16.0.tar.xz"; } { - name = "libcdr-0.1.6.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libcdr-0.1.6.tar.xz"; - sha256 = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861"; + name = "libcdr-0.1.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcdr-0.1.7.tar.xz"; + sha256 = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4"; md5 = ""; - md5name = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861-libcdr-0.1.6.tar.xz"; + md5name = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4-libcdr-0.1.7.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; @@ -119,11 +112,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.78.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-7.78.0.tar.xz"; - sha256 = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5"; + name = "curl-7.79.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-7.79.1.tar.xz"; + sha256 = "0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689"; md5 = ""; - md5name = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5-curl-7.78.0.tar.xz"; + md5name = "0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689-curl-7.79.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -154,25 +147,25 @@ md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; } { - name = "libetonyek-0.1.9.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz"; - sha256 = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a"; + name = "libetonyek-0.1.10.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.10.tar.xz"; + sha256 = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a"; md5 = ""; - md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; + md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz"; } { - name = "expat-2.4.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/expat-2.4.1.tar.bz2"; - sha256 = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40"; + name = "expat-2.4.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.4.6.tar.xz"; + sha256 = "de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b"; md5 = ""; - md5name = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40-expat-2.4.1.tar.bz2"; + md5name = "de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b-expat-2.4.6.tar.xz"; } { - name = "Firebird-3.0.0.32483-0.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2"; - sha256 = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860"; + name = "Firebird-3.0.7.33374-0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/Firebird-3.0.7.33374-0.tar.bz2"; + sha256 = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76"; md5 = ""; - md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2"; + md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2"; } { name = "fontconfig-2.13.91.tar.gz"; @@ -217,11 +210,11 @@ md5name = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3-liberation-narrow-fonts-ttf-1.07.6.tar.gz"; } { - name = "liberation-fonts-ttf-2.00.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz"; - sha256 = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45"; + 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"; md5 = ""; - md5name = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45-liberation-fonts-ttf-2.00.4.tar.gz"; + md5name = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef-liberation-fonts-ttf-2.1.4.tar.gz"; } { name = "LinLibertineG-20120116.zip"; @@ -266,11 +259,11 @@ md5name = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994-noto-fonts-20171024.tar.gz"; } { - name = "culmus-0.131.tar.gz"; - url = "https://dev-www.libreoffice.org/src/culmus-0.131.tar.gz"; - sha256 = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b"; + name = "culmus-0.133.tar.gz"; + url = "https://dev-www.libreoffice.org/src/culmus-0.133.tar.gz"; + sha256 = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05"; md5 = ""; - md5name = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b-culmus-0.131.tar.gz"; + md5name = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05-culmus-0.133.tar.gz"; } { name = "libre-hebrew-1.0.tar.gz"; @@ -378,18 +371,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-68_1-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-68_1-src.tgz"; - sha256 = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d"; + name = "icu4c-69_1-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-69_1-src.tgz"; + sha256 = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745"; md5 = ""; - md5name = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d-icu4c-68_1-src.tgz"; + md5name = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745-icu4c-69_1-src.tgz"; } { - name = "icu4c-68_1-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-68_1-data.zip"; - sha256 = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510"; + name = "icu4c-69_1-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-69_1-data.zip"; + sha256 = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf"; md5 = ""; - md5name = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510-icu4c-68_1-data.zip"; + md5name = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf-icu4c-69_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -476,11 +469,11 @@ md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2021-03-05.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-03-05.tar.bz2"; - sha256 = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a"; + 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"; md5 = ""; - md5name = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a-language-subtag-registry-2021-03-05.tar.bz2"; + md5name = "d9dcf20be5ad4856daef023087421bedc1477f9b4247fc8ea53bb32e07c97837-language-subtag-registry-2021-12-29.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -560,25 +553,25 @@ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.30.tar.gz"; - url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.30.tar.gz"; - sha256 = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8"; + name = "xmlsec1-1.2.32.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.32.tar.gz"; + sha256 = "e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043"; md5 = ""; - md5name = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8-xmlsec1-1.2.30.tar.gz"; + md5name = "e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043-xmlsec1-1.2.32.tar.gz"; } { - name = "libxml2-2.9.12.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.9.12.tar.gz"; - sha256 = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92"; + name = "libxml2-2.9.13.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.9.13.tar.xz"; + sha256 = "276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e"; md5 = ""; - md5name = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92-libxml2-2.9.12.tar.gz"; + md5name = "276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e-libxml2-2.9.13.tar.xz"; } { - name = "libxslt-1.1.34.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; - sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"; + name = "libxslt-1.1.35.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.35.tar.xz"; + sha256 = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79"; md5 = ""; - md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz"; + md5name = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79-libxslt-1.1.35.tar.xz"; } { name = "lp_solve_5.5.tar.gz"; @@ -623,11 +616,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.17.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.17.tar.xz"; - sha256 = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c"; + name = "libmwaw-0.3.19.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.19.tar.xz"; + sha256 = "b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af"; md5 = ""; - md5name = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c-libmwaw-0.3.17.tar.xz"; + md5name = "b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af-libmwaw-0.3.19.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; @@ -651,11 +644,11 @@ md5name = "07a9e5b70f121a62706140d4cacc3006d3efb869da40f3a2bf7a65d37847f4d9-nss-3.73-with-nspr-4.32.tar.gz"; } { - name = "libodfgen-0.1.6.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; - sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2"; + name = "libodfgen-0.1.8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libodfgen-0.1.8.tar.xz"; + sha256 = "55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625"; md5 = ""; - md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; + md5name = "55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625-libodfgen-0.1.8.tar.xz"; } { name = "odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; @@ -672,11 +665,11 @@ md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; } { - name = "openldap-2.4.45.tgz"; - url = "https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"; - sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824"; + name = "openldap-2.4.59.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.4.59.tgz"; + sha256 = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34"; md5 = ""; - md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; + md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz"; } { name = "openssl-1.1.1l.tar.gz"; @@ -692,13 +685,6 @@ md5 = ""; md5name = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4-liborcus-0.16.1.tar.bz2"; } - { - name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; - url = "https://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; - sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb"; - md5 = ""; - md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; - } { name = "libpagemaker-0.0.4.tar.xz"; url = "https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"; @@ -707,11 +693,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-4306.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-4306.tar.bz2"; - sha256 = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8"; + name = "pdfium-4500.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-4500.tar.bz2"; + sha256 = "26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304"; md5 = ""; - md5name = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8-pdfium-4306.tar.bz2"; + md5name = "26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304-pdfium-4500.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -728,32 +714,32 @@ md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { - name = "poppler-21.01.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-21.01.0.tar.xz"; - sha256 = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3"; + name = "poppler-21.11.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-21.11.0.tar.xz"; + sha256 = "31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584"; md5 = ""; - md5name = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3-poppler-21.01.0.tar.xz"; + md5name = "31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584-poppler-21.11.0.tar.xz"; } { - name = "postgresql-13.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-13.1.tar.bz2"; - sha256 = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f"; + name = "poppler-data-0.4.10.tar.gz"; + url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.10.tar.gz"; + sha256 = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30"; md5 = ""; - md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2"; + md5name = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30-poppler-data-0.4.10.tar.gz"; } { - name = "Python-3.8.8rc1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.8.8rc1.tar.xz"; - sha256 = "bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6"; + name = "postgresql-13.5.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-13.5.tar.bz2"; + sha256 = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3"; md5 = ""; - md5name = "bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6-Python-3.8.8rc1.tar.xz"; + md5name = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3-postgresql-13.5.tar.bz2"; } { - name = "QR-Code-generator-1.4.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"; - sha256 = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a"; + name = "Python-3.8.10.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.8.10.tar.xz"; + sha256 = "6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9"; md5 = ""; - md5name = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a-QR-Code-generator-1.4.0.tar.gz"; + md5name = "6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9-Python-3.8.10.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -798,18 +784,18 @@ md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; } { - name = "serf-1.2.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; - sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700"; + name = "serf-1.3.9.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/serf-1.3.9.tar.bz2"; + sha256 = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc"; md5 = ""; - md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; + md5name = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc-serf-1.3.9.tar.bz2"; } { - name = "skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; - sha256 = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301"; + name = "skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"; + sha256 = "abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d"; md5 = ""; - md5name = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301-skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; + md5name = "abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d-skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; @@ -888,4 +874,11 @@ md5 = ""; md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; } + { + name = "zxing-cpp-1.1.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/zxing-cpp-1.1.1.tar.gz"; + sha256 = "e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86"; + md5 = ""; + md5name = "e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86-zxing-cpp-1.1.1.tar.gz"; + } ] diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix index 186f4b17d6a..7f508d1fbcf 100644 --- a/pkgs/applications/office/libreoffice/src-still/override.nix +++ b/pkgs/applications/office/libreoffice/src-still/override.nix @@ -4,10 +4,10 @@ attrs: postConfigure = attrs.postConfigure + '' sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' ''; - configureFlags = attrs.configureFlags ++ [ + configureFlags = attrs.configureFlags ++ [ (lib.enableFeature kdeIntegration "kf5") - "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar" - "--without-system-qrcodegen" + "--without-system-zxing" ]; - patches = attrs.patches or [] ++ [ ../xdg-open-brief.patch ]; # drop this when switching to 7.2 + + patches = attrs.patches or []; } diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix index 83179f2a136..52226fdc2d9 100644 --- a/pkgs/applications/office/libreoffice/src-still/primary.nix +++ b/pkgs/applications/office/libreoffice/src-still/primary.nix @@ -7,9 +7,9 @@ rec { }; major = "7"; - minor = "1"; - patch = "8"; - tweak = "1"; + minor = "2"; + 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"; - sha256 = "sha256-TGcR2/TSQJOjq7G1vXSa4MaEA6fG95rHVZfnjoiqeJM="; + sha256 = "sha256-SDdlqYuS2Q6MjHNeCNM8KjS1/h+8jn9rH5x0rRoUHjE="; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "sha256-jy5dUzKCEBYiTXh6dBwgdfW1Ok5l1iDGyL13icQHWEM="; + sha256 = "sha256-fUZflmrCi4mOa6iZTm+K9IvRTlSjcI4UJ4EoyK/HHck="; }; # 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-tr2hmCeRRyft03Nfk8afSaurCV6DJSYuxKo4GPK/It4="; + sha256 = "sha256-TjAgz7yV7y5VNrEuT2eElkNGZzh6J58T1TC3u2Ap2o4="; }; }