Merge pull request #197106 from emmanuelrosa/freeoffice

This commit is contained in:
Sandro 2022-12-04 21:24:51 +01:00 committed by GitHub
commit 3fd221a486
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -5,9 +5,9 @@
# overridable. This is useful when the upstream archive was replaced # overridable. This is useful when the upstream archive was replaced
# and nixpkgs is not in sync yet. # and nixpkgs is not in sync yet.
, officeVersion ? { , officeVersion ? {
version = "982"; version = "1054";
edition = "2018"; edition = "2021";
hash = "sha256-euoZfAaDDTXzoaNLc/YdTngreTiYOBi7sGU161GP83w="; hash = "sha256-dqmJUm0Qi1/GzGrI4OCHo1LwQ5KxMwZZw5EsYTMF6XU=";
} }
, ... } @ args: , ... } @ args:
@ -20,7 +20,7 @@ callPackage ./generic.nix (args // rec {
src = fetchurl { src = fetchurl {
inherit (officeVersion) hash; inherit (officeVersion) hash;
url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz"; url = "https://www.softmaker.net/down/softmaker-freeoffice-${edition}-${version}-amd64.tgz";
}; };
archive = "freeoffice${edition}.tar.lzma"; archive = "freeoffice${edition}.tar.lzma";