From d67fc9d6049c3c432014cb65cbf865cd678cc316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 10 May 2013 13:34:59 +0200
Subject: [PATCH 1/3] libftdi: bump to version 0.20

Needed for openocd 0.7.0 (added in the next commit).

NOTE: There is also a libftdi 1.0 version, but openocd only needs 0.20
so I didn't bother. (libftdi 1.0 uses CMake build system and has lots of
changes.)
---
 pkgs/development/libraries/libftdi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix
index 6805434dcec..ef7a67b7fcd 100644
--- a/pkgs/development/libraries/libftdi/default.nix
+++ b/pkgs/development/libraries/libftdi/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, libusb}:
 
 stdenv.mkDerivation rec {
-  name = "libftdi-0.17";
+  name = "libftdi-0.20";
   
   src = fetchurl {
     url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz";
-    sha256 = "1w5bzq4h4v9qah9dx0wbz6w7ircr91ack0sh6wqs8s5b4m8jgh6m";
+    sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii";
   };
 
   buildInputs = [ libusb ];

From 6ad413668e5465de75c627ccf3949250d19c0881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 10 May 2013 13:35:46 +0200
Subject: [PATCH 2/3] openocd: bump to version 0.7.0

OpenOCD 0.7.0 has grown a dependency on libusb1.
---
 pkgs/development/tools/misc/openocd/default.nix | 8 ++++----
 1 file 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;

From 263b4116397f1a05778d9fb28b0f6bcb20063567 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 10 May 2013 14:21:31 +0200
Subject: [PATCH 3/3] openocd: update homepage

The old one still works, but it redirects to the new one:
http://openocd.sourceforge.net/
---
 pkgs/development/tools/misc/openocd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index ef9fa0aface..0f0c7462776 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libftdi libusb1 ];
 
   meta = {
-    homepage = http://openocd.berlios.de;
+    homepage = http://openocd.sourceforge.net/;
     description = "OpenOCD, an on-chip debugger";
 
     longDescription =