Commit Graph

352 Commits

Author SHA1 Message Date
Thomas Gerbet
3ceb400cf6 libreoffice-bin: set meta.sourceProvenance 2024-01-30 19:12:54 +01:00
K900
f1bd0e72c7 libreoffice: build with system liblangtag, backport libxml 2.12 build fixes 2024-01-08 18:53:32 +03:00
Thomas Gerbet
77ed551c8c libreoffice-bin: 7.5.5 -> 7.6.4
Fixes CVE-2023-6185 and CVE-2023-6186.

https://www.libreoffice.org/about-us/security/advisories/cve-2023-6185
https://www.libreoffice.org/about-us/security/advisories/cve-2023-6186
2024-01-07 01:25:36 +01:00
Thomas Gerbet
910fb6d8bf libreoffice-fresh: 7.6.2.1 -> 7.6.4.1
Fixes CVE-2023-6185 and CVE-2023-6186.

https://www.libreoffice.org/about-us/security/advisories/cve-2023-6185
https://www.libreoffice.org/about-us/security/advisories/cve-2023-6186
2024-01-07 01:25:29 +01:00
Thomas Gerbet
8fe7026409 libreoffice-still: 7.5.7.1 -> 7.5.9.2
Fixes CVE-2023-6185 and CVE-2023-6186.

https://www.libreoffice.org/about-us/security/advisories/cve-2023-6185
https://www.libreoffice.org/about-us/security/advisories/cve-2023-6186
2024-01-05 21:43:53 +01:00
Doron Behar
202588714c libreoffice-unwrapped: fix default --with-help build value
Previously, only if `withHelp` was `false`, we added the `./configure`
flag `--without-help`, but apparently `--without-help` does nothing, as
not building help is the default behavior. Using `lib.withFeature` gives
the most expected behavior no matter what are the defaults. Quoting from
`./configure --help` for reference:

> --with-help             Enable the build of help. There is a special
>                         parameter "common" that can be used to bundle only
>                         the common part, .e.g help-specific icons. This is
>                         useful when you build the helpcontent separately.
>
>                         Usage:     --with-help    build the old local help
>                                --without-help     no local help (default)
>                                --with-help=html   build the new HTML local help
>                                --with-help=online build the new HTML online help

This commit fixes #276400.
2023-12-24 11:52:54 +02:00
Alyssa Ross
f52f3f8be6
libreoffice: backport fix for expired test certs 2023-11-30 15:28:37 +01:00
Doron Behar
4b2b0f1425 libreoffice: disable a test failing on aarch64 2023-10-04 05:45:25 +03:00
Doron Behar
0c56f2756d libreoffice-fresh: disable a failing test 2023-10-04 05:45:25 +03:00
Doron Behar
082984ef70 libreoffice: remove stale, unused patches 2023-10-04 05:45:25 +03:00
Doron Behar
159b8a6eb2 libreoffice: reformat a bit kdeIntegration postPatch hook
Put the xdg-open -> kde-open5 substitution in the kdeIntegration
conditioned block, also put the comment about it from above the
postPatch near there.
2023-10-04 05:45:25 +03:00
Doron Behar
eb6574af29 libreoffice-fresh-unwrapped: 7.5.4.2 -> 7.6.2.1 2023-10-04 05:45:25 +03:00
Doron Behar
4981cf1288 libreoffice-still-unwrapped: 7.4.7.1 -> 7.5.7.1
Remove dolphin templates, as these seem empty now (for libreoffice-fresh
as well).
2023-10-04 05:45:25 +03:00
Doron Behar
582e1924c9 libreoffice: write a whole, batteries included updateScript 2023-10-01 15:52:12 +03:00
Doron Behar
90160e5fe3 libreoffice: reorder/reformat buildInputs a bit
The versionAtleast 7.4 is no longer needed due to still and fresh
variants' versions.
2023-09-29 19:10:01 +03:00
Doron Behar
27b1afd006 libreoffice: use finalAttrs in mkDerivation 2023-09-29 16:08:41 +03:00
Doron Behar
7932ddf604 libreoffice: always use stdenv.mkDerivation
`mkDerivation` from `libsForQt5` is deprecated. Hooks are preferred, see
https://github.com/NixOS/nixpkgs/issues/180841 .
2023-09-29 16:08:41 +03:00
Doron Behar
babd79315b libreoffice: get rid of src-$VARIANT/override.nix
Towards simplfying the expression.
2023-09-29 16:08:41 +03:00
Doron Behar
b597a74a22 libreoffice: small reformatting to postConfigure 2023-09-29 16:08:41 +03:00
Doron Behar
2f05389728 libreoffice: improve nixpkgs' README update instructions 2023-09-29 16:08:41 +03:00
Jan Malakhovski
591ccfe5b9 treewide: noop: refer to src.name or similar where appropriate, part 3: more use cases
This continues where d8f7f6a5ce left off. Similarly
to that commit, this commit this also points `sourceRoot`s to `src.name` and similar
instead of keeping hardcoded names, and edits other derivation attrs do do the same,
where appropriate.

Also, similarly to d8f7f6a5ce some of expressions this
edits use `srcs` attribute with customly-named sources, so they have to be moved
into `let` blocks to keep evaluation efficient (the other, worse, way to do this
would to recurcively refer to `elemAt n finalAttrs.srcs` or, similarly, with `rec`).
2023-08-11 09:20:44 +00:00
github-actions[bot]
6458cb74a2
Merge master into staging-next 2023-08-05 12:01:30 +00:00
Vladimír Čunát
bf170fec12
libreoffice*: fixup build with curl-8.2.0 2023-08-03 20:45:28 +02:00
JesusMtnez
bd03eac9ef
libreoffice-bin: 7.4.7 -> 7.5.5 2023-08-01 06:04:20 +02:00
Maximilian Bosch
9e0bf8497f
libreoffice-qt: fix build
Broke in 408ece7d3d because the
`disallowedRequisites` fails here since the QT variant apparently needs
to reference a few dev outputs[1].

I won't look into the details of that now, so the easiest way to unbreak
is to skip the check for the QT variant. It should be kept for non-QT
though to make sure that a change similar to the BUILDCONFIG thing isn't
missed again by us.

[1] https://github.com/NixOS/nixpkgs/pull/245361#issuecomment-1651389735

    error: output '/nix/store/2y0czyy26gcsqhmcvd2mlqa35f0gcl4l-libreoffice-7.5.4.1' is not allowed to refer to the following paths:
             /nix/store/0hmvklj0mbhrn8flwbcwivvkv45limhg-freetype-2.13.0-dev
             /nix/store/0rnx7rc87hwkbrhsys7mgwq4jw6pz7ma-zlib-1.2.13-dev
             [...]
2023-07-26 12:54:36 +02:00
Maximilian Bosch
408ece7d3d
libreoffice-fresh: strip away BUILDCONFIG, reduce runtime closure size by ~20%
In v7.5.x a change was introduced that writes the BUILDCONFIG into
`$out/lib/libreoffice/program/libsofficeapp.so` including the
`PKG_CONFIG_PATH` containing references to all `dev` outputs of library
dependencies:

    $ strings $(nix-build -A libreoffice-fresh)/lib/libreoffice/program/libsofficeapp.so|grep PKG_CONFIG_PATH
    [...], "BuildConfig": "[...] 'PKG_CONFIG_PATH=[...]'"

This isn't really needed because this information can also be obtained
by `nix derivation show`. Also, this causes a 20% larger runtime-closure
because of all the dev dependencies being referenced by the output and
thus downloaded whenever libreoffice is substituted somewhere. The
actual numbers look like this:

    $ nix path-info -Sh ./result-old
    /nix/store/3mzrqh4gg7v27vdrrap9dj3x8myysmyf-libreoffice-7.5.4.1-wrapped	  2.0G
    $ nix path-info -Sh ./result
    /nix/store/g5y60s0a2q2v6r58xcayv62z7fjfi816-libreoffice-7.5.4.1-wrapped	  1.6G

Only `libreoffice-fresh` is affected, `pkgs.libreoffice` isn't because
it still points to 7.4 whereas the problematic change was introduced in
7.5.

To make sure this doesn't get reintroduced by accident, the derivation
also prohibits now to reference any dev output from a build input.

[1] https://gerrit.libreoffice.org/c/core/+/141197
2023-07-25 18:05:49 +02:00
Felix Bühler
0a2745684e
Merge pull request #239624 from Stunkymonkey/use-optionalString-then
treewide: use optionalString instead of 'then ""'
2023-07-22 13:02:47 +02:00
JesusMtnez
8e089e7135
libreoffice-bin: 7.4.3 -> 7.4.7 2023-07-12 10:24:29 +02:00
Felix Buehler
f3719756b5 treewide: use optionalString instead of 'then ""' 2023-06-24 20:19:19 +02:00
teutat3s
9da8091506
libreoffice-fresh: 7.5.2.2 -> 7.5.4.1 2023-05-29 13:27:03 +02:00
teutat3s
c92d120e01
libreoffice-still: 7.4.6.2 -> 7.4.7.2 2023-05-29 13:25:36 +02:00
Michael Raskin
e057b8492a
libreoffice*: drop test which regressed on libxml2 update
https://hydra.nixos.org/build/215973648/nixlog/6/tail
(cherry picked from commit 9a0662c503)
2023-04-23 09:38:41 +02:00
Doron Behar
07bfa152b6 libreoffice-still: Disable more failing tests 2023-04-07 10:24:11 +03:00
Doron Behar
6431dfbe0f libreoffice-fresh: 7.5.2.1 - > 7.5.2.2 2023-04-03 06:55:17 +03:00
Doron Behar
699d543e9e libreoffice.unwrapped: Remove $dev output
It makes the build fail, and not package in Nixpkgs seems to be using
this.
2023-04-02 18:17:02 +03:00
Doron Behar
e0b64b3a82 libreoffice: Remove failing test 2023-04-02 18:15:53 +03:00
Doron Behar
c613b68e4c libreoffice-still: 7.3.7.2 -> 7.4.6.2 2023-04-02 18:15:53 +03:00
Doron Behar
272f3d3914 libreoffice-fresh: 7.4.2.3 -> 7.5.2.1 2023-04-02 18:15:53 +03:00
Doron Behar
8218e8b457 libreoffice: generate-*-srcs.py Remove export prefix
Needed for both fresh and still variants upcoming updates, in order to
parse the download.lst file correctly.
2023-04-02 18:15:52 +03:00
Doron Behar
d26b239493 libreoffice/wrapper: Don't --chdir
Use lndir and replace it's relevant symlinks with wrappers.
2023-03-26 16:25:46 +03:00
Vladimír Čunát
a86610144f
Merge #219444: staging-next 2023-03-04 2023-03-15 17:35:39 +01:00
Moritz 'e1mo' Fromm
825a34ea3b
libreoffice: improve out/share looping in wrapper
The copying/linking implemented in #220694 resulted in a higher
maintenance burden (need to manually add all new folders in $out/share).
The introduced loop will continue linking everything but the .desktop
files.
2023-03-14 11:53:31 +01:00
Vladimír Čunát
1f7eeea8ee
Merge branch 'master' into staging-next 2023-03-12 17:21:00 +01:00
Moritz 'e1mo' Fromm
7d15a39781
libreoffice: Fix invalid desktop files
Fixes a regression introduced in #219166 by again setting the correct
binary name in the Exec filed for the .desktop files.

Fixes #220693
2023-03-12 16:08:26 +01:00
Weijia Wang
7f436901f1 libreoffice-still: fix build on aarch64-linux 2023-03-12 00:11:48 +02:00
Doron Behar
3966519d12 libreoffice: wrapper.nix rewrite
Cleanup the unwrapped derivation's postInstall. Delete wrapper.sh, and
put it's contents in the wrapped derivation via configurable
`makeWrapper`. Also, always install dolphin templates in the unwrapped
derivation.
2023-03-07 01:23:22 +02:00
Artturin
f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
Artturin
6f6cc4a22d treewide: use toString on list NIX_CFLAGS_COMPILE
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper
2023-02-22 21:23:04 +02:00
squalus
09720f1dc3 libreoffice: support postgresql by default 2023-02-02 16:59:30 -08:00
github-actions[bot]
4712ed9439
Merge master into staging-next 2023-01-14 00:02:26 +00:00