commit 96ab48859780be9a5ec780ca8fe050fb56d8cf7c

+2 -2

pkgs/applications/office/libreoffice/default-primary-src.nix

··· 3 3 rec { 4 4 major = "6"; 5 5 minor = "2"; 6 - patch = "1"; 6 + patch = "6"; 7 7 tweak = "2"; 8 8 9 9 subdir = "${major}.${minor}.${patch}"; ··· 12 12 13 13 src = fetchurl { 14 14 url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; 15 - sha256 = "0p2r48n27v5ifbj3cb9bs38nb6699awmdqx4shy1c6p28b24y78f"; 15 + sha256 = "1nzvdb6yq8bpybz7lrppr237cws6dajk3r9hc9qd0zi55kcddjpq"; 16 16 }; 17 17 }

+4 -2

pkgs/applications/office/libreoffice/default.nix

··· 48 48 49 49 translations = fetchSrc { 50 50 name = "translations"; 51 - sha256 = "180d4rrzb3lq7g2w7x512fn8chfkjg4ld20ikrj6hkg11kj4hbmy"; 51 + sha256 = "1l5v9bb7n9s6i24q4mdyqyp5v4f8iy0a9dmpgw649vngj1zxdxfh"; 52 52 }; 53 53 54 54 # TODO: dictionaries 55 55 56 56 help = fetchSrc { 57 57 name = "help"; 58 - sha256 = "06fgd5jkqqbvskyj1ywmsmb4crsj064s8r45nrv0r8j6ydn0hi1l"; 58 + sha256 = "0h4jvdbvxvgy7w2bzf4k4knqbshlr4v2ic2jsaygy52530z9xifz"; 59 59 }; 60 60 61 61 }; ··· 144 144 sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx 145 145 # tilde expansion in path processing checks the existence of $HOME 146 146 sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx 147 + # fails on systems using ZFS, see https://github.com/NixOS/nixpkgs/issues/19071 148 + sed -e '/CPPUNIT_TEST(getSystemPathFromFileURL_005);/d' -i './sal/qa/osl/file/osl_File.cxx' 147 149 # rendering-dependent: on my computer the test table actually doesn't fit… 148 150 # interesting fact: test disabled on macOS by upstream 149 151 sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx

+36 -36

pkgs/applications/office/libreoffice/libreoffice-srcs.nix

··· 56 56 md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; 57 57 } 58 58 { 59 - name = "cairo-1.15.12.tar.xz"; 60 - url = "http://dev-www.libreoffice.org/src/cairo-1.15.12.tar.xz"; 61 - sha256 = "7623081b94548a47ee6839a7312af34e9322997806948b6eec421a8c6d0594c9"; 59 + name = "cairo-1.16.0.tar.xz"; 60 + url = "http://dev-www.libreoffice.org/src/cairo-1.16.0.tar.xz"; 61 + sha256 = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"; 62 62 md5 = ""; 63 - md5name = "7623081b94548a47ee6839a7312af34e9322997806948b6eec421a8c6d0594c9-cairo-1.15.12.tar.xz"; 63 + md5name = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331-cairo-1.16.0.tar.xz"; 64 64 } 65 65 { 66 66 name = "libcdr-0.1.5.tar.xz"; ··· 105 105 md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; 106 106 } 107 107 { 108 - name = "curl-7.64.0.tar.gz"; 109 - url = "http://dev-www.libreoffice.org/src/curl-7.64.0.tar.gz"; 110 - sha256 = "cb90d2eb74d4e358c1ed1489f8e3af96b50ea4374ad71f143fa4595e998d81b5"; 108 + name = "curl-7.65.0.tar.xz"; 109 + url = "http://dev-www.libreoffice.org/src/curl-7.65.0.tar.xz"; 110 + sha256 = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd"; 111 111 md5 = ""; 112 - md5name = "cb90d2eb74d4e358c1ed1489f8e3af96b50ea4374ad71f143fa4595e998d81b5-curl-7.64.0.tar.gz"; 112 + md5name = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd-curl-7.65.0.tar.xz"; 113 113 } 114 114 { 115 115 name = "libe-book-0.1.3.tar.xz"; ··· 119 119 md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz"; 120 120 } 121 121 { 122 - name = "libepoxy-1.5.2.tar.xz"; 123 - url = "http://dev-www.libreoffice.org/src/libepoxy-1.5.2.tar.xz"; 124 - sha256 = "a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8"; 122 + name = "libepoxy-1.5.3.tar.xz"; 123 + url = "http://dev-www.libreoffice.org/src/libepoxy-1.5.3.tar.xz"; 124 + sha256 = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d"; 125 125 md5 = ""; 126 - md5name = "a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8-libepoxy-1.5.2.tar.xz"; 126 + md5name = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d-libepoxy-1.5.3.tar.xz"; 127 127 } 128 128 { 129 129 name = "epm-3.7.tar.gz"; ··· 462 462 md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; 463 463 } 464 464 { 465 - name = "language-subtag-registry-2018-04-23.tar.bz2"; 466 - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-04-23.tar.bz2"; 467 - sha256 = "14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878"; 465 + name = "language-subtag-registry-2019-04-03.tar.bz2"; 466 + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-04-03.tar.bz2"; 467 + sha256 = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d"; 468 468 md5 = ""; 469 - md5name = "14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878-language-subtag-registry-2018-04-23.tar.bz2"; 469 + md5name = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d-language-subtag-registry-2019-04-03.tar.bz2"; 470 470 } 471 471 { 472 472 name = "JLanguageTool-1.7.0.tar.bz2"; ··· 623 623 md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; 624 624 } 625 625 { 626 - name = "nss-3.38-with-nspr-4.19.tar.gz"; 627 - url = "http://dev-www.libreoffice.org/src/nss-3.38-with-nspr-4.19.tar.gz"; 628 - sha256 = "f271ec73291fa3e4bd4b59109f8035cc3a192fc33886f40ed4f9ee4b31c746e9"; 626 + name = "nss-3.45-with-nspr-4.21.tar.gz"; 627 + url = "http://dev-www.libreoffice.org/src/nss-3.45-with-nspr-4.21.tar.gz"; 628 + sha256 = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1"; 629 629 md5 = ""; 630 - md5name = "f271ec73291fa3e4bd4b59109f8035cc3a192fc33886f40ed4f9ee4b31c746e9-nss-3.38-with-nspr-4.19.tar.gz"; 630 + md5name = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1-nss-3.45-with-nspr-4.21.tar.gz"; 631 631 } 632 632 { 633 633 name = "libodfgen-0.1.6.tar.bz2"; ··· 658 658 md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; 659 659 } 660 660 { 661 - name = "openssl-1.0.2p.tar.gz"; 662 - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2p.tar.gz"; 663 - sha256 = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00"; 661 + name = "openssl-1.0.2r.tar.gz"; 662 + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2r.tar.gz"; 663 + sha256 = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6"; 664 664 md5 = ""; 665 - md5name = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00-openssl-1.0.2p.tar.gz"; 665 + md5name = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6-openssl-1.0.2r.tar.gz"; 666 666 } 667 667 { 668 668 name = "liborcus-0.14.1.tar.gz"; ··· 700 700 md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; 701 701 } 702 702 { 703 - name = "libpng-1.6.34.tar.xz"; 704 - url = "http://dev-www.libreoffice.org/src/libpng-1.6.34.tar.xz"; 705 - sha256 = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6"; 703 + name = "libpng-1.6.37.tar.xz"; 704 + url = "http://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz"; 705 + sha256 = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca"; 706 706 md5 = ""; 707 - md5name = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6-libpng-1.6.34.tar.xz"; 707 + md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; 708 708 } 709 709 { 710 - name = "poppler-0.73.0.tar.xz"; 711 - url = "http://dev-www.libreoffice.org/src/poppler-0.73.0.tar.xz"; 712 - sha256 = "e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112101f0238db03"; 710 + name = "poppler-0.74.0.tar.xz"; 711 + url = "http://dev-www.libreoffice.org/src/poppler-0.74.0.tar.xz"; 712 + sha256 = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f"; 713 713 md5 = ""; 714 - md5name = "e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112101f0238db03-poppler-0.73.0.tar.xz"; 714 + md5name = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f-poppler-0.74.0.tar.xz"; 715 715 } 716 716 { 717 717 name = "postgresql-9.2.24.tar.bz2"; ··· 721 721 md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; 722 722 } 723 723 { 724 - name = "Python-3.5.6.tar.xz"; 725 - url = "http://dev-www.libreoffice.org/src/Python-3.5.6.tar.xz"; 726 - sha256 = "f55cde04f521f273c7cba08912921cc5642cfc15ca7b22d5829f0aff4371155f"; 724 + name = "Python-3.5.7.tar.xz"; 725 + url = "http://dev-www.libreoffice.org/src/Python-3.5.7.tar.xz"; 726 + sha256 = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc"; 727 727 md5 = ""; 728 - md5name = "f55cde04f521f273c7cba08912921cc5642cfc15ca7b22d5829f0aff4371155f-Python-3.5.6.tar.xz"; 728 + md5name = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc-Python-3.5.7.tar.xz"; 729 729 } 730 730 { 731 731 name = "libqxp-0.0.2.tar.xz";