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.

Sign up for GitHub

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

Jump to bottom

libreoffice-{fresh,still}: upgrade and clean #46049

Merged
merged 1 commit into from Sep 5, 2018
Merged

libreoffice-{fresh,still}: upgrade and clean #46049

merged 1 commit into from Sep 5, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Sep 4, 2018

  • libreoffice-still: -> 6.0.6.2
    • (newer than our current 'fresh!')
  • libreoffice-fresh: -> 6.1.0.3
    • 6.1.1(.1) is currently pre-release, FWIW
  • Use normal gcc, not gcc5
    • dropping 'glibc' from buildInputs fixed this (?)
  • remove many fixes/touchups/workarounds/hacks
    • hopefully everything still works for everyone
  • disable online update since that seems unlikely to work anyway
  • fix autogen/configure invocations
  • disable libnumbertext in 6.1.x since not packaged
  • drop 'touch solenv/inc/target.mk' as unclear what it was for
    and doesn't seem to be currently needed
  • cleanup link gen a bit[1]
  • split checks to check phase

[1]
primary motivation was to stop creating links like:

'libreoffice-6.0.5.2/src/-libxslt-1.1.32.tar.gz' -> '/nix/store/503v5hmhm430bld0h078gacmkniwdllr-libxslt-1.1.32.tar.gz'
'libreoffice-6.0.5.2/src/libxslt-1.1.32.tar.gz' -> '/nix/store/503v5hmhm430bld0h078gacmkniwdllr-libxslt-1.1.32.tar.gz'

This is mostly accomplished by simply using the 'md5name' field
which the python script kindly generates for us
(including the use of non-md5 if md5 is not set or empty).

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

Complicated package, testing and review appreciated!

@dtzWill
libreoffice-{fresh,still}: upgrade and clean
72cf7f5 
* libreoffice-still: -> 6.0.6.2
  * (newer than our current 'fresh!')
* libreoffice-fresh: -> 6.1.0.3
  * 6.1.1(.1) is currently pre-release, FWIW
* Use normal gcc, not gcc5
  * dropping 'glibc' from buildInputs fixed this (?)
* remove many fixes/touchups/workarounds/hacks
  * hopefully everything still works for everyone
* disable online update since that seems unlikely to work anyway
* fix autogen/configure invocations
* disable libnumbertext in 6.1.x since not packaged
* drop 'touch solenv/inc/target.mk' as unclear what it was for
  and doesn't seem to be currently needed
* cleanup link gen a bit[1]
* split checks to check phase

[1]
primary motivation was to stop creating links like:

'libreoffice-6.0.5.2/src/-libxslt-1.1.32.tar.gz' -> '/nix/store/503v5hmhm430bld0h078gacmkniwdllr-libxslt-1.1.32.tar.gz'
'libreoffice-6.0.5.2/src/libxslt-1.1.32.tar.gz' -> '/nix/store/503v5hmhm430bld0h078gacmkniwdllr-libxslt-1.1.32.tar.gz'

This is mostly accomplished by simply using the 'md5name' field
which the python script kindly generates for us
(including the use of non-md5 if md5 is not set or empty).
@dtzWill
Copy link
Member Author

dtzWill commented Sep 4, 2018

libreoffice-still has been on 5.x for some time, but I moved to 6.x since that's what is listed here: https://www.libreoffice.org/download/libreoffice-still . Just wanted to mention the change.

@dtzWill
Copy link
Member Author

dtzWill commented Sep 4, 2018

@GrahamcOfBorg build libreoffice-still libreoffice-fresh

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: libreoffice-still, libreoffice-fresh

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: libreoffice-still, libreoffice-fresh

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

@7c6f434c
Copy link
Member

7c6f434c commented Sep 4, 2018

So, printing still works without -lcups now?

@7c6f434c
Copy link
Member

7c6f434c commented Sep 4, 2018

Thanks. Feel free to add yourself as a maintainer (or not to add, whatever you prefer).

@dtzWill
Copy link
Member Author

dtzWill commented Sep 4, 2018

So, printing still works without -lcups now?

Sure seems to, at least with -fresh. If there is an environment/setup that is known to be tricky/broken in this way, please LMK or check that it still works! :)

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-linux (full log)

Attempted: libreoffice-still, libreoffice-fresh

Partial log (click to expand)

[build CXX] accessibility/source/helper/acc_factory.cxx
[build CXX] accessibility/source/helper/accresmgr.cxx
[build CXX] accessibility/source/helper/characterattributeshelper.cxx
[build CXX] accessibility/source/helper/IComboListBoxHelper.cxx
[build CXX] accessibility/source/standard/accessiblemenubasecomponent.cxx
[build CXX] accessibility/source/standard/accessiblemenucomponent.cxx
[build CXX] accessibility/source/standard/accessiblemenuitemcomponent.cxx
building of '/nix/store/2412b1l6f6f404vw1b8y8zgipqnfd4jm-libreoffice-6.1.0.3.drv' timed out after 1800 seconds
cannot build derivation '/nix/store/qwcz3kpk7j9rmsi1gghaxdvg68hz74hl-libreoffice-6.1.0.3.drv': 1 dependencies couldn't be built
error: build of '/nix/store/1fkykl5i38b4p7hksmqlkm18vqbky48x-libreoffice-6.0.6.2.drv', '/nix/store/qwcz3kpk7j9rmsi1gghaxdvg68hz74hl-libreoffice-6.1.0.3.drv' failed

@dtzWill
Copy link
Member Author

dtzWill commented Sep 4, 2018

FWIW there's optional dconf support if that's preferred over gconf, but haven't tried it :).

@7c6f434c
Copy link
Member

7c6f434c commented Sep 5, 2018

I think there was a version where it always failed because of library paths. Hopefully it got better by now.

@7c6f434c 7c6f434c merged commit 856b891 into NixOS:master Sep 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@7c6f434c 7c6f434c 7c6f434c approved these changes

@jtojnar jtojnar Awaiting requested review from jtojnar

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@dtzWill @GrahamcOfBorg @7c6f434c