Unverified Commit f943ed92 authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #224363 from mweinelt/evcc-0.115.0 

evcc: 0.114.1 -> 0.115.0; enumer: 1.5.7 -> 1.5.8
parents 11e6215e 6b615f3c

pkgs/servers/home-automation/evcc/default.nix

+7 −7
Original line number Diff line number Diff line
@@ -16,16 +16,16 @@ 


buildGo120Module rec {

  pname = "evcc";

  version = "0.114.1";

  version = "0.115.0";



  src = fetchFromGitHub {

    owner = "evcc-io";

    repo = pname;

    rev = version;

    hash = "sha256-c+XHSO6waDyju8oXFWGYeaCCqyaYdU2JLXr+NDXijdU=";

    hash = "sha256-vA2HpkzNuHulUUZKL6Wm2Y052v4JdC5V8hADq78rK5c=";

  };



  vendorHash = "sha256-O58Y9mfHmNUWtHmdO3hvZQbFlcqfZs0GmQDcx2RKRUs=";

  vendorHash = "sha256-/TqA2WTNJ3cSrqLgEly1KHGvMA/MQ+p364G0ne0ezfQ=";



  npmDeps = fetchNpmDeps {

    inherit src;
@@ -62,10 +62,6 @@ buildGo120Module rec { 
    "-w"

  ];



  npmInstallFlags = [

    "--legacy-peer-deps"

  ];



  preBuild = ''

    make ui

  '';
@@ -75,6 +71,10 @@ buildGo120Module rec { 
  preCheck = ''

    # requires network access

    rm meter/template_test.go

    rm charger/template_test.go

    rm vehicle/template_test.go

    # times out (since 0.115.0, bisected to 31ab90e6381b30278731bd01effa62bdfb884ebc)

    rm util/templates/render_testing.go

  '';



  passthru = {

pkgs/tools/misc/enumer/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -6,16 +6,16 @@ 


buildGoModule rec {

  pname = "enumer";

  version = "1.5.7";

  version = "1.5.8";



  src = fetchFromGitHub {

    owner = "dmarkham";

    repo = "enumer";

    rev = "refs/tags/v${version}";

    hash = "sha256-2fVWrrWOiCtg7I3Lul2PgQ2u/qDEDioPSB61Tp0rfEo=";

    hash = "sha256-+YTsXYWVmJ32V/Eptip3WAiqIYv+6nqbdph0K2XzLdc=";

  };



  vendorSha256 = "sha256-BmFv0ytRnjaB7z7Gb+38Fw2ObagnaFMnMhlejhaGxsk=";

  vendorHash = "sha256-+dCitvPz2JUbybXVJxUOo1N6+SUPCSjlacL8bTSlb7w=";



  meta = with lib; {

    description = "Go tool to auto generate methods for enums";