From: Las Safin <me@las.rs>
Date: Sun, 12 Sep 2021 19:35:23 +0000 (+0000)
Subject: Fix c4m-jtag
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d00cd3f712717c90a8f6f863ec1257f0f76f4f5c;p=soc.git

Fix c4m-jtag
---

diff --git a/flake.nix b/flake.nix
index 3df85429..591b34e2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,6 +33,7 @@
 
       packages = forAllSystems (system: {
         verilog = nixpkgsFor.${system}.libresoc-verilog;
+        openpower-isa = nixpkgsFor.${system}.python3Packages.libresoc-openpower-isa;
       });
 
       defaultPackage = forAllSystems (system: self.packages.${system}.verilog);
diff --git a/nix/c4m-jtag.nix b/nix/c4m-jtag.nix
index cf4dcf4d..1107244a 100644
--- a/nix/c4m-jtag.nix
+++ b/nix/c4m-jtag.nix
@@ -1,17 +1,23 @@
 { version, src }:
 
-{ lib, python, buildPythonPackage, nmigen-soc, nmigen, modgrammar }:
+{ lib, python, buildPythonPackage, nmigen-soc, nmigen, modgrammar, setuptools-scm }:
 
 buildPythonPackage {
-  pname = "libresoc-openpower-isa";
-  inherit version src;
+  pname = "c4m-jtag";
+  inherit src;
+  version = "2.17";
 
+  nativeBuildInputs = [ setuptools-scm ];
   propagatedBuildInputs = [ nmigen-soc nmigen modgrammar ];
 
   doCheck = false;
 
   pythonImportsCheck = [ "c4m.nmigen.jtag.tap" ];
 
+  prePatch = ''
+    sed -i -e 's/use_scm_version=scm_version..,//g' setup.py
+  '';
+
   meta = with lib; {
     homepage = "https://pypi.org/project/libresoc-openpower-isa/";
     license = licenses.lgpl3Plus;
diff --git a/nix/openpower-isa.nix b/nix/openpower-isa.nix
index 7413bed1..5aee8b1e 100644
--- a/nix/openpower-isa.nix
+++ b/nix/openpower-isa.nix
@@ -22,7 +22,7 @@ buildPythonPackage {
     cp -rT ./openpower $out/${python.sitePackages}/../openpower/
   '';
 
-  pythonImportsCheck = [ "openpower.decoder.power_decoder2" ];
+  pythonImportsCheck = [ "openpower.decoder.power_decoder2" "openpower" ];
 
   meta = with lib; {
     homepage = "https://pypi.org/project/libresoc-openpower-isa/";