pyrox.dev
Merge pull request #119826 from jojosch/dbeaver-21.0.3
dbeaver: 21.0.2 -> 21.0.3
+14
-4
pkgs/applications/misc/dbeaver/default.nix
+14
-4
pkgs/applications/misc/dbeaver/default.nix
···
2
2
, stdenv
3
3
, copyDesktopItems
4
4
, fetchFromGitHub
5
+
, fetchpatch
5
6
, makeDesktopItem
6
7
, makeWrapper
7
8
, fontconfig
···
18
19
19
20
stdenv.mkDerivation rec {
20
21
pname = "dbeaver-ce";
21
-
version = "21.0.2"; # When updating also update fetchedMavenDeps.sha256
22
+
version = "21.0.3"; # When updating also update fetchedMavenDeps.sha256
22
23
23
24
src = fetchFromGitHub {
24
25
owner = "dbeaver";
25
26
repo = "dbeaver";
26
27
rev = version;
27
-
sha256 = "sha256-3EMSiEq1wdg4dxBU90RVVv0Hrf5dXPc1MPI0+WMk48k=";
28
+
sha256 = "sha256-ItM8t+gqE0ccuuimfEMUddykl+xt2eZIBd3MbpreRwA=";
28
29
};
29
30
30
31
fetchedMavenDeps = stdenv.mkDerivation {
31
32
name = "dbeaver-${version}-maven-deps";
32
-
inherit src;
33
+
inherit src patches;
33
34
34
35
buildInputs = [
35
36
maven
···
50
51
dontFixup = true;
51
52
outputHashAlgo = "sha256";
52
53
outputHashMode = "recursive";
53
-
outputHash = "sha256-xKlFFQXd2U513KZKQa7ttSFNX2gxVr9hNsvyaoN/rEE=";
54
+
outputHash = "sha256-rsK/B39ogNu5nC41OfyAsLiwBz4gWyH+8Fj7E6+rOng=";
54
55
};
56
+
57
+
patches = [
58
+
# Fix eclipse-color-theme URL (https://github.com/dbeaver/dbeaver/pull/12133)
59
+
# After April 15, 2021 eclipse-color-theme.github.com no longer redirects to eclipse-color-theme.github.io
60
+
(fetchpatch {
61
+
url = "https://github.com/dbeaver/dbeaver/commit/65d65e2c2c711cc87fddcec425a6915aa80f4ced.patch";
62
+
sha256 = "sha256-pxOcRYkV/5o+tHcRhHDZ1TmZSHMnKBmkNTVAlIf9nUE=";
63
+
})
64
+
];
55
65
56
66
nativeBuildInputs = [
57
67
copyDesktopItems