From 1e67c00b61d8f4098b25a13377ba0f055b6a0620 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 1 Apr 2023 12:15:45 +0000
Subject: [PATCH 1/2] enumer: 1.5.7 -> 1.5.8

Diff: https://github.com/dmarkham/enumer/compare/refs/tags/v1.5.7...v1.5.8
---
 pkgs/tools/misc/enumer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/enumer/default.nix b/pkgs/tools/misc/enumer/default.nix
index c7e7818d09ef..0b2cd46463b3 100644
--- a/pkgs/tools/misc/enumer/default.nix
+++ b/pkgs/tools/misc/enumer/default.nix
@@ -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";

From 6b615f3ca5d133ef62b48bfb7ce14f79a6945ee4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Apr 2023 12:56:03 +0000
Subject: [PATCH 2/2] evcc: 0.114.1 -> 0.115.0

https://github.com/evcc-io/evcc/releases/tag/0.115.0
---
 pkgs/servers/home-automation/evcc/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix
index 04a425169207..a6d5f1b3744e 100644
--- a/pkgs/servers/home-automation/evcc/default.nix
+++ b/pkgs/servers/home-automation/evcc/default.nix
@@ -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 = {