Skip to content

dbeaver: 7.3.5 -> 21.0.0#114693

Merged
samueldr merged 1 commit intoNixOS:masterfrom
jojosch:dbeaver-21.0
Mar 1, 2021
Merged

dbeaver: 7.3.5 -> 21.0.0#114693
samueldr merged 1 commit intoNixOS:masterfrom
jojosch:dbeaver-21.0

Conversation

@jojosch
Copy link
Member

@jojosch jojosch commented Feb 28, 2021

Motivation for this change

New upstream release https://dbeaver.io/2021/02/28/dbeaver-21-0/.

Upstream switched to calendar versioning therefore the large version bump.

@samueldr you mentioned in #108417 (comment) that you tried to build under aarch64 - this should now be possible (see dbeaver/dbeaver@699f1e2). If you got time, can you try if building/running under aarch64 works now?

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)
/nix/store/yhv8qi7k96d9ly5v17qqnn2i05wynij8-dbeaver-ce-7.3.5	 1354920448
/nix/store/lijnnm6j2h6bi0y4srjmrv8qdn4rb5wh-dbeaver-ce-21.0.0	 1355222928

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Feb 28, 2021
@rmcgibbo
Copy link
Contributor

rmcgibbo commented Feb 28, 2021

It looks like the ofborg eval doesn't show aarch64. Maybe you want to update meta.platforms?

@r-rmcgibbo
Copy link

Result of nixpkgs-review pr 114693 at fe2de715 run on x86_64-linux 1

1 package built:
2 suggestions:
  • warning: missing-phase-hooks

    buildPhase should probably contain runHook preBuild and runHook postBuild.

    Near pkgs/applications/misc/dbeaver/default.nix:82:3:

       |
    82 |   buildPhase = ''
       |   ^
    
  • warning: missing-phase-hooks

    installPhase should probably contain runHook preInstall and runHook postInstall.

    Near pkgs/applications/misc/dbeaver/default.nix:86:3:

       |
    86 |   installPhase =
       |   ^
    

@samueldr
Copy link
Member

samueldr commented Feb 28, 2021

AArch64 won't work as it is, but I've been looking quickly and with some changes it works.

@jojosch might be able to help with figuring out the actual solution, as my method is bad.

@samueldr
Copy link
Member

samueldr commented Feb 28, 2021

Weird flex, but here it is running on an aarch64 desktop^W phone.

photos

dbeaver1
dbeaver2

The changes I did to make it run, they are not change propositions, but a proof of concept showing the build should work.

https://gist.github.com/45e28c83bda842b5a1b8f36cc5dbeef8

Let me explain. The aarch64 environment(?) in the pom.xml file is not activated by default. I don't know maven. I guess if we "activated" it, rather than whatever the default is, it would be built just fine.

If we don't force aarch64, it will build something on aarch64, but it will be an x86_64 binary! Weird! (But probably expected.)

@jojosch
Copy link
Member Author

jojosch commented Mar 1, 2021

Added -P desktop,all-platforms to both maven commands to build both profiles.

Previously a build on aarch64 (nix-on-droid) resulted in a x86_64 binary (as @samueldr mentioned) and now results in a proper aarch64 binary (dbeaver: ELF 64-bit LSB pie executable, ARM aarch64, version 1 (SYSV), dynamically linked, interpreter /nix/store/081f9rv8l22zhsns0gdw6mgpd5fcdffh-glibc-2.32-37/lib/ld-linux-aarch64.so.1 ...).

I also added the missing runHook's to buildPhase/installPhase.

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Mar 1, 2021
@samueldr
Copy link
Member

samueldr commented Mar 1, 2021

By the way, I wasn't running on nix-on-droid, but on Mobile NixOS, "bare metal" on the Linux OS, like any other standard enough aarch64-linux target.

And I confirm it works as expected still.

@samueldr samueldr merged commit c0013a0 into NixOS:master Mar 1, 2021
@jojosch jojosch deleted the dbeaver-21.0 branch March 1, 2021 21:03
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: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

Comments