From 6684bba9c262f0d0b3cc039d3f17b4ade2c81475 Mon Sep 17 00:00:00 2001 From: fin444 Date: Mon, 28 Oct 2024 10:32:13 -0400 Subject: [PATCH 1/2] onlyoffice-desktopeditors: 8.1.1 -> 8.2.0 https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md#820 --- pkgs/by-name/on/onlyoffice-desktopeditors/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix index 0670385f2c42..b167606f1c6c 100644 --- a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix +++ b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix @@ -66,11 +66,11 @@ let derivation = stdenv.mkDerivation rec { pname = "onlyoffice-desktopeditors"; - version = "8.1.1"; + version = "8.2.0"; minor = null; src = fetchurl { url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; - hash = "sha256-RwWIYcbYljDqWRJcXCDODjVeYnp9xreNGO2l2aqWJ9w="; + hash = "sha256-sKjPxrPdnEX/EuZMQJP+PN/Mi1MRV3psK8Jje7V/ecI="; }; nativeBuildInputs = [ From e31f62694877434a58d79c95af82c2b4619a713b Mon Sep 17 00:00:00 2001 From: fin444 Date: Mon, 28 Oct 2024 10:33:09 -0400 Subject: [PATCH 2/2] onlyoffice-desktopeditors: cleanup substituteInPlace --replace is deprecated --- pkgs/by-name/on/onlyoffice-desktopeditors/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix index b167606f1c6c..d2e0f96b9db4 100644 --- a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix +++ b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix @@ -141,7 +141,7 @@ let done; substituteInPlace $out/bin/onlyoffice-desktopeditors \ - --replace "/opt/onlyoffice/" "$out/share/" + --replace-fail "/opt/onlyoffice/" "$out/share/" ln -s $out/share/desktopeditors/DesktopEditors $out/bin/DesktopEditors @@ -180,7 +180,7 @@ buildFHSEnv { ln -s ${derivation}/share/icons $out/share cp -r ${derivation}/share/applications $out/share substituteInPlace $out/share/applications/onlyoffice-desktopeditors.desktop \ - --replace "/usr/bin/onlyoffice-desktopeditors" "$out/bin/onlyoffice-desktopeditors" + --replace-fail "/usr/bin/onlyoffice-desktopeditors" "$out/bin/onlyoffice-desktopeditors" ''; passthru.updateScript = ./update.sh;