b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

openocd: 0.11.0-rc1 -> 0.11.0

Browse source
This commit is contained in:
Pavol Rusnak 2021-03-09 11:55:51 +01:00
parent d83286570c
commit 71e1536f10
No known key found for this signature in database
GPG key ID: 91F3B339B9A02A3D
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/tools/misc/openocd/default.nix
View file

@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchgit
, autoreconfHook
, fetchurl
, pkg-config
, hidapi
, libftdi1
@ -10,16 +9,13 @@
stdenv.mkDerivation rec {
pname = "openocd";
version = "0.11.0-rc1";
src = fetchgit {
url = "https://git.code.sf.net/p/openocd/code";
rev = "v${version}";
sha256 = "15g8qalyxhdp0imfrg8mxwnp0nimd836fc5laaavajw49gcm65m4";
fetchSubmodules = true;
version = "0.11.0";
src = fetchurl {
url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.bz2";
sha256 = "0z8y7mmv0mhn2l5gs3vz6l7cnwak7agklyc7ml33f7gz99rwx8s3";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ hidapi libftdi1 libusb1 ];
@ -64,7 +60,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://openocd.sourceforge.net/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ bjornfor ];
maintainers = with maintainers; [ bjornfor prusnak ];
platforms = platforms.unix;
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -12771,9 +12771,7 @@ in
opengrok = callPackage ../development/tools/misc/opengrok { };
openocd = callPackage ../development/tools/misc/openocd {
autoreconfHook = buildPackages.autoreconfHook269;
};
openocd = callPackage ../development/tools/misc/openocd { };
oprofile = callPackage ../development/tools/profiling/oprofile {
libiberty_static = libiberty.override { staticBuild = true; };