summary refs log tree commit diff
path: root/pkgs/development/tools/misc/openocd/default.nix
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2013-05-10 13:35:46 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2013-05-10 15:30:25 +0200
commit6ad413668e5465de75c627ccf3949250d19c0881 (patch)
tree3554bd4648b0982ba0079f8afd4137ea19f5ceec /pkgs/development/tools/misc/openocd/default.nix
parentd67fc9d6049c3c432014cb65cbf865cd678cc316 (diff)
downloadnixpkgs-6ad413668e5465de75c627ccf3949250d19c0881.tar
nixpkgs-6ad413668e5465de75c627ccf3949250d19c0881.tar.gz
nixpkgs-6ad413668e5465de75c627ccf3949250d19c0881.tar.bz2
nixpkgs-6ad413668e5465de75c627ccf3949250d19c0881.tar.lz
nixpkgs-6ad413668e5465de75c627ccf3949250d19c0881.tar.xz
nixpkgs-6ad413668e5465de75c627ccf3949250d19c0881.tar.zst
nixpkgs-6ad413668e5465de75c627ccf3949250d19c0881.zip
openocd: bump to version 0.7.0
OpenOCD 0.7.0 has grown a dependency on libusb1.
Diffstat (limited to 'pkgs/development/tools/misc/openocd/default.nix')
-rw-r--r--pkgs/development/tools/misc/openocd/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index 5c0b1a3b101..ef9fa0aface 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -1,12 +1,12 @@
-{stdenv, fetchurl, libftdi}:
+{stdenv, fetchurl, libftdi, libusb1 }:
 
 stdenv.mkDerivation rec {
   name = "openocd-${version}";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchurl {
     url = "http://downloads.sourceforge.net/project/openocd/openocd/${version}/openocd-${version}.tar.bz2";
-    sha256 = "0argjhff9x4ilgycics61kfgkvb6kkkhhhmj3fxcyydd8mscri7l";
+    sha256 = "0qwfyd821sy5p0agz0ybgn5nd7vplipw4mhm485ldj1hcmw7n8sj";
   };
 
   configureFlags = [ "--enable-ft2232_libftdi"
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
                      "--enable-ulink"
                      "--enable-stlink" ];
 
-  buildInputs = [ libftdi ];
+  buildInputs = [ libftdi libusb1 ];
 
   meta = {
     homepage = http://openocd.berlios.de;