From 42a8cabeeb8a8270203a5d831c529f4258632dc5 Mon Sep 17 00:00:00 2001 From: fin444 Date: Fri, 2 Feb 2024 14:54:12 -0500 Subject: [PATCH 1/2] onlyoffice-bin_latest: 7.5.1 -> 8.0.0 --- pkgs/applications/office/onlyoffice-bin/{7_5.nix => 8_0.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/applications/office/onlyoffice-bin/{7_5.nix => 8_0.nix} (98%) diff --git a/pkgs/applications/office/onlyoffice-bin/7_5.nix b/pkgs/applications/office/onlyoffice-bin/8_0.nix similarity index 98% rename from pkgs/applications/office/onlyoffice-bin/7_5.nix rename to pkgs/applications/office/onlyoffice-bin/8_0.nix index 33744bb3831e..a0fc5b78aab9 100644 --- a/pkgs/applications/office/onlyoffice-bin/7_5.nix +++ b/pkgs/applications/office/onlyoffice-bin/8_0.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 = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6710e1f22c60..53ae4ccbd3f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33969,9 +33969,9 @@ 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_8_0 = callPackage ../applications/office/onlyoffice-bin/8_0.nix { }; onlyoffice-bin = onlyoffice-bin_7_2; - onlyoffice-bin_latest = onlyoffice-bin_7_5; + onlyoffice-bin_latest = onlyoffice-bin_8_0; onmetal-image = callPackage ../tools/virtualization/onmetal-image { }; From 9d551ab298957b0ff3ca2786846d1f5d806a46d3 Mon Sep 17 00:00:00 2001 From: fin444 Date: Fri, 2 Feb 2024 15:25:50 -0500 Subject: [PATCH 2/2] onlyoffice-bin, onlyoffice-bin_latest: move to pkgs/by-name --- .../7_2.nix => by-name/on/onlyoffice-bin/package.nix} | 0 .../office => by-name/on}/onlyoffice-bin/update.sh | 0 .../8_0.nix => by-name/on/onlyoffice-bin_latest/package.nix} | 4 ++-- pkgs/by-name/on/onlyoffice-bin_latest/update.sh | 5 +++++ pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 5 ----- 6 files changed, 9 insertions(+), 7 deletions(-) rename pkgs/{applications/office/onlyoffice-bin/7_2.nix => by-name/on/onlyoffice-bin/package.nix} (100%) rename pkgs/{applications/office => by-name/on}/onlyoffice-bin/update.sh (100%) rename pkgs/{applications/office/onlyoffice-bin/8_0.nix => by-name/on/onlyoffice-bin_latest/package.nix} (99%) create mode 100644 pkgs/by-name/on/onlyoffice-bin_latest/update.sh diff --git a/pkgs/applications/office/onlyoffice-bin/7_2.nix b/pkgs/by-name/on/onlyoffice-bin/package.nix similarity index 100% rename from pkgs/applications/office/onlyoffice-bin/7_2.nix rename to 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 similarity index 100% rename from pkgs/applications/office/onlyoffice-bin/update.sh rename to pkgs/by-name/on/onlyoffice-bin/update.sh diff --git a/pkgs/applications/office/onlyoffice-bin/8_0.nix b/pkgs/by-name/on/onlyoffice-bin_latest/package.nix similarity index 99% rename from pkgs/applications/office/onlyoffice-bin/8_0.nix rename to pkgs/by-name/on/onlyoffice-bin_latest/package.nix index a0fc5b78aab9..b73d179e341d 100644 --- a/pkgs/applications/office/onlyoffice-bin/8_0.nix +++ b/pkgs/by-name/on/onlyoffice-bin_latest/package.nix @@ -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 b62a6c88843e..af184b11a8b9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -791,6 +791,8 @@ mapAliases ({ openvpn_24 = throw "openvpn_24 has been removed, because it went EOL. 2.5.x or newer is still available"; # Added 2023-01-23 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 53ae4ccbd3f1..1da9cf3c820f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33968,11 +33968,6 @@ with pkgs; okteto = callPackage ../development/tools/okteto { }; - onlyoffice-bin_7_2 = callPackage ../applications/office/onlyoffice-bin/7_2.nix { }; - onlyoffice-bin_8_0 = callPackage ../applications/office/onlyoffice-bin/8_0.nix { }; - onlyoffice-bin = onlyoffice-bin_7_2; - onlyoffice-bin_latest = onlyoffice-bin_8_0; - onmetal-image = callPackage ../tools/virtualization/onmetal-image { }; opcr-policy = callPackage ../development/tools/opcr-policy { };