Skip to content

ocis: apply patch to fix broken kopano tarball, migrate to fetcherVersion = 3#513204

Merged
Scrumplex merged 1 commit into
NixOS:masterfrom
qweered:ocis-fix-kopano
Apr 26, 2026
Merged

ocis: apply patch to fix broken kopano tarball, migrate to fetcherVersion = 3#513204
Scrumplex merged 1 commit into
NixOS:masterfrom
qweered:ocis-fix-kopano

Conversation

@qweered

@qweered qweered commented Apr 24, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Adds a local patch that removes the kpop dependency from services/idp, whose upstream tarball (https://download.kopano.io/community/kapp:/kpop-2.2.0.tgz) is no longer served by kopano.io. The patch is adapted from the upstream fix (owncloud/ocis#12043, first released in v8.0.1) since oCIS is pinned to 5.0.9 in nixpkgs and the upstream diff doesn't apply to that version.
  • Migrates pnpmDeps from fetcherVersion = 1 to fetcherVersion = 3 with a freshly computed hash.

With this change, the last package in nixpkgs using fetcherVersion = 1 is migrated (after #494402 lands). Fresh builds of ocis.pnpmDeps no longer hit the dead kopano URL.

The patch removes kpop from services/idp/package.json and pnpm-lock.yaml, and replaces the kpop theme import in services/idp/src/App.jsx with @material-ui/core/styles' stock createTheme(). The IDP sign-in page therefore renders with a default Material-UI v4 theme instead of the Kopano-branded one (functional but unstyled by the old CSS resets).

Things done

…sion = 3

The upstream tarball at https://download.kopano.io/community/kapp:/kpop-2.2.0.tgz
is no longer available. Adapted from the upstream fix in v8.0.1
(owncloud/ocis#12043).
@nixpkgs-ci nixpkgs-ci Bot requested a review from xinyangli April 24, 2026 22:42
@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Apr 24, 2026
qweered added a commit to qweered/nixpkgs that referenced this pull request Apr 24, 2026
fetcherVersion = 1 was kept around for backwards compatibility while
callers migrated to 2/3. Most of them have; the remainder are being
cleared in NixOS#494402 and NixOS#513204.

Emit a `lib.warnIf` warning pointing at the affected pname whenever v1
is used, gated by `lib.oldestSupportedReleaseIsAtLeast 2611` so the
deprecation message only becomes visible once 26.11 is the oldest
supported release (i.e., the next LTS to EOL). At that point,
`supportedFetcherVersions` should drop 1 and the dead v1 code paths in
default.nix, pnpm-config-hook.sh and serve.nix can be cleaned up.

Also rewrite the manual section to recommend fetcherVersion = 3 for new
packages and mark v1 as deprecated/scheduled-for-removal in the
version history.
qweered added a commit to qweered/nixpkgs that referenced this pull request Apr 24, 2026
fetcherVersion = 1 was kept around for backwards compatibility while
callers migrated to 2/3. Most of them have; the remainder are being
cleared in NixOS#494402 and NixOS#513204.

Emit a `lib.warnIf` warning pointing at the affected pname whenever v1
is used, gated by `lib.oldestSupportedReleaseIsAtLeast 2605` so the
deprecation message activates once 26.05 becomes the oldest supported
release (~Jun 2026, when 25.11 EOLs). That gives users roughly one
release cycle of advance notice before v1 is removed in 26.11.

After 26.11 ships, a follow-up PR should drop 1 from
`supportedFetcherVersions` and clean up the dead v1 code paths in
default.nix, pnpm-config-hook.sh and serve.nix.

Also rewrite the manual section to recommend fetcherVersion = 3 for new
packages and mark v1 as deprecated/scheduled-for-removal in the
version history.
qweered added a commit to qweered/nixpkgs that referenced this pull request Apr 24, 2026
fetcherVersion = 1 was kept around for backwards compatibility while
callers migrated to 2/3. Most of them have; the remainder are being
cleared in NixOS#494402 and NixOS#513204.

Emit a `lib.warnIf` warning pointing at the affected pname whenever v1
is used, gated by `lib.oldestSupportedReleaseIsAtLeast 2605` so the
deprecation message activates once 26.05 becomes the oldest supported
release (~Jun 2026, when 25.11 EOLs). That gives users roughly one
release cycle of advance notice before v1 is removed in 26.11.

After 26.11 ships, a follow-up PR should drop 1 from
`supportedFetcherVersions` and clean up the dead v1 code paths in
default.nix, pnpm-config-hook.sh and serve.nix.

Also rewrite the manual section to recommend fetcherVersion = 3 for new
packages and mark v1 as deprecated/scheduled-for-removal in the
version history.
Scrumplex
Scrumplex previously approved these changes Apr 25, 2026
Comment thread pkgs/by-name/oc/ocis/package.nix
@Scrumplex Scrumplex dismissed their stale review April 25, 2026 08:45

Approval was unintentional

@Scrumplex Scrumplex left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Comment thread pkgs/by-name/oc/ocis/package.nix
@nixpkgs-ci nixpkgs-ci Bot added 12.approvals: 1 This PR was reviewed and approved by one person. 2.status: merge-bot eligible This PR can be merged by commenting "@NixOS/nixpkgs-merge-bot merge". labels Apr 26, 2026
Scrumplex pushed a commit to qweered/nixpkgs that referenced this pull request Apr 26, 2026
fetcherVersion = 1 was kept around for backwards compatibility while
callers migrated to 2/3. Most of them have; the remainder are being
cleared in NixOS#494402 and NixOS#513204.

Emit a `lib.warnIf` warning pointing at the affected pname whenever v1
is used.

After 26.11 ships, a follow-up PR should drop 1 from
`supportedFetcherVersions` and clean up the dead v1 code paths in
default.nix, pnpm-config-hook.sh and serve.nix.

Also rewrite the manual section to recommend fetcherVersion = 3 for new
packages and mark v1 as deprecated/scheduled-for-removal in the
version history.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
Scrumplex pushed a commit to qweered/nixpkgs that referenced this pull request Apr 26, 2026
fetcherVersion = 1 was kept around for backwards compatibility while
callers migrated to 2/3. Most of them have; the remainder are being
cleared in NixOS#494402 and NixOS#513204.

Emit a `lib.warnIf` warning pointing at the affected pname whenever v1
is used.

After 26.11 ships, a follow-up PR should drop 1 from
`supportedFetcherVersions` and clean up the dead v1 code paths in
default.nix, pnpm-config-hook.sh and serve.nix.

Also rewrite the manual section to recommend fetcherVersion = 3 for new
packages and mark v1 as deprecated/scheduled-for-removal in the
version history.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@Scrumplex

Copy link
Copy Markdown
Member

Replying to @qweered in #513215 (comment)

Thank you for force push, I was quiet busy yesterday. LGTM, lets merge #513204 and its ready to go

As this patch changes the behavior of the application slightly, I wasn't quite confident in merging this without approval from the maintainer. Alternatively, we can mark this package as broken in #513215 to expedite the merge over there and fix this up later.

@qweered

qweered commented Apr 26, 2026

Copy link
Copy Markdown
Contributor Author

I mean it only affects login page and I tested login works, also there is pull request that updates ocis to new version #384343

@Scrumplex Scrumplex added this pull request to the merge queue Apr 26, 2026
Merged via the queue into NixOS:master with commit f753b90 Apr 26, 2026
39 of 41 checks passed
@qweered qweered deleted the ocis-fix-kopano branch April 26, 2026 15:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2.status: merge-bot eligible This PR can be merged by commenting "@NixOS/nixpkgs-merge-bot merge". 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants