cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #121570 from jojosch/dbeaver-21.0.4

Browse source 
dbeaver: 21.0.3 -> 21.0.4
This commit is contained in:
Luke Granger-Brown 2021-05-03 12:43:39 +01:00 committed by GitHub
commit 180f52186a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/applications/misc/dbeaver/default.nix
View file

@ -2,7 +2,6 @@
, stdenv , stdenv
, copyDesktopItems , copyDesktopItems
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, makeDesktopItem , makeDesktopItem
, makeWrapper , makeWrapper
, fontconfig , fontconfig
@ -19,18 +18,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dbeaver-ce"; pname = "dbeaver-ce";
version = "21.0.3"; # When updating also update fetchedMavenDeps.sha256 version = "21.0.4"; # When updating also update fetchedMavenDeps.sha256
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dbeaver"; owner = "dbeaver";
repo = "dbeaver"; repo = "dbeaver";
rev = version; rev = version;
sha256 = "sha256-ItM8t+gqE0ccuuimfEMUddykl+xt2eZIBd3MbpreRwA="; sha256 = "sha256-jV7Pe4MsLQnIrkDnlI2SrPzSjiDHM59GbMy4G7oeQK8=";
}; };
fetchedMavenDeps = stdenv.mkDerivation { fetchedMavenDeps = stdenv.mkDerivation {
name = "dbeaver-${version}-maven-deps"; name = "dbeaver-${version}-maven-deps";
inherit src patches; inherit src;
buildInputs = [ buildInputs = [
maven maven
@ -51,18 +50,9 @@ stdenv.mkDerivation rec {
dontFixup = true; dontFixup = true;
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = "sha256-rsK/B39ogNu5nC41OfyAsLiwBz4gWyH+8Fj7E6+rOng="; outputHash = "sha256-RspJTWVM0ZpAz4yDeKsG7wSHZ//bi3SSV5c0gbsqZKY=";
}; };
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