Merge pull request #119826 from jojosch/dbeaver-21.0.3

dbeaver: 21.0.2 -> 21.0.3
This commit is contained in:
Sandro 2021-04-19 01:25:29 +02:00 committed by GitHub
commit 347ddba6ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,6 +2,7 @@
, stdenv , stdenv
, copyDesktopItems , copyDesktopItems
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, makeDesktopItem , makeDesktopItem
, makeWrapper , makeWrapper
, fontconfig , fontconfig
@ -18,18 +19,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dbeaver-ce"; pname = "dbeaver-ce";
version = "21.0.2"; # When updating also update fetchedMavenDeps.sha256 version = "21.0.3"; # When updating also update fetchedMavenDeps.sha256
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dbeaver"; owner = "dbeaver";
repo = "dbeaver"; repo = "dbeaver";
rev = version; rev = version;
sha256 = "sha256-3EMSiEq1wdg4dxBU90RVVv0Hrf5dXPc1MPI0+WMk48k="; sha256 = "sha256-ItM8t+gqE0ccuuimfEMUddykl+xt2eZIBd3MbpreRwA=";
}; };
fetchedMavenDeps = stdenv.mkDerivation { fetchedMavenDeps = stdenv.mkDerivation {
name = "dbeaver-${version}-maven-deps"; name = "dbeaver-${version}-maven-deps";
inherit src; inherit src patches;
buildInputs = [ buildInputs = [
maven maven
@ -50,9 +51,18 @@ stdenv.mkDerivation rec {
dontFixup = true; dontFixup = true;
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = "sha256-xKlFFQXd2U513KZKQa7ttSFNX2gxVr9hNsvyaoN/rEE="; outputHash = "sha256-rsK/B39ogNu5nC41OfyAsLiwBz4gWyH+8Fj7E6+rOng=";
}; };
patches = [
# Fix eclipse-color-theme URL (https://github.com/dbeaver/dbeaver/pull/12133)
# After April 15, 2021 eclipse-color-theme.github.com no longer redirects to eclipse-color-theme.github.io
(fetchpatch {
url = "https://github.com/dbeaver/dbeaver/commit/65d65e2c2c711cc87fddcec425a6915aa80f4ced.patch";
sha256 = "sha256-pxOcRYkV/5o+tHcRhHDZ1TmZSHMnKBmkNTVAlIf9nUE=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
copyDesktopItems copyDesktopItems
makeWrapper makeWrapper