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

mdds: 1.3.1 -> 1.4.3 #60780

Merged
merged 1 commit into from May 3, 2019
Merged

mdds: 1.3.1 -> 1.4.3 #60780

merged 1 commit into from May 3, 2019

Conversation

c0bw3b
Copy link
Contributor

@c0bw3b c0bw3b commented May 2, 2019

Motivation for this change

Changelog: https://gitlab.com/mdds/mdds/blob/1.4.3/CHANGELOG
This update does not break LibreOffice builds anymore

Things done
  • 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@7c6f434c
Copy link
Member

7c6f434c commented May 2, 2019

But it still seems to trigger a LibreOffice rebiuld. Should mdds be dropped from the dependencies then?

@c0bw3b
Copy link
Contributor Author

c0bw3b commented May 2, 2019

I also believed it wasn't used by LO because of --without-system-mdds configure flags.
I'm currently building both LO with this update and will confirm that it succeeds.

@c0bw3b
Copy link
Contributor Author

c0bw3b commented May 3, 2019

I could complete both builds. LO is indeed using its internal mdds.

$ rg -F 'mdds' pr-60780/logs/libreoffice-still-unwrapped.log 
170:'libreoffice-6.1.5.2/external/tarballs/dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1-mdds-1.3.1.tar.bz2' -> '/nix/store/k8qp1yvc8km6nyh8xr9z93n4hryyh79c-mdds-1.3.1.tar.bz2'
171:'libreoffice-6.1.5.2/external/tarballs/mdds-1.3.1.tar.bz2' -> '/nix/store/k8qp1yvc8km6nyh8xr9z93n4hryyh79c-mdds-1.3.1.tar.bz2'
442:Skipping configure process.configure flags: --disable-dependency-tracking --prefix=/nix/store/brx75jnn1xm2ndld4n6hbd42g1jz66m4-libreoffice-6.1.5.2 --with-boost=/nix/store/ya2an7hw20dldyxsxch59jc0y5vrrgk8-boost-1.67.0-dev --with-boost-libdir=/nix/store/f1j7k91030y6cc0px849kgljdfxg9zpw-boost-1.67.0/lib --with-beanshell-jar=/nix/store/jrlk3jhjd140z0a7dc713ly6pkisvad5-bsh-2.0b5.jar --with-vendor=NixOS --with-commons-logging-jar=/nix/store/kjqw6gkmp08a45vcph29551bjb58gxbc-commons-logging-1.2/share/java/commons-logging-1.2.jar --disable-report-builder --disable-online-update --enable-python=system --enable-dbus --enable-release-build --disable-kde4 --enable-epm --with-jdk-home=/nix/store/s2sxjlkylrygydiq6zk8q0kzkcmxxd4m-openjdk-8u212-ga/lib/openjdk --with-ant-home=/nix/store/5x76vv361k4yqpylxwrgkbjd3mgrjw81-ant-1.10.2/lib/ant --with-system-cairo --with-system-libs --with-system-headers --with-system-openssl --with-system-libabw --with-system-libcmis --with-system-libwps --with-system-openldap --with-system-coinmp --with-alloc=system --without-junit --disable-libnumbertext --disable-fetch-external --disable-odk --disable-postgresql-sdbc --disable-firebird-sdbc --without-fonts --without-myspell-dicts --without-doxygen --with-system-beanshell --without-system-hsqldb --without-system-altlinuxhyph --without-system-lpsolve --without-system-libetonyek --without-system-libfreehand --without-system-liblangtag --without-system-libmspub --without-system-libpagemaker --without-system-libstaroffice --without-system-libepubgen --without-system-libqxp --without-system-mdds --without-system-orcus --without-system-xmlsec --with-parallelism=4 --with-lang=ca\ cs\ de\ en-GB\ en-US\ eo\ es\ fr\ hu\ it\ ja\ nl\ pl\ ru\ sl\ zh-CN
729:checking which mdds to use... internal
2015:[build LOC] mdds
2103:[build UPK] mdds-1.3.1.tar.bz2
7552:[build PAT] mdds
8118:[build BIN] mdds
8243:[build MOD] mdds
20737:[build CHK] mdds
$ rg -F 'mdds' pr-60780/logs/libreoffice-fresh-unwrapped.log 
172:'libreoffice-6.2.2.2/external/tarballs/25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81-mdds-1.4.3.tar.bz2' -> '/nix/store/8pkis3l966p2j4xkbk5k7xmwljk588fp-mdds-1.4.3.tar.bz2'
173:'libreoffice-6.2.2.2/external/tarballs/mdds-1.4.3.tar.bz2' -> '/nix/store/8pkis3l966p2j4xkbk5k7xmwljk588fp-mdds-1.4.3.tar.bz2'
443:Skipping configure process.configure flags: --disable-dependency-tracking --prefix=/nix/store/qkz25axmaq779c5pq1slf487gkjv37rf-libreoffice-6.2.2.2 --with-boost=/nix/store/ya2an7hw20dldyxsxch59jc0y5vrrgk8-boost-1.67.0-dev --with-boost-libdir=/nix/store/f1j7k91030y6cc0px849kgljdfxg9zpw-boost-1.67.0/lib --with-beanshell-jar=/nix/store/jrlk3jhjd140z0a7dc713ly6pkisvad5-bsh-2.0b5.jar --with-vendor=NixOS --with-commons-logging-jar=/nix/store/kjqw6gkmp08a45vcph29551bjb58gxbc-commons-logging-1.2/share/java/commons-logging-1.2.jar --disable-report-builder --disable-online-update --enable-python=system --enable-dbus --enable-release-build --disable-kde4 --enable-epm --with-jdk-home=/nix/store/s2sxjlkylrygydiq6zk8q0kzkcmxxd4m-openjdk-8u212-ga/lib/openjdk --with-ant-home=/nix/store/5x76vv361k4yqpylxwrgkbjd3mgrjw81-ant-1.10.2/lib/ant --with-system-cairo --with-system-libs --with-system-headers --with-system-openssl --with-system-libabw --with-system-libcmis --with-system-libwps --with-system-openldap --with-system-coinmp --with-alloc=system --without-junit --disable-libnumbertext --disable-fetch-external --enable-build-opensymbol --disable-odk --disable-postgresql-sdbc --disable-firebird-sdbc --without-fonts --without-myspell-dicts --without-doxygen --with-system-beanshell --without-system-hsqldb --without-system-altlinuxhyph --without-system-lpsolve --without-system-libetonyek --without-system-libfreehand --without-system-liblangtag --without-system-libmspub --without-system-libpagemaker --without-system-libstaroffice --without-system-libepubgen --without-system-libqxp --without-system-mdds --without-system-orcus --without-system-xmlsec --with-parallelism=4 --with-lang=ca\ cs\ de\ en-GB\ en-US\ eo\ es\ fr\ hu\ it\ ja\ nl\ pl\ ru\ sl\ zh-CN
737:checking which mdds to use... internal
2034:[build LOC] mdds
2122:[build UPK] mdds-1.4.3.tar.bz2
7618:[build PAT] mdds
8193:[build BIN] mdds
8328:[build MOD] mdds
20851:[build CHK] mdds
21600:[build SLC] mdds

So I guess system-mdds should be removed from LO build inputs.

@7c6f434c 7c6f434c merged commit 9dd83eb into NixOS:master May 3, 2019
@c0bw3b c0bw3b deleted the pkg/mdds branch May 3, 2019 08:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants