renet
/
ENC424J600
10
1
Fork 1
Code Issues 3 Pull Requests 1 Projects Releases Wiki Activity

nix: Use itm-tools from nixpkgs-21.05

This commit is contained in:
Harry Ho 2021-06-02 14:15:07 +08:00
parent 40a53cc0d6
commit edb1f64f26
2 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nix/itm-tools.nix
View File

@ -1,21 +0,0 @@
{ stdenv, fetchFromGitHub, rustPlatform, pkg-config }:
rustPlatform.buildRustPackage rec {
version = "2019-11-15";
pname = "itm-tools";
src = fetchFromGitHub {
owner = "japaric";
repo = "itm-tools";
rev = "e94155e44019d893ac8e6dab51cc282d344ab700";
sha256 = "19xkjym0i7y52cfhvis49c59nzvgw4906cd8bkz8ka38mbgfqgiy";
};
cargoPatches = [ ./itm-tools-cargo-lock.patch ];
cargoSha256 = "0is702s14pgvd5i2m8aaw3zcsshqrwj97mjgg3wikbc627pagzg7";
nativeBuildInputs = [ pkg-config ];
doCheck = false;
}

4
shell.nix
View File

@ -8,8 +8,6 @@ with pkgs;
let let
rustPlatform = callPackage ./nix/rustPlatform.nix {}; rustPlatform = callPackage ./nix/rustPlatform.nix {};
itm-tools = callPackage ./nix/itm-tools.nix { inherit rustPlatform; };
runHelp = writeShellScriptBin "run-help" '' runHelp = writeShellScriptBin "run-help" ''
echo "[Common Tools]" echo "[Common Tools]"
echo " run-openocd-f4x" echo " run-openocd-f4x"
@ -103,7 +101,7 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "enc424j600-stm32-env"; name = "enc424j600-stm32-env";
buildInputs = with rustPlatform.rust; [ buildInputs = with rustPlatform.rust; [
rustc cargo pkgs.gdb pkgs.openocd pkgs.tmux itm-tools rustc cargo pkgs.gdb pkgs.openocd pkgs.tmux pkgs.itm-tools
runHelp runTmuxEnv killTmuxEnv runHelp runTmuxEnv killTmuxEnv
runOpenOcdF4x runItmDemuxFollow runOpenOcdF4x runItmDemuxFollow
exTxStm32f407 exTcpStm32f407 exTxStm32f407 exTcpStm32f407