[Backport release-26.05] openocd-rp2040: move override to pkgs/by-name (#533345)

This commit is contained in:
Bjørn Forsman 2026-06-19 18:37:01 +00:00 committed by GitHub
commit e06c153950
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 33 additions and 16 deletions

View file

@ -0,0 +1,33 @@
{
openocd,
autoreconfHook,
lib,
fetchFromGitHub,
}:
openocd.overrideAttrs (
finalAttrs: old: {
pname = "openocd-rp2040";
version = "2.2.0";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "openocd";
tag = "sdk-${finalAttrs.version}";
hash = "sha256-ZfbZVFVncHa1MvNJb4jbnU66vnlwVLBaOXPdgLqAneM=";
# openocd disables the vendored libraries that use submodules and replaces them with nix versions.
# this works out as one of the submodule sources seems to be flakey.
fetchSubmodules = false;
};
nativeBuildInputs = old.nativeBuildInputs ++ [
autoreconfHook
];
meta = openocd.meta // {
description = "Raspberry Pi's downstream fork of OpenOCD for use with Pico-series devices";
homepage = "https://github.com/raspberrypi/openocd";
maintainers = with lib.maintainers; [
aiyion
lu15w1r7h
];
};
}
)

View file

@ -5556,22 +5556,6 @@ with pkgs;
openai-whisper = with python3.pkgs; toPythonApplication openai-whisper;
openocd-rp2040 = openocd.overrideAttrs (old: {
pname = "openocd-rp2040";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "openocd";
rev = "4d87f6dcae77d3cbcd8ac3f7dc887adf46ffa504";
hash = "sha256-bBqVoHsnNoaC2t8hqcduI8GGlO0VDMUovCB0HC+rxvc=";
# openocd disables the vendored libraries that use submodules and replaces them with nix versions.
# this works out as one of the submodule sources seems to be flakey.
fetchSubmodules = false;
};
nativeBuildInputs = old.nativeBuildInputs ++ [
autoreconfHook
];
});
oprofile = callPackage ../development/tools/profiling/oprofile {
libiberty_static = libiberty.override { staticBuild = true; };
};