JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #47530 from dtzWill/update/libreoffice-2018-09-29

Browse Source 
libreoffice-fresh: 6.1.1.2 -> 6.1.2.1
This commit is contained in:
Will Dietz 2018-09-30 00:17:53 -05:00 committed by GitHub
commit b66d6f404e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/office/libreoffice/default-primary-src.nix
View File

@ -3,8 +3,8 @@
rec {
major = "6";
minor = "1";
patch = "1";
tweak = "2";
patch = "2";
tweak = "1";
subdir = "${major}.${minor}.${patch}";
@ -12,6 +12,6 @@ rec {
src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "228166908a3404cbb8e6e662f44b1af8644c0589b2309fadce89dcef112fd09d";
sha256 = "650c57b60f880db28e49e584f42018da9e714865dfa94fbb8391de15b58a3f91";
};
}

4
pkgs/applications/office/libreoffice/default.nix
View File

@ -48,14 +48,14 @@ let
translations = fetchSrc {
name = "translations";
sha256 = "2933d0898fbc8ea32cb39b773cf49c5f7da165f75a33522ff91c88d7bd0c7440";
sha256 = "33e13d07e9328cdbccbd019ab2491f74f5bb897707886c074791080881544bcc";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
sha256 = "41e1af094f2ca5a9ab88894c2dceca2d91e6c28568d7f002f56c647e973cc595";
sha256 = "dffee97ffce5b4979140aa56fa333608e7b004bfc2451245bab33ed97fc4c205";
};
};

8
pkgs/applications/office/libreoffice/libreoffice-srcs.nix
View File

@ -658,11 +658,11 @@
md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";
}
{
name = "openssl-1.0.2o.tar.gz";
url = "http://dev-www.libreoffice.org/src/openssl-1.0.2o.tar.gz";
sha256 = "ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d";
name = "openssl-1.0.2p.tar.gz";
url = "http://dev-www.libreoffice.org/src/openssl-1.0.2p.tar.gz";
sha256 = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00";
md5 = "";
md5name = "ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d-openssl-1.0.2o.tar.gz";
md5name = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00-openssl-1.0.2p.tar.gz";
}
{
name = "liborcus-0.13.4.tar.gz";