Python dependencies

diff --git a/flake.nix b/flake.nix
index 5b1e57a5a98451817d28e3e58b2d47d015577b68..75e3ed63aae1d9206e39cdf6277184aac7234fe7 100644 (file)
--- a/flake.nix
+++ b/flake.nix
@@ -22,6 +22,7 @@
             libresoc-ieee754fpu = pself.callPackage ./nix/ieee754fpu.nix {};
             libresoc-openpower-isa = pself.callPackage ./nix/openpower-isa.nix {};
             bigfloat = pself.callPackage ./nix/bigfloat.nix {};
+            libresoc-nmutil = pself.callPackage ./nix/nmutil.nix {};
           };
         };
 

diff --git a/nix/bigfloat.nix b/nix/bigfloat.nix
index f7675cf6966278b6b880b3d4be76bd7cc96cb219..c3f818830773f6e85a740eb8708e5e21eae31b9f 100644 (file)
--- a/nix/bigfloat.nix
+++ b/nix/bigfloat.nix
@@ -1,10 +1,10 @@
-{ lib, buildPythonPackage, bigfloat, fetchPypi, gmp, mpfr }:
+{ lib, buildPythonPackage, bigfloat, fetchPypi, gmp, mpfr, six }:
 
 buildPythonPackage rec {
   pname = "bigfloat";
   version = "0.4.0";
 
-  buildInputs = [ gmp mpfr ];
+  buildInputs = [ gmp mpfr six ];
 
   src = fetchPypi {
     inherit pname version;

diff --git a/nix/ieee754fpu.nix b/nix/ieee754fpu.nix
index 3ec8486d4844b6b90f11f061e2c83f5906d3915a..ac221c935549c4df179bcbc966c93b2867591523 100644 (file)
--- a/nix/ieee754fpu.nix
+++ b/nix/ieee754fpu.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, bigfloat, fetchgit }:
+{ lib, buildPythonPackage, libresoc-nmutil, bigfloat, fetchgit }:
 
 buildPythonPackage {
   pname = "libresoc-ieee754fpu";
@@ -10,7 +10,7 @@ buildPythonPackage {
     sha256 = "wbr1vGFzUlUtBT6IcRsykADYeksiVoq/LacU/dbRQ0o=";
   };
 
-  propagatedBuildInputs = [ bigfloat ];
+  propagatedBuildInputs = [ libresoc-nmutil bigfloat ];
 
   doCheck = false;
 

diff --git a/nix/nmutil.nix b/nix/nmutil.nix
new file mode 100644 (file)
index 0000000..cda043b
--- /dev/null
+++ b/nix/nmutil.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, bigfloat, fetchgit, pyvcd }:
+
+buildPythonPackage {
+  pname = "libresoc-nmutil";
+  version = "unstable-2021-08-24";
+
+  nativeBuildInputs = [ pyvcd ];
+
+  src = fetchgit {
+    url = "https://git.libre-soc.org/git/nmutil.git";
+    rev = "efda080db6978d249a23003bec734f1cc07de329";
+    sha256 = "nTgUiZc4CC0VoUND29kHSIyMlP9IB3oZfehutoNK07w=";
+  };
+
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = "https://pypi.org/project/libresoc-ieee754fpu/";
+    license = licenses.lgpl3Plus;
+  };
+}

diff --git a/nix/openpower-isa.nix b/nix/openpower-isa.nix
index 67cd8778dd8dc1485d802a10ae2cdfaff12518e6..76c4987be77af454cf3ba85deaff34890352b24b 100644 (file)
--- a/nix/openpower-isa.nix
+++ b/nix/openpower-isa.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchgit }:
+{ lib, buildPythonPackage, fetchgit, libresoc-nmutil, astor, nmigen, ply, pygdbmi }:
 
 buildPythonPackage {
   pname = "libresoc-openpower-isa";
@@ -10,6 +10,8 @@ buildPythonPackage {
     sha256 = "0EekUouTQruTXGO5jlPJtqh0DOudghILy0nca5eaZz8=";
   };
 
+  propagatedBuildInputs = [ libresoc-nmutil astor nmigen ply pygdbmi ];
+
   doCheck = false;
 
   meta = with lib; {