diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix deleted file mode 100644 index bd4504611758..000000000000 --- a/pkgs/applications/misc/dbeaver/default.nix +++ /dev/null @@ -1,140 +0,0 @@ -{ lib -, stdenv -, copyDesktopItems -, fetchFromGitHub -, makeDesktopItem -, makeWrapper -, fontconfig -, freetype -, glib -, gtk3 -, jdk17 -, libX11 -, libXrender -, libXtst -, zlib -, maven -, webkitgtk -, glib-networking -}: - -let - mavenJdk17 = maven.override { - jdk = jdk17; - }; -in -mavenJdk17.buildMavenPackage rec { - pname = "dbeaver"; - version = "22.2.2"; # When updating also update mvnHash - - src = fetchFromGitHub { - owner = "dbeaver"; - repo = "dbeaver"; - rev = version; - hash = "sha256-TUdtrhQ1JzqZx+QNauNA1P/+WDSSeOGIgGX3SdS0JTI="; - }; - - mvnHash = "sha256-ERZYDsPxp1YXteSmunFIgTGZUYqjZJhqrNytLnIUNBQ="; - mvnParameters = "-P desktop,all-platforms"; - - nativeBuildInputs = [ - copyDesktopItems - makeWrapper - ]; - - buildInputs = [ - fontconfig - freetype - glib - gtk3 - jdk17 - libX11 - libXrender - libXtst - zlib - ] ++ lib.optionals stdenv.isLinux [ - webkitgtk - glib-networking - ]; - - desktopItems = [ - (makeDesktopItem { - name = "dbeaver"; - exec = "dbeaver"; - icon = "dbeaver"; - desktopName = "dbeaver"; - comment = "SQL Integrated Development Environment"; - genericName = "SQL Integrated Development Environment"; - categories = [ "Development" ]; - }) - ]; - - installPhase = - let - productTargetPath = "product/community/target/products/org.jkiss.dbeaver.core.product"; - - platformMap = { - aarch64-darwin = "aarch64"; - aarch64-linux = "aarch64"; - x86_64-darwin = "x86_64"; - x86_64-linux = "x86_64"; - }; - - systemPlatform = platformMap.${stdenv.hostPlatform.system} or (throw "dbeaver not supported on ${stdenv.hostPlatform.system}"); - in - if stdenv.isDarwin then '' - runHook preInstall - - mkdir -p $out/Applications $out/bin - cp -r ${productTargetPath}/macosx/cocoa/${systemPlatform}/DBeaver.app $out/Applications - - sed -i "/^-vm/d; /bin\/java/d" $out/Applications/DBeaver.app/Contents/Eclipse/dbeaver.ini - - ln -s $out/Applications/DBeaver.app/Contents/MacOS/dbeaver $out/bin/dbeaver - - wrapProgram $out/Applications/DBeaver.app/Contents/MacOS/dbeaver \ - --prefix JAVA_HOME : ${jdk17.home} \ - --prefix PATH : ${jdk17}/bin - - runHook postInstall - '' else '' - runHook preInstall - - mkdir -p $out/ - cp -r ${productTargetPath}/linux/gtk/${systemPlatform}/dbeaver $out/dbeaver - - # Patch binaries. - interpreter=$(cat $NIX_CC/nix-support/dynamic-linker) - patchelf --set-interpreter $interpreter $out/dbeaver/dbeaver - - makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \ - --prefix PATH : ${jdk17}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk glib-networking ])} \ - --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - - mkdir -p $out/share/pixmaps - ln -s $out/dbeaver/icon.xpm $out/share/pixmaps/dbeaver.xpm - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://dbeaver.io/"; - description = "Universal SQL Client for developers, DBA and analysts. Supports MySQL, PostgreSQL, MariaDB, SQLite, and more"; - longDescription = '' - Free multi-platform database tool for developers, SQL programmers, database - administrators and analysts. Supports all popular databases: MySQL, - PostgreSQL, MariaDB, SQLite, Oracle, DB2, SQL Server, Sybase, MS Access, - Teradata, Firebird, Derby, etc. - ''; - sourceProvenance = with sourceTypes; [ - fromSource - binaryBytecode # dependencies from maven - ]; - license = licenses.asl20; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; - maintainers = with maintainers; [ jojosch mkg20001 ]; - mainProgram = "dbeaver"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b3060ead0e19..a313f1c88628 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -238,6 +238,7 @@ mapAliases ({ dart_stable = dart; # Added 2020-01-15 dart-sass-embedded = throw "dart-sass-embedded has been removed from nixpkgs, as is now included in Dart Sass itself."; dat = nodePackages.dat; + dbeaver = throw "'dbeaver' has been renamed to/replaced by 'dbeaver-bin'"; # Added 2024-05-16 deadcode = throw "'deadcode' has been removed, as upstream is abandoned since 2019-04-27. Use the official deadcode from 'gotools' package."; # Added 2023-12-28 deadpixi-sam = deadpixi-sam-unstable; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c44b81a497a1..b3a4f90d2b64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7189,8 +7189,6 @@ with pkgs; davfs2 = callPackage ../tools/filesystems/davfs2 { }; - dbeaver = callPackage ../applications/misc/dbeaver { }; - dbench = callPackage ../development/tools/misc/dbench { }; dclxvi = callPackage ../development/libraries/dclxvi { };