Attempt to fix AtTiny85 builds

.editorconfig

@@ -15,7 +15,7 @@ indent_size = unset
 [*.lock]
 indent_style = unset
 
-[*.{adoc,envrc,nix,nu,yaml,yml}]
+[*.{adoc,envrc,lock,nix,nu,yaml,yml}]
 max_line_length = off
 
 [{justfile,.justfile,*.just,*.rs}]

.justfile

@@ -24,7 +24,7 @@ build board="attiny85" profile="dev":
 alias fmt := format
 
 format:
-    treefmt
+    treefmt-nix
 
 alias f := run
 alias flash := run
@@ -78,8 +78,8 @@ update:
     nix run ".#update-nixos-release"
     nix flake update
     cd "{{ justfile_directory() }}/boards/attiny85"
-    cargo update
+    cargo update --verbose
     cd "{{ justfile_directory() }}/boards/pico"
-    cargo update
+    cargo update --verbose
     cd "{{ justfile_directory() }}/boards/qt-py-ch32v203"
-    cargo update
+    cargo update --verbose

boards/attiny85/.justfile

@@ -26,4 +26,4 @@ alias up := update
 
 update:
     nix flake update
-    cargo update
+    cargo update --verbose

boards/attiny85/Cargo.toml

@@ -7,15 +7,16 @@ homepage = "https://github.com/jwillikers/pwm-fan-controller"
 description = "A simple PWM fan controller for microcontrollers"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/jwillikers/pwm-fan-controller.git"
+# autobin = false
 
 [dependencies]
-embedded-hal = "1.0.0"
-nb = "1.1.0"
-panic-halt = "0.2.0"
-ufmt = "0.2.0"
+embedded-hal = "1.0"
+nb = "1.1"
+panic-halt = "1.0"
+ufmt = "0.2"
 
 #[dependencies.avr-device]
-#version = "0.4.0"
+#version = "0.6.0"
 #features = ["attiny85"]
 
 [dependencies.avr-hal-generic]

boards/attiny85/package.nix

@@ -2,8 +2,6 @@
   cargoArtifacts,
   commonArgs,
   craneLib,
-  # deadnix: skip
-  stdenv,
 }:
 craneLib.buildPackage commonArgs
 // {

boards/attiny85/rust-toolchain.toml

@@ -1,5 +1,6 @@
 [toolchain]
 channel = "nightly-2024-03-22"
+# channel = "nightly"
 components = ["llvm-tools-preview", "rust-src"]
 profile = "minimal"
 targets = ["avr-unknown-none-attiny85.json"]

boards/pico/.justfile

@@ -50,4 +50,4 @@ alias up := package
 
 update:
     nix flake update
-    cargo update
+    cargo update --verbose

boards/qt-py-ch32v203/.justfile

@@ -37,4 +37,4 @@ alias up := package
 
 update:
     nix flake update
-    cargo update
+    cargo update --verbose

flake.nix

@@ -92,7 +92,7 @@
               p:
               (p.rust-bin.fromRustupToolchainFile ./boards/attiny85/rust-toolchain.toml).override {
                 # Remove the avr-unknown-none-attiny85.json file from the list of targets for the Rust toolchain.
-                # Nix doesn't really support target JSON files specified in the toolchain and even if it did, it won't be ablet to build a toolchain for AVR.
+                # Nix doesn't really support target JSON files specified in the toolchain and even if it did, it won't be able to build a toolchain for AVR.
                 # The AVR toolchain is unstable and does not include std.
                 targets = [ p.stdenv.hostPlatform.rust.rustcTarget ];
               };
@@ -140,15 +140,17 @@
                   # will avoid IFD entirely but will require manually keeping the file
                   # up to date!
                   "${rustToolchain.passthru.availableComponents.rust-src}/lib/rustlib/src/rust/Cargo.lock"
+                  # "${rustToolchain.passthru.availableComponents.rust-src}/lib/rustlib/src/rust/library/Cargo.lock"
                 ];
               };
               cargoExtraArgs = "--target avr-unknown-none-attiny85.json -Z build-std=core";
               inherit nativeBuildInputs;
 
               extraDummyScript = ''
                 cp --archive ${./boards/attiny85/avr-unknown-none-attiny85.json} $out/avr-unknown-none-attiny85.json
-                rm --force --recursive $out/src/bin/crane-dummy-*
+                (shopt -s globstar; rm --force --recursive $out/**/src/bin/crane-dummy-*)
               '';
+              #   # rm --force --recursive $out/src/bin/crane-dummy-*
             };
 
             cargoArtifacts = craneLib.buildDepsOnly commonArgs;