nix: Use itm-tools from nixpkgs-21.05
This commit is contained in:
parent
40a53cc0d6
commit
edb1f64f26
@ -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;
|
||||
}
|
@ -8,8 +8,6 @@ with pkgs;
|
||||
let
|
||||
rustPlatform = callPackage ./nix/rustPlatform.nix {};
|
||||
|
||||
itm-tools = callPackage ./nix/itm-tools.nix { inherit rustPlatform; };
|
||||
|
||||
runHelp = writeShellScriptBin "run-help" ''
|
||||
echo "[Common Tools]"
|
||||
echo " run-openocd-f4x"
|
||||
@ -103,7 +101,7 @@ in
|
||||
stdenv.mkDerivation {
|
||||
name = "enc424j600-stm32-env";
|
||||
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
|
||||
runOpenOcdF4x runItmDemuxFollow
|
||||
exTxStm32f407 exTcpStm32f407
|
||||
|
Loading…
Reference in New Issue
Block a user