From 965a11b6e13d8610bc04b8e710bd5bb4d435467f Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Fri, 20 Sep 2024 08:50:57 +0000
Subject: [PATCH] onlyoffice-bin: 8.1.0 -> 8.1.1; rename to
 onlyoffice-desktopeditors

---
 .../package.nix                               | 87 ++++++++++---------
 .../update.sh                                 |  0
 pkgs/top-level/aliases.nix                    |  1 +
 3 files changed, 46 insertions(+), 42 deletions(-)
 rename pkgs/by-name/on/{onlyoffice-bin => onlyoffice-desktopeditors}/package.nix (86%)
 rename pkgs/by-name/on/{onlyoffice-bin => onlyoffice-desktopeditors}/update.sh (100%)

diff --git a/pkgs/by-name/on/onlyoffice-bin/package.nix b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix
similarity index 86%
rename from pkgs/by-name/on/onlyoffice-bin/package.nix
rename to pkgs/by-name/on/onlyoffice-desktopeditors/package.nix
index fdab6d29f6d2..0670385f2c42 100644
--- a/pkgs/by-name/on/onlyoffice-bin/package.nix
+++ b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix
@@ -1,39 +1,40 @@
-{ stdenv
-, lib
-, fetchurl
-, buildFHSEnv
+{
+  stdenv,
+  lib,
+  fetchurl,
+  buildFHSEnv,
   # Alphabetic ordering below
-, alsa-lib
-, at-spi2-atk
-, atk
-, autoPatchelfHook
-, cairo
-, curl
-, dbus
-, dconf
-, dpkg
-, fontconfig
-, gcc-unwrapped
-, gdk-pixbuf
-, glib
-, glibc
-, gsettings-desktop-schemas
-, gst_all_1
-, gtk2
-, gtk3
-, libpulseaudio
-, libudev0-shim
-, libdrm
-, makeWrapper
-, mesa
-, noto-fonts-cjk-sans
-, nspr
-, nss
-, pulseaudio
-, qt5
-, wrapGAppsHook3
-, xkeyboard_config
-, xorg
+  alsa-lib,
+  at-spi2-atk,
+  atk,
+  autoPatchelfHook,
+  cairo,
+  curl,
+  dbus,
+  dconf,
+  dpkg,
+  fontconfig,
+  gcc-unwrapped,
+  gdk-pixbuf,
+  glib,
+  glibc,
+  gsettings-desktop-schemas,
+  gst_all_1,
+  gtk2,
+  gtk3,
+  libpulseaudio,
+  libudev0-shim,
+  libdrm,
+  makeWrapper,
+  mesa,
+  noto-fonts-cjk-sans,
+  nspr,
+  nss,
+  pulseaudio,
+  qt5,
+  wrapGAppsHook3,
+  xkeyboard_config,
+  xorg,
 }:
 let
 
@@ -65,11 +66,11 @@ let
 
   derivation = stdenv.mkDerivation rec {
     pname = "onlyoffice-desktopeditors";
-    version = "8.1.0";
+    version = "8.1.1";
     minor = null;
     src = fetchurl {
       url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb";
-      hash = "sha256-hS1+gLN17sP3EFud3fQXRWeFiQbrumBONLjqXEl89Js=";
+      hash = "sha256-RwWIYcbYljDqWRJcXCDODjVeYnp9xreNGO2l2aqWJ9w=";
     };
 
     nativeBuildInputs = [
@@ -184,15 +185,17 @@ buildFHSEnv {
 
   passthru.updateScript = ./update.sh;
 
-  meta = with lib; {
+  meta = {
     description = "Office suite that combines text, spreadsheet and presentation editors allowing to create, view and edit local documents";
-    mainProgram = "onlyoffice-desktopeditors";
     homepage = "https://www.onlyoffice.com/";
     downloadPage = "https://github.com/ONLYOFFICE/DesktopEditors/releases";
     changelog = "https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md";
     platforms = [ "x86_64-linux" ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ nh2 gtrunsec ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [
+      nh2
+      gtrunsec
+    ];
   };
 }
diff --git a/pkgs/by-name/on/onlyoffice-bin/update.sh b/pkgs/by-name/on/onlyoffice-desktopeditors/update.sh
similarity index 100%
rename from pkgs/by-name/on/onlyoffice-bin/update.sh
rename to pkgs/by-name/on/onlyoffice-desktopeditors/update.sh
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f56074aae5a3..8a883f079d7a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1181,6 +1181,7 @@ mapAliases ({
   optparse-bash = throw "'optparse-bash' (GitHub: nk412/optparse) has been removed. Use 'argparse' instead"; # Added 2024-01-12
   orchis = orchis-theme; # Added 2021-06-09
   oni2 = throw "oni2 was removed, because it is unmaintained and was abandoned years ago."; #Added 2024-01-15
+  onlyoffice-bin = onlyoffice-desktopeditors; # Added 2024-09-20
   onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03
   onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03
   onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03