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

Merge pull request #113705 from danieldk/softmaker-office-2030

Browse Source 
softmaker-office: 1020 -> 1030
This commit is contained in:
Daniël de Kok 2021-02-22 09:01:12 +01:00 committed by GitHub
commit 45206c76b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
pkgs/applications/office/softmaker/generic.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, autoPatchelfHook, makeDesktopItem, makeWrapper, copyDesktopItems
{ lib, stdenv, autoPatchelfHook, makeDesktopItem, makeWrapper, copyDesktopItems
# Dynamic Libraries
, curl, libGL, libX11, libXext, libXmu, libXrandr, libXrender

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

@ -6,9 +6,9 @@
# Softmaker Office or when the upstream archive was replaced and
# nixpkgs is not in sync yet.
, officeVersion ? {
version = "1020";
version = "1030";
edition = "2021";
sha256 = "1v227pih1p33x7axsw7wz8pz5walpbqnk0iqng711ixk883nqxn5";
hash = "sha256-bpnyPyZnJc9RFVrFM2o3M7Gc4PSKFGpaM1Yo8ZKGHrE=";
}
, ... } @ args:
@ -20,7 +20,7 @@ callPackage ./generic.nix (args // rec {
suiteName = "SoftMaker Office";
src = fetchurl {
inherit (officeVersion) sha256;
inherit (officeVersion) hash;
url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz";
};