diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2023-02-16 08:31:48 +0100 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2023-02-17 06:40:53 +0100 |
| commit | 815a21e9f16ed11a2dd8051d29ac2385625b539a (patch) | |
| tree | 0ece41918e885132e98f49cf0d1ebf991b1b7a3c /pkgs/development/embedded | |
| parent | 75a5ebbfba6adc61627b1667d12ebda21375a2d1 (diff) | |
openocd: 0.11.0 -> 0.12.0
Remove upstreamed patch which now fails to apply. Fixes https://github.com/NixOS/nixpkgs/issues/190866
Diffstat (limited to 'pkgs/development/embedded')
| -rw-r--r-- | pkgs/development/embedded/openocd/default.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/development/embedded/openocd/default.nix b/pkgs/development/embedded/openocd/default.nix index c80f5f3dd573e..5ffb9071534b1 100644 --- a/pkgs/development/embedded/openocd/default.nix +++ b/pkgs/development/embedded/openocd/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, fetchpatch , fetchurl , pkg-config , hidapi @@ -11,10 +10,10 @@ stdenv.mkDerivation rec { pname = "openocd"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0z8y7mmv0mhn2l5gs3vz6l7cnwak7agklyc7ml33f7gz99rwx8s3"; + sha256 = "sha256-ryVHiL6Yhh8r2RA/5uYKd07Jaow3R0Tu+Rl/YEMHWvo="; }; nativeBuildInputs = [ pkg-config ]; @@ -22,15 +21,6 @@ stdenv.mkDerivation rec { buildInputs = [ hidapi libftdi1 libusb1 ] ++ lib.optional stdenv.isLinux libgpiod; - patches = [ - # Patch is upstream, so can be removed when OpenOCD 0.12.0 or later is released. - (fetchpatch - { - url = "https://github.com/openocd-org/openocd/commit/cff0e417da58adef1ceef9a63a99412c2cc87ff3.patch"; - sha256 = "Xxzf5miWy4S34sbQq8VQdAbY/oqGyhL/AJxiEPRuj3Q="; - }) - ]; - configureFlags = [ "--disable-werror" "--enable-jtag_vpi" |