cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #107300 from TredwellGit/libreoffice-fresh

Browse source 
libreoffice-fresh: 7.0.3.1 -> 7.0.4.2
This commit is contained in:
Michael Raskin 2020-12-21 13:26:06 +00:00 committed by GitHub
commit 2a058487cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/applications/office/libreoffice/src-fresh/download.nix
View file

@ -469,11 +469,11 @@
md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz";
} }
{ {
name = "language-subtag-registry-2020-04-01.tar.bz2"; name = "language-subtag-registry-2020-09-29.tar.bz2";
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-04-01.tar.bz2"; url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-09-29.tar.bz2";
sha256 = "fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da"; sha256 = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f";
md5 = ""; md5 = "";
md5name = "fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da-language-subtag-registry-2020-04-01.tar.bz2"; md5name = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f-language-subtag-registry-2020-09-29.tar.bz2";
} }
{ {
name = "JLanguageTool-1.7.0.tar.bz2"; name = "JLanguageTool-1.7.0.tar.bz2";
@ -700,11 +700,11 @@
md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
} }
{ {
name = "pdfium-4137.tar.bz2"; name = "pdfium-4306.tar.bz2";
url = "https://dev-www.libreoffice.org/src/pdfium-4137.tar.bz2"; url = "https://dev-www.libreoffice.org/src/pdfium-4306.tar.bz2";
sha256 = "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6"; sha256 = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8";
md5 = ""; md5 = "";
md5name = "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6-pdfium-4137.tar.bz2"; md5name = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8-pdfium-4306.tar.bz2";
} }
{ {
name = "pixman-0.34.0.tar.gz"; name = "pixman-0.34.0.tar.gz";

10
pkgs/applications/office/libreoffice/src-fresh/primary.nix
View file

@ -8,8 +8,8 @@ rec {
major = "7"; major = "7";
minor = "0"; minor = "0";
patch = "3"; patch = "4";
tweak = "1"; tweak = "2";
subdir = "${major}.${minor}.${patch}"; subdir = "${major}.${minor}.${patch}";
@ -17,13 +17,13 @@ rec {
src = fetchurl { src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "0b998k2dxbbj7hn3srn07fgsah236h14ncyyahamdff6h3hvqrk5"; sha256 = "1g9akxvm7fh6lnprnc3g184qdy8gbinhb4rb60gjpw82ip6d5acz";
}; };
# FIXME rename # FIXME rename
translations = fetchSrc { translations = fetchSrc {
name = "translations"; name = "translations";
sha256 = "0s3ic79q0c16hbd6r06mwkyqhw4fdfy9z3xbqvdxp7jl64cjlaj4"; sha256 = "1v3kpk56fm783d5wihx41jqidpclizkfxrg4n0pq95d79hdiljsl";
}; };
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
@ -31,6 +31,6 @@ rec {
help = fetchSrc { help = fetchSrc {
name = "help"; name = "help";
sha256 = "14wjkcdmcflfcc7264jx64s6clk5rdsprx7nkbv08z0bp6ff677b"; sha256 = "1np9f799ww12kggl5az6piv5fi9rf737il5a5r47r4wl2li56qqb";
}; };
} }