about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2024-02-11 19:08:20 +0100
committerGitHub <noreply@github.com>2024-02-11 19:08:20 +0100
commitd8eab17aa9cd4e797b221b0828c527f4b150aa1b (patch)
tree727c8b065dd4e99c679d72d6bd60457f46fbdeff /pkgs
parent4a97fef877703d95422065c46a6c1771e23e8e81 (diff)
parent9d551ab298957b0ff3ca2786846d1f5d806a46d3 (diff)
downloadnixlib-d8eab17aa9cd4e797b221b0828c527f4b150aa1b.tar
nixlib-d8eab17aa9cd4e797b221b0828c527f4b150aa1b.tar.gz
nixlib-d8eab17aa9cd4e797b221b0828c527f4b150aa1b.tar.bz2
nixlib-d8eab17aa9cd4e797b221b0828c527f4b150aa1b.tar.lz
nixlib-d8eab17aa9cd4e797b221b0828c527f4b150aa1b.tar.xz
nixlib-d8eab17aa9cd4e797b221b0828c527f4b150aa1b.tar.zst
nixlib-d8eab17aa9cd4e797b221b0828c527f4b150aa1b.zip
Merge pull request #285888 from fin444/onlyoffice-8.0.0
onlyoffice-bin_latest: 7.5.1 -> 8.0.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/by-name/on/onlyoffice-bin/package.nix (renamed from pkgs/applications/office/onlyoffice-bin/7_2.nix)0
-rw-r--r--pkgs/by-name/on/onlyoffice-bin/update.sh (renamed from pkgs/applications/office/onlyoffice-bin/update.sh)0
-rw-r--r--pkgs/by-name/on/onlyoffice-bin_latest/package.nix (renamed from pkgs/applications/office/onlyoffice-bin/7_5.nix)8
-rw-r--r--pkgs/by-name/on/onlyoffice-bin_latest/update.sh5
-rw-r--r--pkgs/top-level/aliases.nix2
-rw-r--r--pkgs/top-level/all-packages.nix5
6 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/applications/office/onlyoffice-bin/7_2.nix b/pkgs/by-name/on/onlyoffice-bin/package.nix
index 8abf0909e6b3..8abf0909e6b3 100644
--- a/pkgs/applications/office/onlyoffice-bin/7_2.nix
+++ b/pkgs/by-name/on/onlyoffice-bin/package.nix
diff --git a/pkgs/applications/office/onlyoffice-bin/update.sh b/pkgs/by-name/on/onlyoffice-bin/update.sh
index d7b0bc106fa2..d7b0bc106fa2 100644
--- a/pkgs/applications/office/onlyoffice-bin/update.sh
+++ b/pkgs/by-name/on/onlyoffice-bin/update.sh
diff --git a/pkgs/applications/office/onlyoffice-bin/7_5.nix b/pkgs/by-name/on/onlyoffice-bin_latest/package.nix
index 33744bb3831e..b73d179e341d 100644
--- a/pkgs/applications/office/onlyoffice-bin/7_5.nix
+++ b/pkgs/by-name/on/onlyoffice-bin_latest/package.nix
@@ -65,11 +65,11 @@ let
 
   derivation = stdenv.mkDerivation rec {
     pname = "onlyoffice-desktopeditors";
-    version = "7.5.1";
+    version = "8.0.0";
     minor = null;
     src = fetchurl {
       url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb";
-      sha256 = "sha256-Hf5CNbUUMuHZHDY3fgD4qpF4UASevscK8DTZlauyHhY=";
+      sha256 = "sha256-YtR2fiARMKw8dOgAPXYM+WFwmhKZRsIIBQYTxppu3F0=";
     };
 
     nativeBuildInputs = [
@@ -156,8 +156,6 @@ let
         # the bundled version of qt does not support wayland
       )
     '';
-
-    passthru.updateScript = ./update.sh;
   };
 
 in
@@ -185,6 +183,8 @@ buildFHSEnv {
         --replace "/usr/bin/onlyoffice-desktopeditors" "$out/bin/onlyoffice-desktopeditors"
   '';
 
+  passthru.updateScript = ./update.sh;
+
   meta = with lib; {
     description = "Office suite that combines text, spreadsheet and presentation editors allowing to create, view and edit local documents";
     longDescription = ''
diff --git a/pkgs/by-name/on/onlyoffice-bin_latest/update.sh b/pkgs/by-name/on/onlyoffice-bin_latest/update.sh
new file mode 100644
index 000000000000..d7b0bc106fa2
--- /dev/null
+++ b/pkgs/by-name/on/onlyoffice-bin_latest/update.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq common-updater-scripts
+
+version="$(curl -sL "https://api.github.com/repos/ONLYOFFICE/DesktopEditors/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')"
+update-source-version onlyoffice-bin "$version"
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6c434566ac5c..d94efa53ea09 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -795,6 +795,8 @@ 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_7_2 = throw "onlyoffice-bin_7_2 has been renamed to onlyoffice-bin"; # Added 2024-02-05
+  onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been renamed to onlyoffice-bin_latest (and updated from 7.5.x)"; # Added 2024-02-05
   oroborus = throw "oroborus was removed, because it was abandoned years ago."; #Added 2023-09-10
   osxfuse = macfuse-stubs; # Added 2021-03-20
   oxen = throw "'oxen' has been removed, because it was broken, outdated and unmaintained"; # Added 2023-12-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d28715df4d5..89547dd64ce3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33906,11 +33906,6 @@ with pkgs;
 
   okteto = callPackage ../development/tools/okteto { };
 
-  onlyoffice-bin_7_2 = callPackage ../applications/office/onlyoffice-bin/7_2.nix { };
-  onlyoffice-bin_7_5 = callPackage ../applications/office/onlyoffice-bin/7_5.nix { };
-  onlyoffice-bin = onlyoffice-bin_7_2;
-  onlyoffice-bin_latest = onlyoffice-bin_7_5;
-
   onmetal-image = callPackage ../tools/virtualization/onmetal-image { };
 
   opcr-policy = callPackage ../development/tools/opcr-policy { };