diff --git a/pkgs/by-name/libresoc/ieee754fpu.nix b/pkgs/by-name/libresoc/ieee754fpu.nix
index a51adecf..89317f52 100644
--- a/pkgs/by-name/libresoc/ieee754fpu.nix
+++ b/pkgs/by-name/libresoc/ieee754fpu.nix
@@ -7,8 +7,9 @@
   pytest-output-to-files,
 }:
 with python39Packages;
-  buildPythonPackage {
-    pname = "libresoc-ieee754fpu";
+  buildPythonPackage rec {
+    name = "libresoc-ieee754fpu";
+    pname = "ieee754fpu";
     version = "unstable-2024-03-31";
 
     # mirror of https://git.libre-soc.org/git/ieee754fpu.git
@@ -16,7 +17,7 @@ with python39Packages;
     # upstream repo and GitHub mirror. For some reason with fetchFromGitHub, even with the
     # the same rev we are getting a different hash (unlike every other mirrored repo)
     src = fetchgit {
-      url = "https://github.com/Libre-SOC-mirrors/ieee754fpu.git";
+      url = "https://github.com/Libre-SOC-mirrors/${pname}.git";
       hash = "sha256-Ghbvg2Y4YlmxVEa3EtcvEVai4hC4VU4q+XIQh4pQ7+c=";
       rev = "829dfbc53ba38ec17bc544cb0b862e73cee223db"; # HEAD @ version date
     };
diff --git a/pkgs/by-name/libresoc/libresoc-c4m-jtag.nix b/pkgs/by-name/libresoc/libresoc-c4m-jtag.nix
index ce2ad81f..574f847d 100644
--- a/pkgs/by-name/libresoc/libresoc-c4m-jtag.nix
+++ b/pkgs/by-name/libresoc/libresoc-c4m-jtag.nix
@@ -1,20 +1,20 @@
 {
   lib,
-  fetchFromGitHub,
+  fetchgit,
   python39,
   python39Packages,
   nmigen-soc,
   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}";
 
   # mirror of https://git.libre-soc.org/git/c4m-jtag.git
-  src = fetchFromGitHub {
-    owner = "Libre-SOC-mirrors";
-    repo = "c4m-jtag";
+  src = fetchgit {
+    url = "https://github.com/Libre-SOC-mirrors/${pname}.git";
     rev = "f5322d804e8228a2a5715c77185c60148ff96da8"; # HEAD @ version date
     hash = "sha256-0yF/yqcknCq1fre5pnKux4V7guu2oDa6duPO9mU46n8=3";
   };
diff --git a/pkgs/by-name/libresoc/libresoc-pyelftools.nix b/pkgs/by-name/libresoc/libresoc-pyelftools.nix
index 3991fc6b..cb8429c7 100644
--- a/pkgs/by-name/libresoc/libresoc-pyelftools.nix
+++ b/pkgs/by-name/libresoc/libresoc-pyelftools.nix
@@ -4,9 +4,11 @@
 }:
 python39Packages.pyelftools.overrideAttrs (_: rec {
   name = "libresoc-pyelftools";
+  pname = "pyelftools";
   version = "v0.30";
+
   src = fetchgit {
-    url = "https://git.libre-soc.org/git/pyelftools.git";
+    url = "https://github.com/Libre-SOC-mirrors/${pname}.git";
     rev = version;
     sha256 = "sha256-A9etnN7G24/Gu8YlV/YDpxZV+TG2eVXGx2ZjVnA9ZD4=";
   };
diff --git a/pkgs/by-name/libresoc/mdis.nix b/pkgs/by-name/libresoc/mdis.nix
index b74e8eff..aa5a2b5a 100644
--- a/pkgs/by-name/libresoc/mdis.nix
+++ b/pkgs/by-name/libresoc/mdis.nix
@@ -4,7 +4,8 @@
 }:
 with python39Packages;
   buildPythonPackage rec {
-    pname = "mdis";
+    name = "mdis";
+    pname = name;
     version = "0.5.1";
 
     src = fetchPypi {
diff --git a/pkgs/by-name/libresoc/nmigen-soc.nix b/pkgs/by-name/libresoc/nmigen-soc.nix
index c3c76a53..ac6e3f84 100644
--- a/pkgs/by-name/libresoc/nmigen-soc.nix
+++ b/pkgs/by-name/libresoc/nmigen-soc.nix
@@ -6,7 +6,8 @@
 }:
 with python39Packages;
   buildPythonPackage rec {
-    pname = "nmigen-soc";
+    name = "nmigen-soc";
+    pname = name;
     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.nix b/pkgs/by-name/libresoc/nmigen.nix
index d1cf9d72..8724ddb0 100644
--- a/pkgs/by-name/libresoc/nmigen.nix
+++ b/pkgs/by-name/libresoc/nmigen.nix
@@ -9,7 +9,8 @@
 }:
 with python39Packages;
   buildPythonPackage rec {
-    pname = "nmigen";
+    name = "nmigen";
+    pname = name;
     version = "unstable-2024-03-31";
     realVersion = "0.3.dev243+g${lib.substring 0 7 src.rev}";
 
diff --git a/pkgs/by-name/libresoc/nmutil.nix b/pkgs/by-name/libresoc/nmutil.nix
index 16baf058..fba33738 100644
--- a/pkgs/by-name/libresoc/nmutil.nix
+++ b/pkgs/by-name/libresoc/nmutil.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  fetchFromGitHub,
+  fetchgit,
   python39Packages,
   symbiyosys,
   yices,
@@ -8,14 +8,14 @@
   pytest-output-to-files,
 }:
 with python39Packages;
-  buildPythonPackage {
-    pname = "libresoc-nmutil";
+  buildPythonPackage rec {
+    name = "libresoc-nmutil";
+    pname = "nmutil";
     version = "unstable-2024-03-31";
 
     # mirror of https://git.libre-soc.org/git/nmutil.git
-    src = fetchFromGitHub {
-      owner = "Libre-SOC-mirrors";
-      repo = "nmutil";
+    src = fetchgit {
+      url = "https://github.com/Libre-SOC-mirrors/${pname}.git";
       rev = "4bf2f20bddc057df1597d14e0b990c0b9bdeb10e"; # HEAD @ version date
       hash = "sha256-8jXQGO4IeB6WjGtjuHO8UBh9n3ei7LukmRoXSbNJ1vM=";
     };
diff --git a/pkgs/by-name/libresoc/openpower-isa.nix b/pkgs/by-name/libresoc/openpower-isa.nix
index 4ded73d2..7c7961f2 100644
--- a/pkgs/by-name/libresoc/openpower-isa.nix
+++ b/pkgs/by-name/libresoc/openpower-isa.nix
@@ -1,7 +1,7 @@
 {
   python39,
   python39Packages,
-  fetchFromGitHub,
+  fetchgit,
   pkgsCross,
   writeShellApplication,
   gnumake,
@@ -14,13 +14,13 @@
 with python39Packages;
   buildPythonPackage rec {
     name = "libresoc-openpower-isa";
+    pname = "openpower-isa";
     version = "unstable-2024-03-31";
 
 
     # mirror of https://git.libre-soc.org/git/openpower-isa.git";
-    src = fetchFromGitHub {
-      owner = "Libre-SOC-mirrors";
-      repo = "openpower-isa";
+    src = fetchgit {
+      url = "https://github.com/Libre-SOC-mirrors/${pname}.git";
       rev = "3cb597b99d414dbdb35336eb3734b5d46edd597f"; # HEAD @ version date
       hash= "sha256-OKUb3BmVEZD2iRV8sbNEEA7ANJImWX8FEj06o5+HQwU=";
     };
diff --git a/pkgs/by-name/libresoc/pinmux.nix b/pkgs/by-name/libresoc/pinmux.nix
index 89a4939e..a7021055 100644
--- a/pkgs/by-name/libresoc/pinmux.nix
+++ b/pkgs/by-name/libresoc/pinmux.nix
@@ -1,16 +1,16 @@
 {
   stdenv,
-  fetchFromGitHub,
+  fetchgit,
   python39,
 }:
 stdenv.mkDerivation {
-  pname = "libresoc-pinmux";
+  name = "libresoc-pinmux";
+  pname = "pinmux";
   version = "unstable-2024-03-31";
 
   # mirror of https://git.libre-soc.org/git/pinmux.git
-  src = fetchFromGitHub {
-    owner = "Libre-SOC-mirrors";
-    repo = "pinmux";
+  src = fetchgit {
+    url = "https://github.com/Libre-SOC-mirrors/${pname}.git";
     rev = "ee6c6c5020f11e7debfd8262ffdb8abd6e1782c"; # HEAD @ version date
     hash = "sha256-Tux2RvcRmlpXMsHwve/+5rOyBRSThg9MVW2NGP3ZJxs=";
   };
diff --git a/pkgs/by-name/libresoc/power-instruction-analyzer.nix b/pkgs/by-name/libresoc/power-instruction-analyzer.nix
index 2799846e..af50674d 100644
--- a/pkgs/by-name/libresoc/power-instruction-analyzer.nix
+++ b/pkgs/by-name/libresoc/power-instruction-analyzer.nix
@@ -1,20 +1,20 @@
 {
   python39Packages,
   rustPlatform,
-  fetchFromGitHub,
+  fetchgit,
 }:
 with python39Packages;
 with rustPlatform;
   buildPythonPackage rec {
-    pname = "power-instruction-analyzer";
+    name = "power-instruction-analyzer";
+    pname = name;
     version = "0.2.0";
     format = "pyproject";
 
 
     # mirror of https://git.libre-soc.org/git/power-instruction-analyzer.git
-    src = fetchFromGitHub {
-      owner = "Libre-SOC-mirrors";
-      repo = "power-instruction-analyzer";
+    src = fetchgit {
+      url = "https://github.com/Libre-SOC-mirrors/${name}.git";
       rev = "v${version}";
       hash = "sha256-UmgDykG9yn413PXrMsI4oRblCZdHbtaIZ55p89YPfQs=";
     };
diff --git a/pkgs/by-name/libresoc/pytest-output-to-files.nix b/pkgs/by-name/libresoc/pytest-output-to-files.nix
index 14b1cce9..a3d2d240 100644
--- a/pkgs/by-name/libresoc/pytest-output-to-files.nix
+++ b/pkgs/by-name/libresoc/pytest-output-to-files.nix
@@ -1,16 +1,16 @@
 {
-  fetchFromGitHub,
+  fetchgit,
   python39Packages,
 }:
 with python39Packages;
-  buildPythonPackage {
+  buildPythonPackage rec {
     name = "pytest-output-to-files";
+    pname = name;
     version = "unstable-2024-03-31";
 
     # mirror of https://git.libre-soc.org/git/pytest-output-to-files.git
-    src = fetchFromGitHub {
-      owner = "Libre-SOC-mirrors";
-      repo = "pytest-output-to-files";
+    src = fetchgit {
+      url = "https://github.com/Libre-SOC-mirrors/${name}.git";
       rev = "e4d64e643acb1cd6218fc61910ab6266d3da7573"; # HEAD @ version date
       hash = "sha256-ES8zZ9s6wGcqw60NoN4tZf/Dq/sBvl+UDYrXuOgfMxI=";
     };
diff --git a/pkgs/by-name/libresoc/soc.nix b/pkgs/by-name/libresoc/soc.nix
index 24ea8aa7..fdf19753 100644
--- a/pkgs/by-name/libresoc/soc.nix
+++ b/pkgs/by-name/libresoc/soc.nix
@@ -1,6 +1,6 @@
 {
   python39Packages,
-  fetchFromGitHub,
+  fetchgit,
   yosys,
   libresoc-c4m-jtag,
   libresoc-ieee754fpu,
@@ -10,14 +10,13 @@
   pytest-output-to-files,
 }:
 with python39Packages;
-  buildPythonPackage {
-    pname = "soc";
+  buildPythonPackage rec {
+    name = "soc";
     version = "unstable-2024-03-31";
 
     # mirror of https://git.libre-soc.org/git/soc.git
-    src = fetchFromGitHub {
-      owner = "Libre-SOC-mirrors";
-      repo = "soc";
+    src = fetchgit {
+      url = "https://github.com/Libre-SOC-mirrors/${name}.git";
       rev = "2a66fe18cd77dd5533c65930d1b241cf6faac455"; # HEAD @ version date
       hash = "sha256-yJshQYf8V0CB2vPCmWLlnxXMhi/sPXiLKzOn6cqgmxw=";
       fetchSubmodules = false;