Unverified Commit c328e3ee authored by Maciej Krüger's avatar Maciej Krüger Committed by GitHub
Browse files

dbeaver-bin: 25.0.2 -> 25.0.4, improve update script (#404824)

parents d13f2e68 4c8b59b6

pkgs/by-name/db/dbeaver-bin/package.nix

+6 −6
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "dbeaver-bin";

  version = "25.0.2";

  version = "25.0.4";



  src =

    let
@@ -30,10 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
        aarch64-darwin = "macos-aarch64.dmg";

      };

      hash = selectSystem {

        x86_64-linux = "sha256-UmTy4Flxz/zIh3cLxRi7EhNDf0Ojc7fuzCbRKIE/+CQ=";

        aarch64-linux = "sha256-I+V/2kfdxGx8zNkH98b2685IQPbVPSe9++qS4QEg0LU=";

        x86_64-darwin = "sha256-8Qf69OHXPiqdMs//f1jbKbyKoll+oX+P+l3mpdOvraI=";

        aarch64-darwin = "sha256-bGxn8y9hvJyqj1/i5tScufO5/ZjdlOlPChmeL+DWwoY=";

        x86_64-linux = "sha256-ALtJIld7gT4pj+jGRkwMloq6B/ZBOMYZxws9N7xNNZg=";

        aarch64-linux = "sha256-Ka+jEI6y1BRqV83yDvu1yDzJfpUIxKKD+zehVHcNQ/o=";

        x86_64-darwin = "sha256-P8f0NlMjh/46RChQy8JIm71msqX023K2QaFEic2Br9M=";

        aarch64-darwin = "sha256-a9H9M1j6iPcrVcfDxCZHeZj6e55QH3XochXaL2OStlI=";

      };

    in

    fetchurl {
@@ -63,7 +63,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
  preInstall = ''

    # most directories are for different architectures, only keep what we need

    shopt -s extglob

    pushd ${lib.optionalString stdenvNoCC.hostPlatform.isDarwin "Contents/Eclipse/"}plugins/com.sun.jna_5.15.0.v20240915-2000/com/sun/jna/

    pushd ${lib.optionalString stdenvNoCC.hostPlatform.isDarwin "Contents/Eclipse/"}plugins/com.sun.jna_*/com/sun/jna/

    rm -r !(ptr|internal|linux-x86-64|linux-aarch64|darwin-x86-64|darwin-aarch64)/

    popd

  '';

pkgs/by-name/db/dbeaver-bin/update.sh

+3 −2
Original line number Diff line number Diff line 
#!/usr/bin/env nix-shell

#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts

BASEDIR="$(dirname "$0")/../../../.."



latestVersion=$(curl "https://api.github.com/repos/dbeaver/dbeaver/tags" | jq -r '.[0].name')

currentVersion=$(nix-instantiate --eval -E "with import ./. {}; dbeaver-bin.version" | tr -d '"')

currentVersion=$(nix-instantiate --eval -E "with import ${BASEDIR} {}; lib.getVersion dbeaver-bin" | tr -d '"')



echo "latest  version: $latestVersion"

echo "current version: $currentVersion"
@@ -22,5 +23,5 @@ do 
    prefetch=$(nix-prefetch-url "https://github.com/dbeaver/dbeaver/releases/download/$latestVersion/dbeaver-ce-$latestVersion-$2")

    hash=$(nix-hash --type sha256 --to-sri $prefetch)



    update-source-version dbeaver-bin $latestVersion $hash --system=$1 --ignore-same-version

    (cd "$BASEDIR" && update-source-version dbeaver-bin $latestVersion $hash --system=$1 --ignore-same-version)

done