Skip to content

Commit

Permalink
Merge pull request #150292 from TredwellGit/libreoffice-still
Browse files Browse the repository at this point in the history
libreoffice-still: 7.1.7.2 -> 7.1.8.1
  • Loading branch information
7c6f434c authored Dec 12, 2021
2 parents 16d4ebb + 9cd228f commit 2173817
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-still/download.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
10 changes: 5 additions & 5 deletions pkgs/applications/office/libreoffice/src-still/primary.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,29 @@ rec {

major = "7";
minor = "1";
patch = "7";
tweak = "2";
patch = "8";
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 = "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
# it and LibreOffice can use these by pointing DICPATH environment variable at the hunspell directory

help = fetchSrc {
name = "help";
sha256 = "jAFrO4RyONhPH3H5QW0SL8Id53bBvJ7AYxSNtLhG4rQ=";
sha256 = "sha256-tr2hmCeRRyft03Nfk8afSaurCV6DJSYuxKo4GPK/It4=";
};
}

0 comments on commit 2173817

Please sign in to comment.