arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-15 20:19:23 +00:00
Code Issues Releases Wiki Activity

ci(nix): use ST fork of OpenOCD

Browse Source 
[skip_ci]
This commit is contained in:
Martin Milata 2023-09-29 15:28:13 +02:00
parent 6668f47666
commit 5fb2551944
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ci/shell.nix
View File

@ -59,6 +59,20 @@ let
# to use official binary, remove rustfmt from buildInputs and add it to extensions: # to use official binary, remove rustfmt from buildInputs and add it to extensions:
extensions = [ "rust-src" "clippy" "rustfmt" ]; extensions = [ "rust-src" "clippy" "rustfmt" ];
}; };
openocd-stm = (nixpkgs.openocd.overrideAttrs (oldAttrs: {
src = nixpkgs.fetchFromGitHub {
owner = "STMicroelectronics";
repo = "OpenOCD";
rev = "openocd-cubeide-v1.12.0";
sha256 = "7REQi9pcT6pn8yiAMpQpRQ+0ouMQelcciMAHyUonkVA=";
};
version = "stm-cubeide-v1.12.0";
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ nixpkgs.autoreconfHook ];
# following two lines can be removed after bumping nixpkgs to newer than c58e6fbf258df1572b535ac1868ec42faf7675dd
buildInputs = oldAttrs.buildInputs ++ [ nixpkgs.jimtcl nixpkgs.libjaylink ];
configureFlags = oldAttrs.configureFlags ++ [ "--disable-internal-jimtcl" "--disable-internal-libjaylink" ];
}));
llvmPackages = nixpkgs.llvmPackages_14; llvmPackages = nixpkgs.llvmPackages_14;
# see pyright/README.md for update procedure # see pyright/README.md for update procedure
pyright = nixpkgs.callPackage ./pyright {}; pyright = nixpkgs.callPackage ./pyright {};
@ -125,7 +139,7 @@ stdenvNoCC.mkDerivation ({
dejavu_fonts dejavu_fonts
] ++ lib.optionals devTools [ ] ++ lib.optionals devTools [
gdb gdb
openocd openocd-stm
] ++ lib.optionals (devTools && acceptJlink) [ ] ++ lib.optionals (devTools && acceptJlink) [
nrfutil nrfutil
nrfconnect nrfconnect