Unverified Commit fc97c49f authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

metabase: 0.52.8 -> 0.54.1, migrate to by-name, format (#389311)

parents 9bc920c0 d8187600

pkgs/servers/metabase/default.nix→pkgs/by-name/me/metabase/package.nix

+11 −8
Original line number Diff line number Diff line
@@ -3,17 +3,20 @@ 
  stdenv,

  fetchurl,

  makeWrapper,

  jdk11,

  jre_headless,

  nixosTests,

}:



stdenv.mkDerivation rec {

let

  jre = jre_headless;

in

stdenv.mkDerivation (finalAttrs: {

  pname = "metabase";

  version = "0.52.8";

  version = "0.54.1";



  src = fetchurl {

    url = "https://downloads.metabase.com/v${version}/metabase.jar";

    hash = "sha256-Z14BuKaSAMzlgdtqppc/3ItCxVZwE4E1EQUVMVR6JwQ=";

    url = "https://downloads.metabase.com/v${finalAttrs.version}/metabase.jar";

    hash = "sha256-gHLugoL3wCvlCzN2fNJtCt+1iSW+kKPzWPpqqHAn/D0=";

  };



  nativeBuildInputs = [ makeWrapper ];
@@ -22,12 +25,12 @@ stdenv.mkDerivation rec { 


  installPhase = ''

    runHook preInstall

    makeWrapper ${jdk11}/bin/java $out/bin/metabase --add-flags "-jar $src"

    makeWrapper ${lib.getExe jre} $out/bin/metabase --add-flags "-jar $src"

    runHook postInstall

  '';



  meta = with lib; {

    description = "Easy, open source way for everyone in your company to ask questions and learn from data";

    description = "Business Intelligence and Embedded Analytics tool";

    homepage = "https://metabase.com";

    sourceProvenance = with sourceTypes; [ binaryBytecode ];

    license = licenses.agpl3Only;
@@ -42,4 +45,4 @@ stdenv.mkDerivation rec { 
  passthru.tests = {

    inherit (nixosTests) metabase;

  };

}
 
})

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -2627,10 +2627,6 @@ with pkgs; 
          throw "mesonEmulatorHook may only be added to nativeBuildInputs when the target binaries can't be executed; however you are attempting to use it in a situation where ${stdenv.hostPlatform.config} can execute ${stdenv.targetPlatform.config}. Consider only adding mesonEmulatorHook according to a conditional based canExecute in your package expression."

      );













  metabase = callPackage ../servers/metabase {













    jdk11 = jdk11_headless;













  };



























  mkspiffs = callPackage ../tools/filesystems/mkspiffs { };





























  mkspiffs-presets = recurseIntoAttrs (callPackages ../tools/filesystems/mkspiffs/presets.nix { });