git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #113705 from danieldk/softmaker-office-2030

softmaker-office: 1020 -> 1030

commit45206c76b196a78ced2b9af67600012990d06b44 authorDaniël de Kok <me@danieldk.eu> dateMon 22 Feb 2021, 09:01 (6 years ago) parent9ab61d96aa0795
3 files changed+7−7
pkgs/applications/office/softmaker/freeoffice.nix+3−3 pkgs/applications/office/softmaker/generic.nix+1−1 pkgs/applications/office/softmaker/softmaker_office.nix+3−3
pkgs/applications/office/softmaker/freeoffice.nix+3−3
@@ -5,9 +5,9 @@
55 # overridable. This is useful when the upstream archive was replaced
66 # and nixpkgs is not in sync yet.
77, officeVersion ? {
8− version = "980";
8+ version = "982";
99 edition = "2018";
10− sha256 = "19pgil86aagiz6z4kx22gd4cxbbmrx42ix42arkfb6p6hav1plby";
10+ hash = "sha256-euoZfAaDDTXzoaNLc/YdTngreTiYOBi7sGU161GP83w=";
1111}
1212
1313, ... } @ args:
@@ -19,7 +19,7 @@ callPackage ./generic.nix (args // rec {
1919 suiteName = "FreeOffice";
2020
2121 src = fetchurl {
22− inherit (officeVersion) sha256;
22+ inherit (officeVersion) hash;
2323 url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz";
2424 };
2525
pkgs/applications/office/softmaker/generic.nix+1−1
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, autoPatchelfHook, makeDesktopItem, makeWrapper, copyDesktopItems
1+{ lib, stdenv, autoPatchelfHook, makeDesktopItem, makeWrapper, copyDesktopItems
22
33 # Dynamic Libraries
44, curl, libGL, libX11, libXext, libXmu, libXrandr, libXrender
pkgs/applications/office/softmaker/softmaker_office.nix+3−3
@@ -6,9 +6,9 @@
66 # Softmaker Office or when the upstream archive was replaced and
77 # nixpkgs is not in sync yet.
88, officeVersion ? {
9− version = "1020";
9+ version = "1030";
1010 edition = "2021";
11− sha256 = "1v227pih1p33x7axsw7wz8pz5walpbqnk0iqng711ixk883nqxn5";
11+ hash = "sha256-bpnyPyZnJc9RFVrFM2o3M7Gc4PSKFGpaM1Yo8ZKGHrE=";
1212}
1313
1414, ... } @ args:
@@ -20,7 +20,7 @@ callPackage ./generic.nix (args // rec {
2020 suiteName = "SoftMaker Office";
2121
2222 src = fetchurl {
23− inherit (officeVersion) sha256;
23+ inherit (officeVersion) hash;
2424 url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz";
2525 };
2626