From 6fd81681d058d09e2296c36e94cfe6f108fa52ed Mon Sep 17 00:00:00 2001 From: Daniël de Kok Date: Fri, 19 Feb 2021 17:55:11 +0100 Subject: softmaker-office: 1020 -> 1030 --- pkgs/applications/office/softmaker/softmaker_office.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/office/softmaker/softmaker_office.nix b/pkgs/applications/office/softmaker/softmaker_office.nix index d0eb2ffdc9352..9228037e8bf87 100644 --- a/pkgs/applications/office/softmaker/softmaker_office.nix +++ b/pkgs/applications/office/softmaker/softmaker_office.nix @@ -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"; }; -- cgit 1.4.1 From 392ec121d480dee4226efb33573b9c87b6fe07a6 Mon Sep 17 00:00:00 2001 From: Daniël de Kok Date: Fri, 19 Feb 2021 17:55:37 +0100 Subject: freeoffice: 980 -> 982 --- pkgs/applications/office/softmaker/freeoffice.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/office/softmaker/freeoffice.nix b/pkgs/applications/office/softmaker/freeoffice.nix index bdd90fecb8ee0..b1b24c3e6cb56 100644 --- a/pkgs/applications/office/softmaker/freeoffice.nix +++ b/pkgs/applications/office/softmaker/freeoffice.nix @@ -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"; }; -- cgit 1.4.1 From 6aa0795613709f9d18b0d76819e120cd8dc1101e Mon Sep 17 00:00:00 2001 From: Daniël de Kok Date: Sat, 20 Feb 2021 07:58:42 +0100 Subject: softmaker-office, freeoffice: remove unused fetchurl argument --- pkgs/applications/office/softmaker/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index a80eaa459c014..56a951919e360 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -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 -- cgit 1.4.1