From 43b3561bb133568ccb239c86e91109ef7764b254 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Wed, 4 Feb 2026 15:34:56 -0500 Subject: [PATCH 1/7] opencloud.idp-web: Migrate to pnpmBuildHook (cherry picked from commit 4bb1c1c90b4bf19de92f31c3c3f3e0e023b1ad8b) --- pkgs/by-name/op/opencloud/idp-web.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/op/opencloud/idp-web.nix b/pkgs/by-name/op/opencloud/idp-web.nix index d45cf16afd54..45b2a07eaf65 100644 --- a/pkgs/by-name/op/opencloud/idp-web.nix +++ b/pkgs/by-name/op/opencloud/idp-web.nix @@ -5,6 +5,7 @@ pnpm_9, fetchPnpmDeps, pnpmConfigHook, + pnpmBuildHook, nodejs, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -25,19 +26,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs pnpmConfigHook + pnpmBuildHook pnpm_9 ]; - buildPhase = '' - runHook preBuild - - cd $pnpmRoot - pnpm build + postBuild = '' mkdir -p assets/identifier/static cp -v src/images/favicon.svg assets/identifier/static/favicon.svg cp -v src/images/icon-lilac.svg assets/identifier/static/icon-lilac.svg - - runHook postBuild ''; installPhase = '' From ccc951062d8f7fdabc3659dd90908053a000def9 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 3 Jun 2026 13:48:13 +0300 Subject: [PATCH 2/7] opencloud.idp-web: fix after #487046 (cherry picked from commit 064da749a3b2e5bfc46f10c1a53a9a1a42e9eb5e) --- pkgs/by-name/op/opencloud/idp-web.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/op/opencloud/idp-web.nix b/pkgs/by-name/op/opencloud/idp-web.nix index 45b2a07eaf65..0b31c9cbc460 100644 --- a/pkgs/by-name/op/opencloud/idp-web.nix +++ b/pkgs/by-name/op/opencloud/idp-web.nix @@ -31,16 +31,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; postBuild = '' - mkdir -p assets/identifier/static - cp -v src/images/favicon.svg assets/identifier/static/favicon.svg - cp -v src/images/icon-lilac.svg assets/identifier/static/icon-lilac.svg + mkdir -p services/idp/assets/identifier/static + cp -v services/idp/src/images/favicon.svg services/idp/assets/identifier/static/favicon.svg + cp -v services/idp/src/images/icon-lilac.svg services/idp/assets/identifier/static/icon-lilac.svg ''; installPhase = '' runHook preInstall mkdir $out - cp -r assets $out + cp -r services/idp/assets $out runHook postInstall ''; From ecd4a3a2718c34201b86d8618a0248d12cd22bb3 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 8 Jun 2026 09:48:03 +0300 Subject: [PATCH 3/7] opencloud{,-web}: 7.0.0 -> 7.1.0 Diff: https://github.com/opencloud-eu/opencloud/compare/v7.0.0...v7.1.0 Changelog: https://github.com/opencloud-eu/opencloud/blob/v7.1.0/CHANGELOG.md (cherry picked from commit 3b4b66aa34551bbb1762b75042dade6dd31f685f) --- pkgs/by-name/op/opencloud/idp-web.nix | 10 +++++----- pkgs/by-name/op/opencloud/package.nix | 4 ++-- pkgs/by-name/op/opencloud/web.nix | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/op/opencloud/idp-web.nix b/pkgs/by-name/op/opencloud/idp-web.nix index 0b31c9cbc460..9cb501702c2f 100644 --- a/pkgs/by-name/op/opencloud/idp-web.nix +++ b/pkgs/by-name/op/opencloud/idp-web.nix @@ -2,7 +2,7 @@ stdenvNoCC, lib, opencloud, - pnpm_9, + pnpm_11, fetchPnpmDeps, pnpmConfigHook, pnpmBuildHook, @@ -17,17 +17,17 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_9; + pnpm = pnpm_11; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pnpmRoot}"; - fetcherVersion = 3; - hash = "sha256-E0bP15T2Ekj992Y1xFXL/4rko34AY+I5Lbn+blJhXYg="; + fetcherVersion = 4; + hash = "sha256-NN5MmWYQgaG4s8+mnLWo8EzOobACOnYhdwt4+/4kz9o="; }; nativeBuildInputs = [ nodejs pnpmConfigHook pnpmBuildHook - pnpm_9 + pnpm_11 ]; postBuild = '' diff --git a/pkgs/by-name/op/opencloud/package.nix b/pkgs/by-name/op/opencloud/package.nix index 9e18e43206c6..500c89f0f85f 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 = "7.0.0"; + version = "7.1.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "opencloud"; tag = "v${finalAttrs.version}"; - hash = "sha256-5bGsJcmrF01E0zXKxwRQpTZl/OinfW7da3nf3/T74hg="; + hash = "sha256-Lr/YF+vuaBIe6sQ+CeVuqV6BDe9jAIQLTZbCKyvn6As="; }; postPatch = '' diff --git a/pkgs/by-name/op/opencloud/web.nix b/pkgs/by-name/op/opencloud/web.nix index 1a33c6925eb3..7a679bc9d8c2 100644 --- a/pkgs/by-name/op/opencloud/web.nix +++ b/pkgs/by-name/op/opencloud/web.nix @@ -3,33 +3,33 @@ stdenvNoCC, fetchFromGitHub, nodejs, - pnpm_10, + pnpm_11, fetchPnpmDeps, pnpmConfigHook, nix-update-script, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencloud-web"; - version = "7.0.1"; + version = "7.1.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "web"; tag = "v${finalAttrs.version}"; - hash = "sha256-kkNdP3IpWnfOv5GEhQqKJwnnRXCHyxMcI2RA6vK7NrA="; + hash = "sha256-awEGCmdauqHkigXqumOYs8woOyY8gIccmzKOyrZ7SwQ="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_10; - fetcherVersion = 3; - hash = "sha256-Md6KcP5BV9Pskqg+o9D3RD0WconqyiizAvXNMZ9htfw="; + pnpm = pnpm_11; + fetcherVersion = 4; + hash = "sha256-oIVbhvFiVu0S7sSs5u14M0A1+Q1WmiAsyoBt8QtojyE="; }; nativeBuildInputs = [ nodejs pnpmConfigHook - pnpm_10 + pnpm_11 ]; buildPhase = '' From fb51130d6d215da0e28981bed1ef75a481c0fe8f Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 25 Jun 2026 16:13:14 +0300 Subject: [PATCH 4/7] opencloud: 7.1.0 -> 7.2.0 Diff: https://github.com/opencloud-eu/opencloud/compare/v7.1.0...v7.2.0 Changelog: https://github.com/opencloud-eu/opencloud/blob/v7.2.0/CHANGELOG.md (cherry picked from commit cb262ee05de93b8998123b04668c0b2f5deed637) --- pkgs/by-name/op/opencloud/idp-web.nix | 2 +- pkgs/by-name/op/opencloud/package.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opencloud/idp-web.nix b/pkgs/by-name/op/opencloud/idp-web.nix index 9cb501702c2f..1d7f65bda3e5 100644 --- a/pkgs/by-name/op/opencloud/idp-web.nix +++ b/pkgs/by-name/op/opencloud/idp-web.nix @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpm = pnpm_11; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pnpmRoot}"; fetcherVersion = 4; - hash = "sha256-NN5MmWYQgaG4s8+mnLWo8EzOobACOnYhdwt4+/4kz9o="; + hash = "sha256-pQ01vBvC29B5oxDWtt7anI5QtFbvQFFBVamQtA2WTNo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/opencloud/package.nix b/pkgs/by-name/op/opencloud/package.nix index 500c89f0f85f..983299455638 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 = "7.1.0"; + version = "7.2.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "opencloud"; tag = "v${finalAttrs.version}"; - hash = "sha256-Lr/YF+vuaBIe6sQ+CeVuqV6BDe9jAIQLTZbCKyvn6As="; + hash = "sha256-GAoDEXk7sBN7N0V/msi/fcJS72RqqlF6Qb5B9hArmvk="; }; postPatch = '' From 05a341d715d6e6f088cae509ec57012fd1a08a47 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 28 Jun 2026 19:22:47 +0300 Subject: [PATCH 5/7] opencloud.web: 7.1.0 -> 7.1.2 Diff: https://github.com/opencloud-eu/web/compare/v7.1.0...v7.1.2 Changelog: https://github.com/opencloud-eu/web/blob/v7.1.2/CHANGELOG.md (cherry picked from commit 35edb8aaa8caccd963c9428d4d93148f2e7e81da) --- pkgs/by-name/op/opencloud/web.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opencloud/web.nix b/pkgs/by-name/op/opencloud/web.nix index 7a679bc9d8c2..63367385af39 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 = "7.1.0"; + version = "7.1.2"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "web"; tag = "v${finalAttrs.version}"; - hash = "sha256-awEGCmdauqHkigXqumOYs8woOyY8gIccmzKOyrZ7SwQ="; + hash = "sha256-zwD/Mn7jL960EVaG3gVqFo6FPPMhQTMz3LKy8ZnOObk="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_11; fetcherVersion = 4; - hash = "sha256-oIVbhvFiVu0S7sSs5u14M0A1+Q1WmiAsyoBt8QtojyE="; + hash = "sha256-YEdZ5B11I6U140qam7e1TMOacRqUeINhr/TI13ddAa0="; }; nativeBuildInputs = [ From cea6672d6b179ba39046cf2aec3a29b717e9ae8d Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 14 Jul 2026 20:57:23 +0300 Subject: [PATCH 6/7] opencloud.web: 7.1.2 -> 7.2.0 Diff: https://github.com/opencloud-eu/web/compare/v7.1.2...v7.2.0 Changelog: https://github.com/opencloud-eu/web/blob/v7.2.0/CHANGELOG.md (cherry picked from commit 0f718c1de397cfca76e6d5e1345a20202e8e5153) --- pkgs/by-name/op/opencloud/web.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opencloud/web.nix b/pkgs/by-name/op/opencloud/web.nix index 63367385af39..13e0d4a25879 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 = "7.1.2"; + version = "7.2.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "web"; tag = "v${finalAttrs.version}"; - hash = "sha256-zwD/Mn7jL960EVaG3gVqFo6FPPMhQTMz3LKy8ZnOObk="; + hash = "sha256-BiOue8+zQ3+6RLiDbLMnxKEen2aav3bljji4d+0Hr5c="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_11; fetcherVersion = 4; - hash = "sha256-YEdZ5B11I6U140qam7e1TMOacRqUeINhr/TI13ddAa0="; + hash = "sha256-gCsgnOEi9rvtwTZy8J/i63D92Gl2V9ZihxCJ+Y5hLUE="; }; nativeBuildInputs = [ From e7557380bd8c262283e6b4600a7060e9b552f612 Mon Sep 17 00:00:00 2001 From: UwU 420 <164377175+uwu-420@users.noreply.github.com> Date: Mon, 3 Aug 2026 10:37:49 +0200 Subject: [PATCH 7/7] nixosTests.opencloud: fix LDAPS and aarch64 WebDriver setup OpenCloud 7.2 switched the IDM default listener from LDAPS on port 9235 to LDAP on port 9236. Enable the LDAPS listener explicitly because the test configures clients to use it. Pass geckodriver to Selenium explicitly. Selenium Manager does not support aarch64-linux even though geckodriver is already installed by the test. Assisted-by: OpenAI Codex (GPT-5) (cherry picked from commit f54c56f1492ebb1d96c695aff61cb66a23c97bd5) --- nixos/tests/opencloud.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/tests/opencloud.nix b/nixos/tests/opencloud.nix index 919ed99f4b5d..25bd5295f68c 100644 --- a/nixos/tests/opencloud.nix +++ b/nixos/tests/opencloud.nix @@ -21,12 +21,14 @@ let from selenium.webdriver.common.by import By from selenium.webdriver import Firefox from selenium.webdriver.firefox.options import Options + from selenium.webdriver.firefox.service import Service from selenium.webdriver.support.ui import WebDriverWait from selenium.webdriver.support import expected_conditions as EC options = Options() options.add_argument('--headless') - driver = Firefox(options=options) + service = Service(executable_path="${lib.getExe pkgs.geckodriver}") + driver = Firefox(options=options, service=service) host = sys.argv[1] user = sys.argv[2] @@ -71,6 +73,7 @@ in environment = { ADMIN_PASSWORD = adminPassword; IDM_CREATE_DEMO_USERS = "true"; + IDM_LDAPS_ADDR = "127.0.0.1:9235"; IDM_LDAPS_CERT = "${certs.${domain}.cert}"; IDM_LDAPS_KEY = "${certs.${domain}.key}"; OC_INSECURE = "false";