Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

dbeaver: 5.3.0 -> 6.0.2

With the required changes for the eclipse update.

(cherry picked from commit 6a6d6cdc0d5d36cc1e57442a945cb4944d15a931)

+8 -6
+5 -5
pkgs/applications/misc/dbeaver/default.nix
··· 1 { stdenv, fetchurl, makeDesktopItem, makeWrapper 2 - , fontconfig, freetype, glib, gtk2 3 , jdk, libX11, libXrender, libXtst, zlib }: 4 5 # The build process is almost like eclipse's. ··· 7 8 stdenv.mkDerivation rec { 9 name = "dbeaver-ce-${version}"; 10 - version = "6.0.0"; 11 12 desktopItem = makeDesktopItem { 13 name = "dbeaver"; ··· 20 }; 21 22 buildInputs = [ 23 - fontconfig freetype glib gtk2 24 jdk libX11 libXrender libXtst zlib 25 ]; 26 ··· 30 31 src = fetchurl { 32 url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; 33 - sha256 = "1v7zvvphkyw7x5ziysk4gs2rpgc4dr108fn4ja80kijs1jmj5dxr"; 34 }; 35 36 installPhase = '' ··· 43 44 makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \ 45 --prefix PATH : ${jdk}/bin \ 46 - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ])} \ 47 --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" 48 49 # Create desktop item.
··· 1 { stdenv, fetchurl, makeDesktopItem, makeWrapper 2 + , fontconfig, freetype, glib, gtk3 3 , jdk, libX11, libXrender, libXtst, zlib }: 4 5 # The build process is almost like eclipse's. ··· 7 8 stdenv.mkDerivation rec { 9 name = "dbeaver-ce-${version}"; 10 + version = "6.0.2"; 11 12 desktopItem = makeDesktopItem { 13 name = "dbeaver"; ··· 20 }; 21 22 buildInputs = [ 23 + fontconfig freetype glib gtk3 24 jdk libX11 libXrender libXtst zlib 25 ]; 26 ··· 30 31 src = fetchurl { 32 url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; 33 + sha256 = "12zqz9zi4jryvlk1rjxfl4jdj4a6n00018yyk95glfdrxda2xyib"; 34 }; 35 36 installPhase = '' ··· 43 44 makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \ 45 --prefix PATH : ${jdk}/bin \ 46 + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk3 libXtst ])} \ 47 --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" 48 49 # Create desktop item.
+3 -1
pkgs/top-level/all-packages.nix
··· 2212 2213 davfs2 = callPackage ../tools/filesystems/davfs2 { }; 2214 2215 - dbeaver = callPackage ../applications/misc/dbeaver { }; 2216 2217 dbench = callPackage ../development/tools/misc/dbench { }; 2218
··· 2212 2213 davfs2 = callPackage ../tools/filesystems/davfs2 { }; 2214 2215 + dbeaver = callPackage ../applications/misc/dbeaver { 2216 + jdk = jdk11; 2217 + }; 2218 2219 dbench = callPackage ../development/tools/misc/dbench { }; 2220