JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #96163: softmaker-office, freeoffice: overridable versions

Browse Source
This commit is contained in:
Vladimír Čunát 2020-08-25 08:10:15 +02:00
commit 73c04875a6
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/office/softmaker/freeoffice.nix
View File

@ -1,14 +1,26 @@
{ callPackage, fetchurl, ... } @ args:
{ callPackage
, fetchurl
callPackage ./generic.nix (args // rec {
pname = "freeoffice";
# This is a bit unusual, but makes version and hash easily
# overridable. This is useful when the upstream archive was replaced
# and nixpkgs is not in sync yet.
, officeVersion ? {
version = "976";
edition = "2018";
sha256 = "13yh4lyqakbdqf4r8vw8imy5gwpfva697iqfd85qmp3wimqvzskl";
}
, ... } @ args:
callPackage ./generic.nix (args // rec {
inherit (officeVersion) version edition;
pname = "freeoffice";
suiteName = "FreeOffice";
src = fetchurl {
inherit (officeVersion) sha256;
url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz";
sha256 = "13yh4lyqakbdqf4r8vw8imy5gwpfva697iqfd85qmp3wimqvzskl";
};
archive = "freeoffice${edition}.tar.lzma";

21
pkgs/applications/office/softmaker/softmaker_office.nix
View File

@ -1,14 +1,27 @@
{ callPackage, fetchurl, ... } @ args:
{ callPackage
, fetchurl
callPackage ./generic.nix (args // rec {
pname = "softmaker-office";
# This is a bit unusual, but makes version and hash easily
# overridable. This is useful when people have an older version of
# Softmaker Office or when the upstream archive was replaced and
# nixpkgs is not in sync yet.
, officeVersion ? {
version = "1018";
edition = "2021";
sha256 = "1g9mcn0z7s3xw7d5bcjxbnamh6knzndcysahydskfcds6czdxg0c";
}
, ... } @ args:
callPackage ./generic.nix (args // rec {
inherit (officeVersion) version edition;
pname = "softmaker-office";
suiteName = "SoftMaker Office";
src = fetchurl {
inherit (officeVersion) sha256;
url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz";
sha256 = "1g9mcn0z7s3xw7d5bcjxbnamh6knzndcysahydskfcds6czdxg0c";
};
archive = "office${edition}.tar.lzma";