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

Merge pull request #50580 from alyssais/libreoffice

Browse Source 
libreoffice updates
This commit is contained in:
Michael Raskin 2018-11-18 15:20:23 +00:00 committed by GitHub
commit f52b7f5c34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 18 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 { rec {
major = "6"; major = "6";
minor = "1"; minor = "1";
patch = "2"; patch = "3";
tweak = "1"; tweak = "2";
subdir = "${major}.${minor}.${patch}"; subdir = "${major}.${minor}.${patch}";
@ -12,6 +12,6 @@ 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 = "650c57b60f880db28e49e584f42018da9e714865dfa94fbb8391de15b58a3f91"; sha256 = "0i4gf3qi16fg7dxq2l4vhkwh4f5lx7xd1ilpzcw26vccqkv3hvyl";
}; };
} }

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

@ -48,14 +48,14 @@ let
translations = fetchSrc { translations = fetchSrc {
name = "translations"; name = "translations";
sha256 = "33e13d07e9328cdbccbd019ab2491f74f5bb897707886c074791080881544bcc"; sha256 = "1cry3gkvk71jf71jk4pff320axfid2wqjdnhkj2z718g4pp54dwf";
}; };
# TODO: dictionaries # TODO: dictionaries
help = fetchSrc { help = fetchSrc {
name = "help"; name = "help";
sha256 = "dffee97ffce5b4979140aa56fa333608e7b004bfc2451245bab33ed97fc4c205"; sha256 = "0q26zb2lq2cnkq0cn9ds3qwa981ljz0lyw13pa6f62nvrnwwqgwa";
}; };
}; };

16
pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
View File

@ -105,11 +105,11 @@
md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
} }
{ {
name = "curl-7.60.0.tar.gz"; name = "curl-7.61.1.tar.gz";
url = "http://dev-www.libreoffice.org/src/curl-7.60.0.tar.gz"; url = "http://dev-www.libreoffice.org/src/curl-7.61.1.tar.gz";
sha256 = "e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5"; sha256 = "eaa812e9a871ea10dbe8e1d3f8f12a64a8e3e62aeab18cb23742e2f1727458ae";
md5 = ""; md5 = "";
md5name = "e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5-curl-7.60.0.tar.gz"; md5name = "eaa812e9a871ea10dbe8e1d3f8f12a64a8e3e62aeab18cb23742e2f1727458ae-curl-7.61.1.tar.gz";
} }
{ {
name = "libe-book-0.1.3.tar.xz"; name = "libe-book-0.1.3.tar.xz";
@ -609,11 +609,11 @@
md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz";
} }
{ {
name = "nss-3.33-with-nspr-4.17.tar.gz"; name = "nss-3.38-with-nspr-4.19.tar.gz";
url = "http://dev-www.libreoffice.org/src/nss-3.33-with-nspr-4.17.tar.gz"; url = "http://dev-www.libreoffice.org/src/nss-3.38-with-nspr-4.19.tar.gz";
sha256 = "878d505ec0be577c45990c57eb5d2e5c8696bfa3412bd0fae193b275297bf5c4"; sha256 = "f271ec73291fa3e4bd4b59109f8035cc3a192fc33886f40ed4f9ee4b31c746e9";
md5 = ""; md5 = "";
md5name = "878d505ec0be577c45990c57eb5d2e5c8696bfa3412bd0fae193b275297bf5c4-nss-3.33-with-nspr-4.17.tar.gz"; md5name = "f271ec73291fa3e4bd4b59109f8035cc3a192fc33886f40ed4f9ee4b31c746e9-nss-3.38-with-nspr-4.19.tar.gz";
} }
{ {
name = "libodfgen-0.1.6.tar.bz2"; name = "libodfgen-0.1.6.tar.bz2";

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

@ -3,8 +3,8 @@
rec { rec {
major = "6"; major = "6";
minor = "0"; minor = "0";
patch = "6"; patch = "7";
tweak = "2"; tweak = "3";
subdir = "${major}.${minor}.${patch}"; subdir = "${major}.${minor}.${patch}";
@ -12,6 +12,6 @@ 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 = "f1666430abf616a3813e4c886b51f157366f592102ae0e874abc17f3d58c6a8e"; sha256 = "0wjcnra06d9z51kjb5njlpy4d8zd8wqfvkif2kc6mzhrsz5kqqxr";
}; };
} }

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

@ -48,14 +48,14 @@ let
translations = fetchSrc { translations = fetchSrc {
name = "translations"; name = "translations";
sha256 = "0hi7m5y9gxwqn5i2nsyqyz1vdiz2bxn26sd3i0958ghhwv3zqmdb"; sha256 = "1rk8f77gwqyrnrxpfrvmr03n49bb09idxwzzindxxgcagh3d0p5f";
}; };
# TODO: dictionaries # TODO: dictionaries
help = fetchSrc { help = fetchSrc {
name = "help"; name = "help";
sha256 = "0pp8xs3mqna6fh1jd4h1xjyr4v0fsrik10rri5if5n3z1vfg0jby"; sha256 = "076xq1vlsyi2fv3r7rw595075pi08slbzwwc5h9gda3frx1jkj4i";
}; };
}; };