21cc0bc · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge pull request #124121 from LeSuisse/libreoffice-still-7.0.6.2

libreoffice-still: 7.0.4.2 -> 7.0.6.2

commit21cc0bc652c926ee96899cd768ec47133a94c82f authorMaximilian Bosch <maximilian@mbosch.me> dateFri 28 May 2021, 21:22 (5 years ago) parentf451461 f7b33e0

2 files changed+16−16

compare with master

unifiedsplit

pkgs/applications/office/libreoffice/src-still/download.nix+12−12 pkgs/applications/office/libreoffice/src-still/primary.nix+4−4

pkgs/applications/office/libreoffice/src-still/download.nix+12−12

@@ -721,25 +721,25 @@

721721 md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz";

722722 }

723723 {

724− name = "poppler-0.82.0.tar.xz";

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

726− sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df";

724+ name = "poppler-21.01.0.tar.xz";

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

726+ sha256 = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3";

727727 md5 = "";

728− md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz";

728+ md5name = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3-poppler-21.01.0.tar.xz";

729729 }

730730 {

731− name = "postgresql-9.2.24.tar.bz2";

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

733− sha256 = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126";

731+ name = "postgresql-13.1.tar.bz2";

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

733+ sha256 = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f";

734734 md5 = "";

735− md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2";

735+ md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2";

736736 }

737737 {

738− name = "Python-3.7.7.tar.xz";

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

740− sha256 = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136";

738+ name = "Python-3.7.10.tar.xz";

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

740+ sha256 = "f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b";

741741 md5 = "";

742− md5name = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136-Python-3.7.7.tar.xz";

742+ md5name = "f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b-Python-3.7.10.tar.xz";

743743 }

744744 {

745745 name = "QR-Code-generator-1.4.0.tar.gz";

pkgs/applications/office/libreoffice/src-still/primary.nix+4−4

@@ -8,7 +8,7 @@ rec {

99 major = "7";

1010 minor = "0";

11− patch = "4";

11+ patch = "6";

1212 tweak = "2";

1313

1414 subdir = "${major}.${minor}.${patch}";

@@ -17,13 +17,13 @@ rec {

1717

1818 src = fetchurl {

1919 url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";

20− sha256 = "1g9akxvm7fh6lnprnc3g184qdy8gbinhb4rb60gjpw82ip6d5acz";

20+ sha256 = "0bk1dc6g8z5akrprfxxy3dm0vdmihaaxnsprxpqbqmqrqzkzg8cn";

2121 };

2222

2323 # FIXME rename

2424 translations = fetchSrc {

2525 name = "translations";

26− sha256 = "1v3kpk56fm783d5wihx41jqidpclizkfxrg4n0pq95d79hdiljsl";

26+ sha256 = "04f76r311hppil656ajab52x0xwqszazlgssyi5w97wak2zkmqgj";

2727 };

2828

2929 # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from

@@ -31,6 +31,6 @@ rec {

3131

3232 help = fetchSrc {

3333 name = "help";

34− sha256 = "1np9f799ww12kggl5az6piv5fi9rf737il5a5r47r4wl2li56qqb";

34+ sha256 = "1xmvlj9nrmg8448k4zfaxn5qqxa4amnvvhs1l1smi2bz3xh4xn2d";

3535 };

3636}