From 36623b8227ea86869c99fe9a09c038eb5d1d74c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 17 Apr 2010 10:15:47 +0000
Subject: [PATCH] Updating openocd and libftdi (for the sheevaplug jtag)

svn path=/nixpkgs/trunk/; revision=21139
---
 pkgs/development/libraries/libftdi/default.nix  | 4 ++--
 pkgs/development/tools/misc/openocd/default.nix | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix
index 4667f44b1885..6805434dcecf 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.16";
+  name = "libftdi-0.17";
   
   src = fetchurl {
     url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz";
-    sha256 = "1n12lcvpzmkph12gmg7i7560s0yly2gjgwhxh2h2inq93agg1xv2";
+    sha256 = "1w5bzq4h4v9qah9dx0wbz6w7ircr91ack0sh6wqs8s5b4m8jgh6m";
   };
 
   buildInputs = [ libusb ];
diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index 1e7cdeb39f4d..c6f34f8e8371 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, libftdi}:
 
 stdenv.mkDerivation {
-  name = "openocd-0.3.1";
+  name = "openocd-0.4.0";
 
   src = fetchurl {
-    url = "http://download.berlios.de/openocd/openocd-0.3.1.tar.bz2";
-    sha256 = "1ww66gj4mn3ih4k0b2w21795gfl6g53nm41irii9n7bbjn2dmgrp";
+    url = "http://download.berlios.de/openocd/openocd-0.4.0.tar.bz2";
+    sha256 = "1c9j8s3mqgw5spv6nd4lqfkd1l9jmjipi0ya054vnjfsy2617kzv";
   };