summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTredwellGit <tredwell@tutanota.com>2021-12-11 19:14:35 +0000
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2021-12-12 05:59:34 +0000
commitd67a4bad86d643ab82ae10b4c08d125c78be80e1 (patch)
tree169786798338f3745419e5c819bfdf7fe3793e11
parentMerge pull request #150348 from NixOS/backport-150145-to-release-21.11 (diff)
downloadnixpkgs-d67a4bad86d643ab82ae10b4c08d125c78be80e1.tar.gz
libreoffice-fresh: 7.2.3.2 -> 7.2.4.1origin/backport-150291-to-release-21.11
(cherry picked from commit 9c36e9cb9a7aceaed14c1ccd4d2d009a267665a7)
-rw-r--r--pkgs/applications/office/libreoffice/src-fresh/download.nix8
-rw-r--r--pkgs/applications/office/libreoffice/src-fresh/primary.nix10
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix
index 9fdff0766b6e..ecce7cf18145 100644
--- a/pkgs/applications/office/libreoffice/src-fresh/download.nix
+++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix
@@ -637,11 +637,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.8.tar.xz";
diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix
index 684383980bc4..f1a1478a3cf9 100644
--- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix
+++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix
@@ -8,8 +8,8 @@ rec {
major = "7";
minor = "2";
- patch = "3";
- tweak = "2";
+ patch = "4";
+ 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 = "sha256-VslzdJVtmMjvzW1YdxwJUMimQe2E/WTbZjgohMTDtFE=";
+ sha256 = "sha256-Ymi5BmpgWGzwpfXtmWDN+Gpf9Yb+Zpm/TSltWA3gjyE=";
};
# FIXME rename
translations = fetchSrc {
name = "translations";
- sha256 = "sha256-B/UVlPyzL7M3PpQwS63huRtti1VR+OaI2nd+T1IESOw=";
+ sha256 = "sha256-8nzCt7/J7gqJPtHOrVu7UTonJw1pxu4fnLWJyWOUHa8=";
};
# 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 = "sha256-CH4URClK/lq0nqN6LHjAVcKjkADol5AX3WuyAl0srnk=";
+ sha256 = "sha256-rZb1ej3GbgXOHOZWVKKJVuir2urLmvGmrdpB1vpcaCk=";
};
}