Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #237169 from mweinelt/evcc-0.118.0

evcc: 0.117.4 -> 0.118.0

authored by Martin Weinelt and committed by GitHub 3cd37134 98f7cdae

+14 -5
+1 -1
nixos/tests/evcc.nix
··· 46 46 type = "custom"; 47 47 status = { 48 48 source = "script"; 49 - cmd = "/bin/sh -c 'echo charger status F'"; 49 + cmd = "/bin/sh -c 'echo charger status A'"; 50 50 }; 51 51 enabled = { 52 52 source = "script";
+13 -4
pkgs/servers/home-automation/evcc/default.nix
··· 2 2 , buildGoModule 3 3 , fetchFromGitHub 4 4 , fetchNpmDeps 5 + , fetchpatch 5 6 , cacert 6 7 , go 7 8 , git ··· 16 17 17 18 buildGoModule rec { 18 19 pname = "evcc"; 19 - version = "0.117.4"; 20 + version = "0.118.0"; 20 21 21 22 src = fetchFromGitHub { 22 23 owner = "evcc-io"; 23 24 repo = pname; 24 25 rev = version; 25 - hash = "sha256-Qy2+E1//J6YKr/GAF0DItiyby78vCkfqg1pnvgBGSIQ="; 26 + hash = "sha256-LQtFmN4IyDj/SRTik+ML3h1/tMwnTQ13dQHnghcDuUo="; 26 27 }; 27 28 28 - vendorHash = "sha256-3EHdjRCzrty7BnaSG4TAf52jRl0AVS6baSl2XhYUH0A="; 29 + patches = [ 30 + (fetchpatch { 31 + # fix ISO15118 vehicle setup 32 + url = "https://github.com/evcc-io/evcc/commit/cc22337b422e4ee541a2c75740c039f2d029bd9b.patch"; 33 + hash = "sha256-Q+5Klpdv1cWVg716lbKl1JLwkr4LiLPRUoZHemFUQZc="; 34 + }) 35 + ]; 36 + 37 + vendorHash = "sha256-1YTVFn/DngzSQwYxGHCAaJl4ZnVj4au32YcpNo1m4w8="; 29 38 30 39 npmDeps = fetchNpmDeps { 31 40 inherit src; 32 - hash = "sha256-GmNyjXt5eskf59e9dt1OLB4gayBFbk/pG+7dJ5qoO+Q="; 41 + hash = "sha256-QRjOmanO+phyqgZb/cAyU0dFKI6T6o84MuObANZoYNE="; 33 42 }; 34 43 35 44 nativeBuildInputs = [