diff options
| author | Robin Gloster <mail@glob.in> | 2021-05-24 09:55:24 -0500 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2021-05-24 09:55:24 -0500 |
| commit | 4bc5fbef9d159e143fb7e2c3231932e6e76f667c (patch) | |
| tree | e2198f5c552e0667d838b8ec764ddb3a4d8f6dec /pkgs/applications/misc/dbeaver/default.nix | |
| parent | jq: fix build with structured-attrs on darwin (diff) | |
| parent | Merge pull request #123802 from superherointj/package-virtmanager-bugfix (diff) | |
| download | nixpkgs-origin/structured-attrs.tar.gz | |
Merge remote-tracking branch 'upstream/master' into structured-attrsorigin/structured-attrs
Diffstat (limited to 'pkgs/applications/misc/dbeaver/default.nix')
| -rw-r--r-- | pkgs/applications/misc/dbeaver/default.nix | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index fa5240b5333a..3227598e8cf3 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -2,7 +2,6 @@ , stdenv , copyDesktopItems , fetchFromGitHub -, fetchpatch , makeDesktopItem , makeWrapper , fontconfig @@ -18,19 +17,19 @@ }: stdenv.mkDerivation rec { - pname = "dbeaver-ce"; - version = "21.0.3"; # When updating also update fetchedMavenDeps.sha256 + pname = "dbeaver"; + version = "21.0.5"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-ItM8t+gqE0ccuuimfEMUddykl+xt2eZIBd3MbpreRwA="; + sha256 = "sha256-WMXhGXGHNjMJqob6A5S4+t9MDdJydAjdoY0u7T3ANbw="; }; fetchedMavenDeps = stdenv.mkDerivation { name = "dbeaver-${version}-maven-deps"; - inherit src patches; + inherit src; buildInputs = [ maven @@ -51,18 +50,9 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashAlgo = "sha256"; 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 = [ copyDesktopItems makeWrapper |