add dual toolchains

Author: Samir-Rashid

Makefile

@@ -114,10 +114,17 @@ test: examples
 		--target=thumbv7em-none-eabi --workspace
 	LIBTOCK_PLATFORM=hifive1 cargo clippy $(EXCLUDE_STD) \
 		--target=riscv32imac-unknown-none-elf --workspace
+	# example bash logic
+	if [ "${NO_RUSTUP}" = "1" ]; then
+		use_nightly_toolchain
+	fi
 	cd nightly && \
 		MIRIFLAGS="-Zmiri-strict-provenance -Zmiri-symbolic-alignment-check" \
 		cargo miri test $(EXCLUDE_MIRI) --manifest-path=../Cargo.toml \
 		--target-dir=target --workspace
+	if [ "${NO_RUSTUP}" = "1" ]; then
+		use_stable_toolchain
+	fi
 	echo '[ SUCCESS ] libtock-rs tests pass'
 
 # Helper functions to define make targets to build for specific (flash, ram,

shell.nix

@@ -6,6 +6,7 @@
 #
 # This nix expression creates an environment with necessary packages installed:
 #
+#  * `tockloader`
 #  * rust
 #
 # To use:
@@ -19,14 +20,31 @@ with builtins;
 let
   inherit (pkgs) stdenv lib;
 
-  rust_overlay = import (builtins.fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz");
+  # Tockloader v1.11.0
+  tockloader = import (pkgs.fetchFromGitHub {
+    owner = "tock";
+    repo = "tockloader";
+    rev = "v1.11.0";
+    sha256 = "sha256-bPEfpfOZOjOiazqRgn1cnqe4ohLPvocuENKoZx/Qw80=";
+  }) { inherit pkgs withUnfreePkgs; };
+
+  rust_overlay = import "${pkgs.fetchFromGitHub {
+    owner = "nix-community";
+    repo = "fenix";
+    rev = "1a92c6d75963fd594116913c23041da48ed9e020";
+    sha256 = "sha256-L3vZfifHmog7sJvzXk8qiKISkpyltb+GaThqMJ7PU9Y=";
+  }}/overlay.nix";
+
   nixpkgs = import <nixpkgs> { overlays = [ rust_overlay ]; };
 
   # Get a custom cross-compile capable Rust install of a specific channel and
   # build. Tock expects a specific version of Rust with a selection of targets
   # and components to be present.
   rustBuild = (
-    nixpkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml
+    nixpkgs.fenix.fromToolchainFile { file = ./rust-toolchain.toml; }
+  );
+  rustBuildNightly = (
+    nixpkgs.fenix.fromToolchainFile { file = ./nightly/rust-toolchain.toml; }
   );
 
 in
@@ -36,6 +54,7 @@ in
     buildInputs = with pkgs; [
       # --- Toolchains ---
       rustBuild
+      rustBuildNightly
       openocd
 
       # --- Convenience and support packages ---
@@ -48,6 +67,18 @@ in
 
       # --- CI support packages ---
       qemu
+      
+      # --- Flashing tools ---
+      # If your board requires J-Link to flash and you are on NixOS,
+      # add these lines to your system wide configuration.
+
+      # Enable udev rules from segger-jlink package
+      # services.udev.packages = [
+      #     pkgs.segger-jlink
+      # ];
+
+      # Add "segger-jlink" to your system packages and accept the EULA:
+      # nixpkgs.config.segger-jlink.acceptLicense = true;
     ];
 
     LD_LIBRARY_PATH="${stdenv.cc.cc.lib}/lib64:$LD_LIBRARY_PATH";
@@ -61,5 +92,8 @@ in
     shellHook = ''
       unset OBJCOPY
       unset OBJDUMP
+      
+      alias use_stable_toolchain=PATH=${rustBuild}/bin:$PATH
+      alias use_nightly_toolchain=PATH=${rustBuildNightly}/bin:$PATH
     '';
   }