diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/misc/blackmagic')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix | 8 | ||||
| -rwxr-xr-x | nixpkgs/pkgs/development/tools/misc/blackmagic/helper.sh | 10 |
2 files changed, 5 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix b/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix index 6e733cfe28a..48ae364a26e 100644 --- a/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix @@ -7,15 +7,15 @@ with lib; stdenv.mkDerivation rec { pname = "blackmagic"; - version = "unstable-2020-02-20"; + version = "unstable-2020-08-05"; # `git describe --always` - firmwareVersion = "v1.6.1-409-g7a595ea"; + firmwareVersion = "v1.6.1-539-gdd74ec8"; src = fetchFromGitHub { owner = "blacksphere"; repo = "blackmagic"; - rev = "7a595ead255f2a052fe4561c24a0577112c9de84"; - sha256 = "01kdm1rkj7ll0px882crf9w27d2ka8f3hcdmvhb9jwd60bf5dlap"; + rev = "dd74ec8e6f734302daa1ee361af88dfb5043f166"; + sha256 = "18w8y64fs7wfdypa4vm3migk5w095z8nbd8qp795f322mf2bz281"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/tools/misc/blackmagic/helper.sh b/nixpkgs/pkgs/development/tools/misc/blackmagic/helper.sh index 278a758c186..bae57f633cf 100755 --- a/nixpkgs/pkgs/development/tools/misc/blackmagic/helper.sh +++ b/nixpkgs/pkgs/development/tools/misc/blackmagic/helper.sh @@ -23,18 +23,10 @@ make_platform() { make clean make PROBE_HOST="$1" - if [ "$1" = "libftdi" ]; then + if [ "$1" = "hosted" ]; then install -m 0555 blackmagic "$out/bin" 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 if [ -r "$f" ]; then mkdir -p "$out/firmware/$1" |