From bd7daa524701fd7f2628cf4ba48c2648fba54ac8 Mon Sep 17 00:00:00 2001
From: Florian Agbuya <fa@m-labs.ph>
Date: Thu, 20 Jun 2024 21:51:50 +0800
Subject: [PATCH] flake: use upstream nixpkgs openocd

Signed-off-by: Florian Agbuya <fa@m-labs.ph>
---
 flake.nix | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/flake.nix b/flake.nix
index f73e2d3f8..4c13ab1ef 100644
--- a/flake.nix
+++ b/flake.nix
@@ -300,27 +300,9 @@
           cp $src/*.bit $out/share/bscan-spi-bitstreams
           '';
         };
-        # https://docs.lambdaconcept.com/screamer/troubleshooting.html#error-contents-differ
-        openocd-fixed = pkgs.openocd.overrideAttrs(oa: {
-          version = "unstable-2021-09-15";
-          src = pkgs.fetchFromGitHub {
-            owner = "openocd-org";
-            repo = "openocd";
-            rev = "a0bd3c9924870c3b8f428648410181040dabc33c";
-            sha256 = "sha256-YgUsl4/FohfsOncM4uiz/3c6g2ZN4oZ0y5vV/2Skwqg=";
-            fetchSubmodules = true;
-          };
-          patches = [
-            (pkgs.fetchurl {
-              url = "https://git.m-labs.hk/M-Labs/nix-scripts/raw/commit/575ef05cd554c239e4cc8cb97ae4611db458a80d/artiq-fast/pkgs/openocd-jtagspi.diff";
-              sha256 = "0g3crk8gby42gm661yxdcgapdi8sp050l5pb2d0yjfic7ns9cw81";
-            })
-          ];
-          nativeBuildInputs = oa.nativeBuildInputs or [] ++ [ pkgs.autoreconfHook269 ];
-        });
       in pkgs.buildEnv {
         name = "openocd-bscanspi";
-        paths = [ openocd-fixed bscan_spi_bitstreams-pkg ];
+        paths = [ pkgs.openocd bscan_spi_bitstreams-pkg ];
       };
 
       latex-artiq-manual = pkgs.texlive.combine {