Merge pull request #119826 from jojosch/dbeaver-21.0.3

dbeaver: 21.0.2 -> 21.0.3

authored by Sandro and committed by GitHub 347ddba6 e19d3ff8

+14 -4
+14 -4
pkgs/applications/misc/dbeaver/default.nix
··· 2 , stdenv 3 , copyDesktopItems 4 , fetchFromGitHub 5 , makeDesktopItem 6 , makeWrapper 7 , fontconfig ··· 18 19 stdenv.mkDerivation rec { 20 pname = "dbeaver-ce"; 21 - version = "21.0.2"; # When updating also update fetchedMavenDeps.sha256 22 23 src = fetchFromGitHub { 24 owner = "dbeaver"; 25 repo = "dbeaver"; 26 rev = version; 27 - sha256 = "sha256-3EMSiEq1wdg4dxBU90RVVv0Hrf5dXPc1MPI0+WMk48k="; 28 }; 29 30 fetchedMavenDeps = stdenv.mkDerivation { 31 name = "dbeaver-${version}-maven-deps"; 32 - inherit src; 33 34 buildInputs = [ 35 maven ··· 50 dontFixup = true; 51 outputHashAlgo = "sha256"; 52 outputHashMode = "recursive"; 53 - outputHash = "sha256-xKlFFQXd2U513KZKQa7ttSFNX2gxVr9hNsvyaoN/rEE="; 54 }; 55 56 nativeBuildInputs = [ 57 copyDesktopItems
··· 2 , stdenv 3 , copyDesktopItems 4 , fetchFromGitHub 5 + , fetchpatch 6 , makeDesktopItem 7 , makeWrapper 8 , fontconfig ··· 19 20 stdenv.mkDerivation rec { 21 pname = "dbeaver-ce"; 22 + version = "21.0.3"; # When updating also update fetchedMavenDeps.sha256 23 24 src = fetchFromGitHub { 25 owner = "dbeaver"; 26 repo = "dbeaver"; 27 rev = version; 28 + sha256 = "sha256-ItM8t+gqE0ccuuimfEMUddykl+xt2eZIBd3MbpreRwA="; 29 }; 30 31 fetchedMavenDeps = stdenv.mkDerivation { 32 name = "dbeaver-${version}-maven-deps"; 33 + inherit src patches; 34 35 buildInputs = [ 36 maven ··· 51 dontFixup = true; 52 outputHashAlgo = "sha256"; 53 outputHashMode = "recursive"; 54 + outputHash = "sha256-rsK/B39ogNu5nC41OfyAsLiwBz4gWyH+8Fj7E6+rOng="; 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 + ]; 65 66 nativeBuildInputs = [ 67 copyDesktopItems