From 2efa25945892506a5ce997320cece4d462203a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 7 Mar 2025 16:22:11 +0100 Subject: [PATCH] nextcloud31Packages.apps.recognize: drop nextcloud 28 it was removed from nixpkgs --- pkgs/servers/nextcloud/packages/apps/recognize.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/apps/recognize.nix b/pkgs/servers/nextcloud/packages/apps/recognize.nix index 98033fd875e4..ee8133ed105a 100644 --- a/pkgs/servers/nextcloud/packages/apps/recognize.nix +++ b/pkgs/servers/nextcloud/packages/apps/recognize.nix @@ -26,13 +26,6 @@ let appHash = "sha256-qR4SrTHFAc4YWiZAsL94XcH4VZqYtkRLa0y+NdiFZus="; modelHash = "sha256-M/j5wVOBLR7xMVJQWDUWAzLajRUBYEzHSNBsRSBUgfM="; }; - "28" = { - # Once this version is no longer supported, we can remove the getAppValue replacements below - # The getAppValueString stuff will need to remain - version = "6.1.0"; - appHash = "sha256-225r2JnDOoURvLmzpmHp/QL6GDx9124/YTywbxH3/rk="; - modelHash = "sha256-4mhQM/ajpwjqTb8jSbEIdtSRrWZEOaMZQXAwcfSRQ/M="; - }; }; currentVersionInfo = latestVersionForNc.${ncVersion}; in @@ -83,9 +76,7 @@ stdenv.mkDerivation rec { substituteInPlace recognize/lib/**/*.php \ --replace-quiet "\$this->settingsService->getSetting('node_binary')" "'${lib.getExe nodejs}'" \ --replace-quiet "\$this->config->getAppValueString('node_binary', '""')" "'${lib.getExe nodejs}'" \ - --replace-quiet "\$this->config->getAppValueString('node_binary')" "'${lib.getExe nodejs}'" \ - --replace-quiet "\$this->config->getAppValue('node_binary', '""')" "'${lib.getExe nodejs}'" \ - --replace-quiet "\$this->config->getAppValue('node_binary')" "'${lib.getExe nodejs}'" + --replace-quiet "\$this->config->getAppValueString('node_binary')" "'${lib.getExe nodejs}'" test "$(grep "get[a-zA-Z]*('node_binary'" recognize/lib/**/*.php | wc -l)" -eq 0