From 03306d5b51c50a2b2546ce2c72696a4cb14f0574 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 17 Mar 2026 08:52:03 +0300 Subject: [PATCH 1/2] opencloud: 5.1.0 -> 5.2.0 Diff: https://github.com/opencloud-eu/opencloud/compare/v5.1.0...v5.2.0 Changelog: https://github.com/opencloud-eu/opencloud/blob/v5.2.0/CHANGELOG.md --- pkgs/by-name/op/opencloud/idp-web.nix | 23 +++++------------------ pkgs/by-name/op/opencloud/package.nix | 4 ++-- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/op/opencloud/idp-web.nix b/pkgs/by-name/op/opencloud/idp-web.nix index 8cb818fe0ad5..523ef84ebbff 100644 --- a/pkgs/by-name/op/opencloud/idp-web.nix +++ b/pkgs/by-name/op/opencloud/idp-web.nix @@ -2,9 +2,7 @@ stdenvNoCC, lib, opencloud, - applyPatches, - fetchpatch, - pnpm_10, + pnpm_9, fetchPnpmDeps, pnpmConfigHook, nodejs, @@ -12,33 +10,22 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencloud-idp-web"; - inherit (opencloud) version; - - src = applyPatches { - src = opencloud.src; - patches = [ - # Fixes broken kopano tarball, remove in next version - (fetchpatch { - url = "https://github.com/opencloud-eu/opencloud/commit/212846f2f4e23e89ed675e5a689d87ba1de55b70.patch"; - hash = "sha256-i+fkWTY4nrZ5fVGlQhhamxy9yrBL9OtDdm7CfV13oak="; - }) - ]; - }; + inherit (opencloud) src version; pnpmRoot = "services/idp"; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_10; + pnpm = pnpm_9; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pnpmRoot}"; fetcherVersion = 3; - hash = "sha256-W5odz//dONpBg4eRQQoVrBMVsEQVkkP89hzMdIXxG7w="; + hash = "sha256-AAAzo//YG5X2531C3vEhsLHRYJilRcomT5uTBSmzNmQ="; }; nativeBuildInputs = [ nodejs pnpmConfigHook - pnpm_10 + pnpm_9 ]; buildPhase = '' diff --git a/pkgs/by-name/op/opencloud/package.nix b/pkgs/by-name/op/opencloud/package.nix index 56b42254e725..63bd38b4a70c 100644 --- a/pkgs/by-name/op/opencloud/package.nix +++ b/pkgs/by-name/op/opencloud/package.nix @@ -28,13 +28,13 @@ let in buildGoModule (finalAttrs: { pname = "opencloud"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "opencloud"; tag = "v${finalAttrs.version}"; - hash = "sha256-LZoQKXHDHHNLmu7FflQMCFUPlGS8eG7kZr8dmFku8Sk="; + hash = "sha256-lycqekiYAkNABl8144W8ZdUjAruc5OKp6c3FUSrLvOw="; }; postPatch = '' From ea687e7e20067465455a9a45e981bdbdfdffb3c1 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 17 Mar 2026 08:57:39 +0300 Subject: [PATCH 2/2] opencloud.web: 5.1.0 -> 6.0.0 Also update test for new button ID. --- nixos/tests/opencloud.nix | 2 +- pkgs/by-name/op/opencloud/web.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/opencloud.nix b/nixos/tests/opencloud.nix index 1fdac34b6ccd..919ed99f4b5d 100644 --- a/nixos/tests/opencloud.nix +++ b/nixos/tests/opencloud.nix @@ -41,7 +41,7 @@ let driver.find_element(By.ID, 'oc-login-password').send_keys(password) wait.until(EC.visibility_of_element_located((By.XPATH, '//button[@type="submit"]'))) driver.find_element(By.XPATH, '//button[@type="submit"]').click() - wait.until(EC.visibility_of_element_located((By.ID, 'new-file-menu-btn'))) + wait.until(EC.visibility_of_element_located((By.ID, 'app-floating-action-button-com-github-opencloud-eu-web-files-floating-action-button'))) wait.until(EC.title_contains("Personal")) ''; in diff --git a/pkgs/by-name/op/opencloud/web.nix b/pkgs/by-name/op/opencloud/web.nix index 4cefe40349a0..c9e47597e9a7 100644 --- a/pkgs/by-name/op/opencloud/web.nix +++ b/pkgs/by-name/op/opencloud/web.nix @@ -10,20 +10,20 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencloud-web"; - version = "5.1.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "web"; tag = "v${finalAttrs.version}"; - hash = "sha256-Xx/uDn4m7Uu+4GMNB9vqsT+CozXhEo+2YGRMaMrjldM="; + hash = "sha256-eHu12DcP2LFJaRBX6WEieucS0HkSi231ZtUSZlunCuo="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-tPU16r0hc0DYwGnvnukivUz3a+Bz6urUZPtokN/lbuA="; + hash = "sha256-YOu0a/mR4PiRQx03BkPQbZgGQzgqXHy9DDihm8aD3wc="; }; nativeBuildInputs = [