From 519bc0cf944afb3bbe9830f742a44bde2c8cd64a Mon Sep 17 00:00:00 2001 From: Jakob Lechner Date: Mon, 24 Jun 2024 00:26:17 +0200 Subject: [PATCH] Update VESC tool --- pkgs/vesc-tool/firmware.nix | 6 ++---- pkgs/vesc-tool/tool.nix | 13 ++++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/vesc-tool/firmware.nix b/pkgs/vesc-tool/firmware.nix index cb16051..50613f9 100644 --- a/pkgs/vesc-tool/firmware.nix +++ b/pkgs/vesc-tool/firmware.nix @@ -13,10 +13,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "vedderb"; repo = "bldc"; - rev = "6.00"; - sha256 = "XeIS+3SOKeTkbsx/aCy0FRw/LVXBbLpAqz6upN5HJUY="; - #rev = "5b6cc075d3cfa62bd52a05fad0195fae114d914c"; - #sha256 = "SB/mQEYY2Bi2xl5qniKdShMQ0vdrVuLtiWWH4D1U0tw="; + rev = "f7c2b34e1cff2234cae98be3abf0cd50e249558f"; # release_6_02 + sha256 = "BJwxmtYjQhxV8O0Ze9k0cPz0ubJnq5ePUd/9tGx35jo="; fetchSubmodules = true; }; diff --git a/pkgs/vesc-tool/tool.nix b/pkgs/vesc-tool/tool.nix index 2a23fa3..ee9f906 100644 --- a/pkgs/vesc-tool/tool.nix +++ b/pkgs/vesc-tool/tool.nix @@ -24,8 +24,10 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "vedderb"; repo = "vesc_tool"; - rev = "6d9d6d7f17c8756a272c267659849ea9c9404efa"; - sha256 = "EXXWAwX3yPirhe83wz5/vEectieHeUAkIla7ICxzMow="; + #rev = "f3c6fe5f5dcf0cb2fba7676204ea3db1dc8ff4ee"; # release_6_02 + rev = "4a0edea5846d973e5da510fbe11ce009aaf21a96"; + sha256 = "18ue6YBVcggr4qyHpCorrh01oeo4i58Jgp9Twaq+DlI="; + fetchSubmodules = true; }; @@ -64,7 +66,8 @@ stdenv.mkDerivation rec { cp build/lin/* $out/bin ''; - postFixup = '' - wrapQtApp $out/bin/vesc_tool_6.02 - ''; + #postFixup = '' + # #wrapQtApp $out/bin/vesc_tool_6.05 + # #Builder called die: Cannot wrap '/nix/store/yppigini483d9kj8sn1cbjxp4cy81qqj-vesc_tool-master/bin/vesc_tool_6.02' because it is not an executable file + #''; }