Skip to content

Commit

Permalink
Merge pull request #150291 from TredwellGit/libreoffice-fresh
Browse files Browse the repository at this point in the history
libreoffice-fresh: 7.2.3.2 -> 7.2.4.1
  • Loading branch information
7c6f434c authored Dec 12, 2021
2 parents ebb5bd2 + 9c36e9c commit 16d4ebb
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions pkgs/applications/office/libreoffice/src-fresh/download.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
10 changes: 5 additions & 5 deletions pkgs/applications/office/libreoffice/src-fresh/primary.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,29 @@ rec {

major = "7";
minor = "2";
patch = "3";
tweak = "2";
patch = "4";
tweak = "1";

subdir = "${major}.${minor}.${patch}";

version = "${subdir}${if tweak == "" then "" else "."}${tweak}";

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
# it and LibreOffice can use these by pointing DICPATH environment variable at the hunspell directory

help = fetchSrc {
name = "help";
sha256 = "sha256-CH4URClK/lq0nqN6LHjAVcKjkADol5AX3WuyAl0srnk=";
sha256 = "sha256-rZb1ej3GbgXOHOZWVKKJVuir2urLmvGmrdpB1vpcaCk=";
};
}

0 comments on commit 16d4ebb

Please sign in to comment.