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

dbeaver: inits at 4.3.2 #33633

Merged

andir merged 2 commits into NixOS:master from samueldr:feature/dbeaver

Jan 10, 2018

Member

samueldr commented Jan 8, 2018

Motivation for this change

Adds dbeaver-ce to nixpkgs.

Details to be checked

The attribute name chosen is dbeaver, even though dbeaver comes in two variations, CE and EE. I didn't know whether I should have picked dbeaverCE even though EE isn't packaged (yet?). I personally am not going to package EE, as I am not using it.

The build process uses a "built" release, just like eclipse does. In fact, this is pretty much copied from eclipse's build process, since dbeaver is built on the tooling eclipse is made from.

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
Fits CONTRIBUTING.md.


          maintainers: Adds samueldr.

b6829f5

samueldr changed the title ~~Feature/dbeaver~~ dbeaver: inits at 4.3.2

GrahamcOfBorg added 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 labels

samueldr force-pushed the feature/dbeaver branch from eed31ab to aa5f4f6 Compare

January 9, 2018 00:07

andir added the 8.has: package (new) label

samueldr force-pushed the feature/dbeaver branch from aa5f4f6 to 669033f Compare

January 9, 2018 00:47

Member Author

samueldr commented Jan 9, 2018 •

edited

changes since initial push

Removes an assert that came from eclipse derivation.
Fixes interpreter in a more portable way.
Uses facilities provided by nix instead of untarring manually.

samueldr force-pushed the feature/dbeaver branch from 669033f to 7298771 Compare

January 9, 2018 01:06

andir requested changes

View reviewed changes

pkgs/applications/misc/dbeaver/default.nix Outdated

    
                  homepage = https://dbeaver.jkiss.org;

                  description = "Universal SQL Client for developers, SQL programmers, database administrators and analysts. Supports all popular databases: MySQL, PostgreSQL, MariaDB, SQLite, etc";

                  license = licenses.asl20;

                  platforms = platforms.linux;

Member

andir Jan 9, 2018

This is probably too permissive right now since you stated earlier that it only works on x86_64-linux.

pkgs/applications/misc/dbeaver/default.nix Outdated

    
              { stdenv, fetchurl, makeDesktopItem, makeWrapper

              , fontconfig, freetype, glib, gtk2

              , jdk, libX11, libXrender, libXtst, zlib

              , ... }:

Member

andir Jan 9, 2018

you don't need the ellipsis with pkgs.

pkgs/applications/misc/dbeaver/default.nix Outdated

    
                meta = with stdenv.lib; {

                  homepage = https://dbeaver.jkiss.org;

                  description = "Universal SQL Client for developers, SQL programmers, database administrators and analysts. Supports all popular databases: MySQL, PostgreSQL, MariaDB, SQLite, etc";

Member

andir Jan 9, 2018

personal taste: I prefer to wrap those long lines.

Contributor

orivej Jan 9, 2018

That's right for longDescription, but description must be short and fit on one line.

pkgs/applications/misc/dbeaver/default.nix Outdated

    
                };

                buildInputs = [

                  makeWrapper fontconfig freetype glib gtk2

Member

andir Jan 9, 2018

Shouldn't makeWrapper be a nativeBuildInput ?

samueldr force-pushed the feature/dbeaver branch from 7298771 to fdae62c Compare

January 9, 2018 15:45

Member Author

samueldr commented Jan 9, 2018

Changes requested have been made.

flokli requested changes

View reviewed changes

pkgs/applications/misc/dbeaver/default.nix Outdated

    
                ];

                src =

                  if stdenv.system == "x86_64-linux" then

Contributor

flokli Jan 10, 2018

Is this a leftover before setting meta.platforms, or is there a specific reason for adding that?

Member Author

samueldr Jan 10, 2018

As explained before, this was heavily based off of eclipse's derivation, which makes use of this construct, instead of setting a more specific meta.platforms. It's been removed, since it probably is redundant.

Member

andir commented Jan 10, 2018

@GrahamcOfBorg build dbeaver

GrahamcOfBorg reviewed

View reviewed changes

GrahamcOfBorg left a comment

Failure for system: aarch64-linux

Package ‘dbeaver-ce-4.3.2’ in /var/lib/gc-of-borg/nix-test-rs-2/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-2/pkgs/applications/misc/dbeaver/default.nix:62 is not supported on ‘aarch64-linux’, refusing to evaluate.

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

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

GrahamcOfBorg reviewed

View reviewed changes

GrahamcOfBorg left a comment

Failure for system: x86_64-darwin

Package ‘dbeaver-ce-4.3.2’ in /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-zoidberg/pkgs/applications/misc/dbeaver/default.nix:62 is not supported on ‘x86_64-darwin’, refusing to evaluate.

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

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

GrahamcOfBorg reviewed

View reviewed changes

GrahamcOfBorg left a comment

Success for system: x86_64-linux

glibPreFixupPhase
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/1ldjrhmffasm6zxpkzy4pylyy1jq8daf-dbeaver-ce-4.3.2
shrinking /nix/store/1ldjrhmffasm6zxpkzy4pylyy1jq8daf-dbeaver-ce-4.3.2/dbeaver/dbeaver
shrinking /nix/store/1ldjrhmffasm6zxpkzy4pylyy1jq8daf-dbeaver-ce-4.3.2/dbeaver/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.551.v20171108-1834/eclipse_1630.so
strip is /nix/store/wxn5gn8amxm1w0ikcx4gbs8a17wvss4j-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/1ldjrhmffasm6zxpkzy4pylyy1jq8daf-dbeaver-ce-4.3.2/bin 
patching script interpreter paths in /nix/store/1ldjrhmffasm6zxpkzy4pylyy1jq8daf-dbeaver-ce-4.3.2
checking for references to /tmp/nix-build-dbeaver-ce-4.3.2.drv-0 in /nix/store/1ldjrhmffasm6zxpkzy4pylyy1jq8daf-dbeaver-ce-4.3.2...
/nix/store/1ldjrhmffasm6zxpkzy4pylyy1jq8daf-dbeaver-ce-4.3.2

andir approved these changes

View reviewed changes


          dbeaver: inits at 4.3.2

a4d529d

samueldr force-pushed the feature/dbeaver branch from fdae62c to a4d529d Compare

January 10, 2018 14:24

andir merged commit 32f6c9a into NixOS:master

Member

andir commented Jan 10, 2018

Thank you for the contribution @samueldr ! 👍

samueldr deleted the feature/dbeaver branch

March 18, 2018 16:42

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment