diff options
author | Emily <vcs@emily.moe> | 2019-08-13 17:05:34 -0700 |
---|---|---|
committer | Emily <vcs@emily.moe> | 2019-08-13 17:10:02 -0700 |
commit | d792c84f3516ab38bdcd76db57c7b32728532585 (patch) | |
tree | 3c5a479c795164d4583e83eadb27f46b2abd2207 /pkgs/development/tools/misc/blackmagic/default.nix | |
parent | ee877d7b194f564e6a27d327b866288f6e50b37c (diff) | |
download | nixpkgs-d792c84f3516ab38bdcd76db57c7b32728532585.tar nixpkgs-d792c84f3516ab38bdcd76db57c7b32728532585.tar.gz nixpkgs-d792c84f3516ab38bdcd76db57c7b32728532585.tar.bz2 nixpkgs-d792c84f3516ab38bdcd76db57c7b32728532585.tar.lz nixpkgs-d792c84f3516ab38bdcd76db57c7b32728532585.tar.xz nixpkgs-d792c84f3516ab38bdcd76db57c7b32728532585.tar.zst nixpkgs-d792c84f3516ab38bdcd76db57c7b32728532585.zip |
blackmagic: 1.6.1 -> unstable-2019-08-13
Diffstat (limited to 'pkgs/development/tools/misc/blackmagic/default.nix')
-rw-r--r-- | pkgs/development/tools/misc/blackmagic/default.nix | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix index 28146352835..ddc15f856b5 100644 --- a/pkgs/development/tools/misc/blackmagic/default.nix +++ b/pkgs/development/tools/misc/blackmagic/default.nix @@ -1,28 +1,30 @@ { stdenv, lib, fetchFromGitHub -, gcc-arm-embedded, binutils-arm-embedded, libftdi +, gcc-arm-embedded, libftdi1 , python, pythonPackages }: with lib; stdenv.mkDerivation rec { - name = "blackmagic-${version}"; - version = "1.6.1"; + pname = "blackmagic"; + version = "unstable-2019-08-13"; + # `git describe --always` + firmwareVersion = "v1.6.1-317-gc9c8b08"; src = fetchFromGitHub { owner = "blacksphere"; repo = "blackmagic"; - rev = "29386aee140e5e99a958727358f60980418b4c88"; - sha256 = "05x19y80mixk6blpnfpfngy5d41jpjvdqgjzkmhv1qc03bhyhc82"; + rev = "c9c8b089f716c31433432f5ee54c5c206e4945cf"; + sha256 = "0175plba7h3r1p584ygkjlvg2clvxa2m0xfdcb2v8jza2vzc8ywd"; fetchSubmodules = true; }; nativeBuildInputs = [ - gcc-arm-embedded binutils-arm-embedded + gcc-arm-embedded ]; buildInputs = [ - libftdi + libftdi1 python pythonPackages.intelhex ]; @@ -30,7 +32,7 @@ stdenv.mkDerivation rec { postPatch = '' # Prevent calling out to `git' to generate a version number: substituteInPlace src/Makefile \ - --replace '`git describe --always --dirty`' '${version}' + --replace '$(shell git describe --always --dirty)' '${firmwareVersion}' # Fix scripts that generate headers: for f in $(find scripts libopencm3/scripts -type f); do @@ -41,6 +43,8 @@ stdenv.mkDerivation rec { buildPhase = "${stdenv.shell} ${./helper.sh}"; installPhase = ":"; # buildPhase does this. + enableParallelBuilding = true; + meta = { description = "In-application debugger for ARM Cortex microcontrollers"; longDescription = '' @@ -56,7 +60,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/blacksphere/blackmagic; license = licenses.gpl3Plus; - maintainers = with maintainers; [ pjones ]; + maintainers = with maintainers; [ pjones emily ]; platforms = platforms.unix; }; } |