swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-30 00:50:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #115510 from prusnak/openocd

Browse source 
openocd: 0.11.0-rc1 -> 0.11.0
This commit is contained in:
Pavol Rusnak 2021-03-09 14:20:14 +01:00 committed by GitHub
parent 0e97a17319 71e1536f10
commit 06c49712b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 { stdenv
, lib , lib
, fetchgit , fetchurl
, autoreconfHook
, pkg-config , pkg-config
, hidapi , hidapi
, libftdi1 , libftdi1
@ -10,16 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openocd"; pname = "openocd";
version = "0.11.0-rc1"; version = "0.11.0";
src = fetchurl {
src = fetchgit { url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.bz2";
url = "https://git.code.sf.net/p/openocd/code"; sha256 = "0z8y7mmv0mhn2l5gs3vz6l7cnwak7agklyc7ml33f7gz99rwx8s3";
rev = "v${version}";
sha256 = "15g8qalyxhdp0imfrg8mxwnp0nimd836fc5laaavajw49gcm65m4";
fetchSubmodules = true;
}; };
nativeBuildInputs = [ autoreconfHook pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ hidapi libftdi1 libusb1 ]; buildInputs = [ hidapi libftdi1 libusb1 ];
@ -64,7 +60,7 @@ stdenv.mkDerivation rec {
''; '';
homepage = "https://openocd.sourceforge.net/"; homepage = "https://openocd.sourceforge.net/";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ bjornfor ]; maintainers = with maintainers; [ bjornfor prusnak ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

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

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