Update chiptool and form

Author: glaeqen

packages/chiptool.nix

@@ -2,11 +2,12 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
+  writeText,
 }:
 
 let
   forkOwner = "embassy-rs";
-  rev = "23011236c00a0b97edb2230b9f990b6c1b48a508";
+  rev = "6651cd0877390fdd3c76af037244e795bb867daa";
 in
 rustPlatform.buildRustPackage rec {
   pname = "chiptool";
@@ -16,9 +17,27 @@ rustPlatform.buildRustPackage rec {
     owner = forkOwner;
     repo = pname;
     rev = "${rev}";
-    hash = "sha256-bfxeLOBx9ipcyEg8M7ay1yZlLApnYTLQGf0CFh0r9Pw=";
+    hash = "sha256-l5a184UCqy/IeQ25hR43uWoSUg1cexLX2Dxd7mgOHKQ=";
   };
 
+  patches = [
+    # Patch-in the revision, there is no .git directory in src that the build-script could use
+    (writeText "chiptool-nix-generated-revision.patch" ''
+      --- a/src/generate/mod.rs
+      +++ b/src/generate/mod.rs
+      @@ -136,7 +136,7 @@ pub fn render(ir: &IR, opts: &Options) -> Result<TokenStream> {
+           root.items = TokenStream::new(); // Remove default contents
+       
+           let commit_info = {
+      -        let tmp = include_str!(concat!(env!("OUT_DIR"), "/commit-info.txt"));
+      +        let tmp = " (${rev} from github:kiteshield-ab/nix-utils#chiptool)";
+       
+               if tmp.is_empty() {
+                   " (untracked)"
+
+    '')
+  ];
+
   # Nix's Rust platform does not support git dependencies in lock files.
   # Replace `cargoHash`, copy the lockfile over and provide hashes for git dependencies.
   # https://github.com/NixOS/nixpkgs/blob/a84ebe20c6bc2ecbcfb000a50776219f48d134cc/doc/languages-frameworks/rust.section.md#importing-a-cargolock-file-importing-a-cargolock-file

packages/form.nix

@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "form";
-  version = "0.12.1";
+  version = "0.13.0";
 
   useFetchCargoVendor = true;
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-QwiYNmL5oncCw5oEygueyaaudBhydbtYhlpX+hA25zc=";
+    hash = "sha256-7+5HEyP7480UM5dydavoiclX3YTvW46V8r+Vpqt4xWk=";
   };
-  cargoHash = "sha256-DQSu4UhDF/Lxj12/vjZ6bCPyZpeceL9+5c/s9Gtou08=";
+  cargoHash = "sha256-ItNBQKye1GD01KFBubMLxksv8OCWIxya/LlZ9g6Jdg8=";
 
   meta = with lib; {
     description = "A small script to move inline modules into the proper directory structure";