public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #515 from bjornfor/openocd

Browse Source 
OpenOCD: bump from 0.6.1 to 0.7.0
This commit is contained in:
Evgeny Egorochkin 2013-05-10 08:18:52 -07:00
commit 9a2685af9b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/libftdi/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, libusb}: {stdenv, fetchurl, libusb}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libftdi-0.17"; name = "libftdi-0.20";
src = fetchurl { src = fetchurl {
url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz"; url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz";
sha256 = "1w5bzq4h4v9qah9dx0wbz6w7ircr91ack0sh6wqs8s5b4m8jgh6m"; sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii";
}; };
buildInputs = [ libusb ]; buildInputs = [ libusb ];

10
pkgs/development/tools/misc/openocd/default.nix
View File

@ -1,12 +1,12 @@
{stdenv, fetchurl, libftdi}: {stdenv, fetchurl, libftdi, libusb1 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "openocd-${version}"; name = "openocd-${version}";
version = "0.6.1"; version = "0.7.0";
src = fetchurl { src = fetchurl {
url = "http://downloads.sourceforge.net/project/openocd/openocd/${version}/openocd-${version}.tar.bz2"; url = "http://downloads.sourceforge.net/project/openocd/openocd/${version}/openocd-${version}.tar.bz2";
sha256 = "0argjhff9x4ilgycics61kfgkvb6kkkhhhmj3fxcyydd8mscri7l"; sha256 = "0qwfyd821sy5p0agz0ybgn5nd7vplipw4mhm485ldj1hcmw7n8sj";
}; };
configureFlags = [ "--enable-ft2232_libftdi" configureFlags = [ "--enable-ft2232_libftdi"
@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
"--enable-ulink" "--enable-ulink"
"--enable-stlink" ]; "--enable-stlink" ];
buildInputs = [ libftdi ]; buildInputs = [ libftdi libusb1 ];
meta = { meta = {
homepage = http://openocd.berlios.de; homepage = http://openocd.sourceforge.net/;
description = "OpenOCD, an on-chip debugger"; description = "OpenOCD, an on-chip debugger";
longDescription = longDescription =