public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #79026: blackmagic: v1.6.1-317-gc9c8b08 -> v1.6.1-409-g7a595ea

Browse Source
This commit is contained in:
Vladimír Čunát 2020-03-02 15:57:23 +01:00
commit 855f020404
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/tools/misc/blackmagic/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub { stdenv, lib, fetchFromGitHub
, gcc-arm-embedded, libftdi1 , gcc-arm-embedded, libftdi1, libusb, pkgconfig
, python, pythonPackages , python, pythonPackages
}: }:
@ -7,24 +7,25 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "blackmagic"; pname = "blackmagic";
version = "unstable-2019-08-13"; version = "unstable-2020-02-20";
# `git describe --always` # `git describe --always`
firmwareVersion = "v1.6.1-317-gc9c8b08"; firmwareVersion = "v1.6.1-409-g7a595ea";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "blacksphere"; owner = "blacksphere";
repo = "blackmagic"; repo = "blackmagic";
rev = "c9c8b089f716c31433432f5ee54c5c206e4945cf"; rev = "7a595ead255f2a052fe4561c24a0577112c9de84";
sha256 = "0175plba7h3r1p584ygkjlvg2clvxa2m0xfdcb2v8jza2vzc8ywd"; sha256 = "01kdm1rkj7ll0px882crf9w27d2ka8f3hcdmvhb9jwd60bf5dlap";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ nativeBuildInputs = [
gcc-arm-embedded gcc-arm-embedded pkgconfig
]; ];
buildInputs = [ buildInputs = [
libftdi1 libftdi1
libusb
python python
pythonPackages.intelhex pythonPackages.intelhex
]; ];
@ -60,7 +61,9 @@ stdenv.mkDerivation rec {
''; '';
homepage = https://github.com/blacksphere/blackmagic; homepage = https://github.com/blacksphere/blackmagic;
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ pjones emily ]; maintainers = with maintainers; [ pjones emily sorki ];
platforms = platforms.unix; # fails on darwin with
# arm-none-eabi-gcc: error: unrecognized command line option '-iframework'
platforms = platforms.linux;
}; };
} }

13
pkgs/development/tools/misc/blackmagic/helper.sh
View File

@ -23,11 +23,18 @@ make_platform() {
make clean make clean
make PROBE_HOST="$1" make PROBE_HOST="$1"
if [ "$1" = libftdi ]; then if [ "$1" = "libftdi" ]; then
mkdir -p "$out/bin"
install -m 0555 blackmagic "$out/bin" install -m 0555 blackmagic "$out/bin"
fi fi
if [ "$1" = "pc-hosted" ]; then
install -m 0555 blackmagic_hosted "$out/bin"
fi
if [ "$1" = "pc-stlinkv2" ]; then
install -m 0555 blackmagic_stlinkv2 "$out/bin"
fi
for f in $PRODUCTS; do for f in $PRODUCTS; do
if [ -r "$f" ]; then if [ -r "$f" ]; then
mkdir -p "$out/firmware/$1" mkdir -p "$out/firmware/$1"
@ -45,6 +52,8 @@ make -C libopencm3
# And now all of the platforms: # And now all of the platforms:
cd src cd src
mkdir -p "$out/bin"
for platform in platforms/*/Makefile.inc; do for platform in platforms/*/Makefile.inc; do
probe=$(basename "$(dirname "$platform")") probe=$(basename "$(dirname "$platform")")
make_platform "$probe" make_platform "$probe"