Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libreoffice-collabora: init at 24.04.5-4 #329525

Merged
merged 1 commit into from
Jul 24, 2024
Merged

Conversation

xzfc
Copy link
Contributor

@xzfc xzfc commented Jul 23, 2024

Description of changes

This PR is the first step in bringing Collabora Online Development Edition (CODE) to Nixpkgs. CODE is a way to run LibreOffice in the browser.

In this PR, a new libreoffice variant is added, in addition to the existing "fresh" and "still" variants. It is built from the upstream LibreOffice git repository but from a dedicated Collabora branch.

The primary usage of libreoffice-collabora is to be used as a dependency of Collabora Online which I plan to add in a separate PR. Unlike the upstream "fresh" and "still" variants, this variant does not need to be wrapped, since it's not intended to be run as a desktop app. But for testing purposes, you could run it as ./result/lib/collaboraoffice/program/soffice.

URLs: https://www.collaboraoffice.com https://www.libreoffice.org/download/libreoffice-online/
cc: @K900 @7c6f434c

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@xzfc xzfc force-pushed the cool-libreoffice branch from 3780758 to 8d1aec3 Compare July 23, 2024 22:28
@xzfc xzfc requested review from K900 and 7c6f434c July 23, 2024 22:30
@xzfc
Copy link
Contributor Author

xzfc commented Jul 23, 2024

The Check pkgs/by-name complains, but I'm adding a variant of an existing non-by-name package. I guess, we should ignore this particular check for this change.

@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Jul 24, 2024
@xzfc xzfc force-pushed the cool-libreoffice branch from 8d1aec3 to ab5bdfd Compare July 24, 2024 04:00
@7c6f434c
Copy link
Member

I guess the proper fix is supposed to be something like libreoffice-variants at the top-level as a package set with the variants then inherited from there, but this can be done separately…

@7c6f434c 7c6f434c merged commit 5e49ae5 into NixOS:master Jul 24, 2024
23 of 26 checks passed
@trofi
Copy link
Contributor

trofi commented Jul 25, 2024

Looks like help.nix file is missing:

$ nix build --no-link -f. libreoffice-collabora.srcs.help
error:
       … while calling a functor (an attribute set with a '__functor' attribute)
         at pkgs/applications/office/libreoffice/default.nix:204:12:
          203|     translations = fetchurl srcsAttributes.translations;
          204|     help = fetchurl srcsAttributes.help;
             |            ^
          205|   };

       … from call site
         at lib/trivial.nix:957:7:
          956|     { # TODO: Should we add call-time "type" checking like built in?
          957|       __functor = self: f;
             |       ^
          958|       __functionArgs = args;

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: path 'pkgs/applications/office/libreoffice/src-collabora/help.nix' does not exist

@xzfc
Copy link
Contributor Author

xzfc commented Jul 25, 2024

Thanks for pointing it, @trofi. It is intended not to have these files for libreoffice-collabora, but I've missed that they were still being referred to in passthru.srcs.

Fixup PR: #329877.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants