libresoc: structure to match nlnet funding schema

Signed-off-by: Jack Leightcap <jack@leightcap.com>
ngi-nix · Jun 10, 2024 · 81bd319 · 81bd319
1 parent be94acf
commit 81bd319
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 21 deletions.
diff --git a/pkgs/by-name/libresoc-nmigen/bigfloat.nix b/pkgs/by-name/libresoc-nmigen/bigfloat.nix
@@ -5,8 +5,7 @@
   mpfr,
 }:
 python39Packages.buildPythonPackage rec {
-  name = "bigfloat";
-  pname = name;
+  pname = "bigfloat";
   version = "0.4.0";
 
   src = fetchPypi {

diff --git a/pkgs/by-name/libresoc-nmigen/ieee754fpu.nix b/pkgs/by-name/libresoc-nmigen/ieee754fpu.nix
@@ -10,7 +10,6 @@
   pytest-output-to-files,
 }:
 python39Packages.buildPythonPackage rec {
-  name = "libresoc-ieee754fpu";
   pname = "ieee754fpu";
   version = "unstable-2024-03-31";
 

diff --git a/pkgs/by-name/libresoc-nmigen/libresoc-c4m-jtag.nix b/pkgs/by-name/libresoc-nmigen/libresoc-c4m-jtag.nix
@@ -7,7 +7,6 @@
   nmigen,
 }:
 python39Packages.buildPythonPackage rec {
-  name = "c4m-jtag";
   pname = "c4m-jtag";
   version = "unstable-2024-03-31";
   realVersion = "0.3.dev243+g${lib.substring 0 7 src.rev}";

diff --git a/pkgs/by-name/libresoc-nmigen/mdis.nix b/pkgs/by-name/libresoc-nmigen/mdis.nix
@@ -4,8 +4,7 @@
   fetchPypi,
 }:
 python39Packages.buildPythonPackage rec {
-  name = "mdis";
-  pname = name;
+  pname = "mdis";
   version = "0.5.1";
 
   src = fetchPypi {

diff --git a/pkgs/by-name/libresoc-nmigen/nmigen-soc.nix b/pkgs/by-name/libresoc-nmigen/nmigen-soc.nix
@@ -5,8 +5,7 @@
   nmigen,
 }:
 python39Packages.buildPythonPackage rec {
-  name = "nmigen-soc";
-  pname = name;
+  pname = "nmigen-soc";
   version = "unstable-2024-03-31";
   # python setup.py --version
   realVersion = "0.1.dev243+g${lib.substring 0 7 src.rev}";

diff --git a/pkgs/by-name/libresoc-nmigen/nmigen.nix b/pkgs/by-name/libresoc-nmigen/nmigen.nix
@@ -8,8 +8,7 @@
   yosys,
 }:
 python39Packages.buildPythonPackage rec {
-  name = "nmigen";
-  pname = name;
+  pname = "nmigen";
   version = "unstable-2024-03-31";
   realVersion = "0.3.dev243+g${lib.substring 0 7 src.rev}";
 

diff --git a/pkgs/by-name/libresoc-nmigen/nmutil.nix b/pkgs/by-name/libresoc-nmigen/nmutil.nix
@@ -8,12 +8,11 @@
   pytest-output-to-files,
 }:
 python39Packages.buildPythonPackage rec {
-  name = "libresoc-nmutil";
-  pname = "nmutil";
+  pname = "libresoc-nmutil"; # Libre-SOC's bespoke fork
   version = "unstable-2024-03-31";
 
   src = fetchFromLibresoc {
-    inherit pname;
+    pname = "nmutil";
     rev = "4bf2f20bddc057df1597d14e0b990c0b9bdeb10e"; # HEAD @ version date
     hash = "sha256-8jXQGO4IeB6WjGtjuHO8UBh9n3ei7LukmRoXSbNJ1vM=";
   };

diff --git a/pkgs/by-name/libresoc-nmigen/power-instruction-analyzer.nix b/pkgs/by-name/libresoc-nmigen/power-instruction-analyzer.nix
@@ -5,8 +5,7 @@
   fetchFromLibresoc,
 }:
 python39Packages.buildPythonPackage rec {
-  name = "power-instruction-analyzer";
-  pname = name;
+  pname = "power-instruction-analyzer";
   version = "0.2.0";
   format = "pyproject";
 

diff --git a/pkgs/by-name/libresoc-nmigen/pytest-output-to-files.nix b/pkgs/by-name/libresoc-nmigen/pytest-output-to-files.nix
@@ -4,8 +4,7 @@
   python39Packages,
 }:
 python39Packages.buildPythonPackage rec {
-  name = "pytest-output-to-files";
-  pname = name;
+  pname = "pytest-output-to-files";
   version = "unstable-2024-03-31";
 
   src = fetchFromLibresoc {

diff --git a/pkgs/by-name/libresoc-nmigen/sfpy.nix b/pkgs/by-name/libresoc-nmigen/sfpy.nix
@@ -4,8 +4,7 @@
   fetchPypi,
 }:
 python39Packages.buildPythonPackage rec {
-  name = "sfpy";
-  pname = name;
+  pname = "sfpy";
   version = "0.6.0";
 
   src = fetchPypi {

diff --git a/pkgs/by-name/libresoc-verilog/pinmux.nix b/pkgs/by-name/libresoc-verilog/pinmux.nix
@@ -5,11 +5,10 @@
 }:
 stdenv.mkDerivation rec {
   name = "libresoc-pinmux";
-  pname = "pinmux";
   version = "unstable-2024-03-31";
 
   src = fetchFromLibresoc {
-    inherit pname;
+    pname = "pinmux";
     rev = "ee6c6c5020f11e7debfd8262ffdb8abd6e1782c"; # HEAD @ version date
     hash = "sha256-Tux2RvcRmlpXMsHwve/+5rOyBRSThg9MVW2NGP3ZJxs=";
   };