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

mysql-workbench: 8.0.15 → 8.0.19 #82362

Merged
merged 3 commits into from Mar 14, 2020
Merged

mysql-workbench: 8.0.15 → 8.0.19 #82362

merged 3 commits into from Mar 14, 2020

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Mar 12, 2020

Motivation for this change

Closes: #78770

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Copy link
Member

@das-g das-g left a comment

Choose a reason for hiding this comment

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

This PR's changes to mysql-workbench are nicely split into pure formatting / code style changes on one hand (934bb11) and semantic changes on the other (5b7f60a).

Can you similarly split up the changes to libmysqlconnectorcpp which are currently all in a67a72d?

pkgs/applications/misc/mysql-workbench/default.nix Outdated Show resolved Hide resolved
@jtojnar
Copy link
Contributor Author

jtojnar commented Mar 12, 2020

Seems to fail to build at the moment:

FAILED: library/forms/swig/CMakeFiles/_cairo.dir/cairoPYTHON_wrap.cxx library/forms/swig/cairo.py
cd /build/mysql-workbench-community-8.0.19-src/build/library/forms/swig && /nix/store/axr6w82a3l3rvn415jvaly4h1n01d0m6-cmake-3.16.4/bin/cmake -E make_directory /build/mysql-workbench-community-8.0.19-src/build/library/forms/swig /build/mysql-workbench-community-8.0.19-src/build/library/forms/swig/CMakeFiles/_cairo.dir && /nix/store/axr6w82a3l3rvn415jvaly4h1n01d0m6-cmake-3.16.4/bin/cmake -E env SWIG_LIB=/nix/store/p0qmm7rsajp7yasxlvkql9qdg2crk4f5-swig-3.0.12/share/swig/3.0.12 /nix/store/p0qmm7rsajp7yasxlvkql9qdg2crk4f5-swig-3.0.12/bin/swig -python -w312 -DCAIRO_HAS_PNG_FUNCTIONS=1 -fcompact -DSWIG_PYTHON_LEGACY_BOOL -I/var/empty/include -outdir /build/mysql-workbench-community-8.0.19-src/build/library/forms/swig -c++ -interface _cairo -o /build/mysql-workbench-community-8.0.19-src/build/library/forms/swig/CMakeFiles/_cairo.dir/cairoPYTHON_wrap.cxx /build/mysql-workbench-community-8.0.19-src/library/forms/swig/cairo.i
/build/mysql-workbench-community-8.0.19-src/library/forms/swig/cairo.i:180: Error: Unable to find 'cairo/cairo.h'
[558/788] Building CXX object library/forms/CMakeFiles/mforms.dir/home_screen_connections.cpp.o

@jtojnar
Copy link
Contributor Author

jtojnar commented Mar 12, 2020

I only split the formatting changes when it would obscure the other changes. The libmysqlconnectorcpp change is so small I do not see a need for splitting it in two.

This has been seriously outdated:

* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-1-1-10.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-1-1-11.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-1-1-12.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-1-1-13.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-2-0-1.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-2-0-2.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-2-0-3.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-2-0-4.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-5.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-6.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-7.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-8-through-10.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-11.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-12.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-13.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-14.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-15.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-16.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-17.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-18.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-19.html

Expression changes:

* Format with nixpkgs-fmt.
* Move cmake to nativeBuildInputs.
* Use OpenSSL from the system as using the bundled version is now optional.
* Use MysQL 8.0 since this is supposed to be used with that version.
* Explicitly enable the now legacy JDBC library used by mysql-workbench.
* Remove unnecessary MYSQL_LIB_DIR flag. MySQL will be found automatically.
    * We just need the build script know it is not a static library.
@jtojnar jtojnar force-pushed the mysql-wb branch 2 times, most recently from c1fbc3f to d2751d5 Compare March 12, 2020 05:40
@jtojnar jtojnar marked this pull request as ready for review March 12, 2020 05:40
* https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-16.html
* https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-17.html
* https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-18.html
* https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-19.html

The release notes contain the following:

Important Note: MySQL Workbench 8.0.19 is unable to open a new connection to MySQL Server from the home screen if the server is not started and you cannot start a server by using the Workbench Administration feature. Administrative and SQL editing tasks require an online server for the duration of this issue. Feature tasks that you performed with an offline server in previous releases now return an error message indicating that the server is unreachable.

but it is clearly better than having it broken.
@jtojnar jtojnar merged commit f5fade9 into NixOS:master Mar 14, 2020
@jtojnar jtojnar deleted the mysql-wb branch March 14, 2020 03:41
@aanderse
Copy link
Member

@jtojnar looks like mysql-workbench is broke on 20.03. Would you be willing to backport please?

@jtojnar
Copy link
Contributor Author

jtojnar commented Mar 26, 2020

Backported:

[release-20.03 4c122542ceb] mysql-workbench: format with nixpkgs-fmt
 Date: Wed Mar 11 21:24:13 2020 +0100
 1 file changed, 82 insertions(+), 18 deletions(-)
Auto-merging pkgs/top-level/all-packages.nix
[release-20.03 f5e8ef656fe] libmysqlconnectorcpp: 1.1.9 → 8.0.19
 Date: Wed Mar 11 21:39:12 2020 +0100
 2 files changed, 27 insertions(+), 10 deletions(-)
[release-20.03 f6ab55b31c0] mysql-workbench: 8.0.15 → 8.0.19
 Date: Thu Mar 12 01:08:10 2020 +0100
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/misc/mysql-workbench/fix-swig-build.patch

@aanderse
Copy link
Member

Thanks 🎉

@jtojnar jtojnar added the 8.has: upstream changes reviewed Reviewer checked the changelogs/commit logs associated with the release and did not find any issues. label Jul 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: upstream changes reviewed Reviewer checked the changelogs/commit logs associated with the release and did not find any issues. 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

mysql-workbench fails to build due to warnings
3 participants