summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTredwellGit <tredwell@tutanota.com>2021-12-11 19:13:27 +0000
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2021-12-12 05:58:50 +0000
commit25783a67f2e012e1236148a251a6d87136960f28 (patch)
treebfc10799a8c6bfab0671e3ba2d6d785d1eb8897d
parentMerge pull request #150348 from NixOS/backport-150145-to-release-21.11 (diff)
downloadnixpkgs-origin/backport-150292-to-release-21.11.tar.gz
libreoffice-still: 7.1.7.2 -> 7.1.8.1origin/backport-150292-to-release-21.11
(cherry picked from commit 9cd228f3e3d5d5db25ec65cf53b71339d594a34a)
-rw-r--r--pkgs/applications/office/libreoffice/src-still/download.nix8
-rw-r--r--pkgs/applications/office/libreoffice/src-still/primary.nix10
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/office/libreoffice/src-still/download.nix b/pkgs/applications/office/libreoffice/src-still/download.nix
index 990eeb329a3c..57eebe6ec6dd 100644
--- a/pkgs/applications/office/libreoffice/src-still/download.nix
+++ b/pkgs/applications/office/libreoffice/src-still/download.nix
@@ -644,11 +644,11 @@
md5name = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678-neon-0.31.2.tar.gz";
}
{
- name = "nss-3.55-with-nspr-4.27.tar.gz";
- url = "https://dev-www.libreoffice.org/src/nss-3.55-with-nspr-4.27.tar.gz";
- sha256 = "ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45";
+ name = "nss-3.73-with-nspr-4.32.tar.gz";
+ url = "https://dev-www.libreoffice.org/src/nss-3.73-with-nspr-4.32.tar.gz";
+ sha256 = "07a9e5b70f121a62706140d4cacc3006d3efb869da40f3a2bf7a65d37847f4d9";
md5 = "";
- md5name = "ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45-nss-3.55-with-nspr-4.27.tar.gz";
+ md5name = "07a9e5b70f121a62706140d4cacc3006d3efb869da40f3a2bf7a65d37847f4d9-nss-3.73-with-nspr-4.32.tar.gz";
}
{
name = "libodfgen-0.1.6.tar.bz2";
diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix
index 9ce1d26c1478..83179f2a136a 100644
--- a/pkgs/applications/office/libreoffice/src-still/primary.nix
+++ b/pkgs/applications/office/libreoffice/src-still/primary.nix
@@ -8,8 +8,8 @@ rec {
major = "7";
minor = "1";
- patch = "7";
- tweak = "2";
+ patch = "8";
+ tweak = "1";
subdir = "${major}.${minor}.${patch}";
@@ -17,13 +17,13 @@ rec {
src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
- sha256 = "T98ICdiAM4i9E6zis0V/Cmq5+e98mNb0bMZA//xelLo=";
+ sha256 = "sha256-TGcR2/TSQJOjq7G1vXSa4MaEA6fG95rHVZfnjoiqeJM=";
};
# FIXME rename
translations = fetchSrc {
name = "translations";
- sha256 = "g8skm02R5nRyF09ZbL9kJqMxRqaQ0AfpletDK3AAggk=";
+ sha256 = "sha256-jy5dUzKCEBYiTXh6dBwgdfW1Ok5l1iDGyL13icQHWEM=";
};
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
@@ -31,6 +31,6 @@ rec {
help = fetchSrc {
name = "help";
- sha256 = "jAFrO4RyONhPH3H5QW0SL8Id53bBvJ7AYxSNtLhG4rQ=";
+ sha256 = "sha256-tr2hmCeRRyft03Nfk8afSaurCV6DJSYuxKo4GPK/It4=";
};
}