Use GitHub mirrors instead. Upstream Libre-SOC repos are sporadically…

… returning 502/504 Also add some missing `rev`s which correspond to the FOD hash. Currently the `rev` for ieee754fpu does not seem to match its FOD hash
ngi-nix · Apr 29, 2024 · e4b21a2 · e4b21a2
1 parent 33866b0
commit e4b21a2
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 31 deletions.
diff --git a/pkgs/by-name/libresoc/ieee754fpu.nix b/pkgs/by-name/libresoc/ieee754fpu.nix
@@ -1,6 +1,6 @@
 {
   python39Packages,
-  fetchgit,
+  fetchFromGitHub,
   symbiyosys,
   nmutil,
   nmigen,
@@ -11,10 +11,12 @@ with python39Packages;
     pname = "libresoc-ieee754fpu";
     version = "unstable-2024-03-31";
 
-    src = fetchgit {
-      url = "https://git.libre-soc.org/git/ieee754fpu.git";
-      sha256 = "sha256-Ghbvg2Y4YlmxVEa3EtcvEVai4hC4VU4q+XIQh4pQ7+c=";
+    # mirror of https://git.libre-soc.org/git/ieee754fpu.git
+    src = fetchFromGitHub {
+      owner = "Libre-SOC-mirrors";
+      repo = "ieee754fpu";
       rev = "829dfbc53ba38ec17bc544cb0b862e73cee223db"; # HEAD @ version date
+      hash = "sha256-Ghbvg2Y4YlmxVEa3EtcvEVai4hC4VU4q+XIQh4pQ7+c=";
     };
 
     prePatch = ''

diff --git a/pkgs/by-name/libresoc/libresoc-c4m-jtag.nix b/pkgs/by-name/libresoc/libresoc-c4m-jtag.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  fetchgit,
+  fetchFromGitHub,
   python39,
   python39Packages,
   nmigen-soc,
@@ -11,9 +11,12 @@ python39Packages.buildPythonPackage rec {
   version = "unstable-2024-03-31";
   realVersion = "0.3.dev243+g${lib.substring 0 7 src.rev}";
 
-  src = fetchgit {
-    url = "https://git.libre-soc.org/git/c4m-jtag.git";
-    sha256 = "sha256-0yF/yqcknCq1fre5pnKux4V7guu2oDa6duPO9mU46n8=3";
+  # mirror of https://git.libre-soc.org/git/c4m-jtag.git
+  src = fetchFromGitHub {
+    owner = "Libre-SOC-mirrors";
+    repo = "c4m-jtag";
+    rev = "f5322d804e8228a2a5715c77185c60148ff96da8"; # HEAD @ version date
+    hash = "sha256-0yF/yqcknCq1fre5pnKux4V7guu2oDa6duPO9mU46n8=3";
   };
 
   prePatch = ''

diff --git a/pkgs/by-name/libresoc/nmutil.nix b/pkgs/by-name/libresoc/nmutil.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  fetchgit,
+  fetchFromGitHub,
   python39Packages,
   symbiyosys,
   yices,
@@ -12,9 +12,12 @@ with python39Packages;
     pname = "libresoc-nmutil";
     version = "unstable-2024-03-31";
 
-    src = fetchgit {
-      url = "https://git.libre-soc.org/git/nmutil.git";
-      sha256 = "sha256-8jXQGO4IeB6WjGtjuHO8UBh9n3ei7LukmRoXSbNJ1vM=";
+    # mirror of https://git.libre-soc.org/git/nmutil.git
+    src = fetchFromGitHub {
+      owner = "Libre-SOC-mirrors";
+      repo = "nmutil";
+      rev = "4bf2f20bddc057df1597d14e0b990c0b9bdeb10e"; # HEAD @ version date
+      hash = "sha256-8jXQGO4IeB6WjGtjuHO8UBh9n3ei7LukmRoXSbNJ1vM=";
     };
 
     propagatedNativeBuildInputs = [

diff --git a/pkgs/by-name/libresoc/openpower-isa.nix b/pkgs/by-name/libresoc/openpower-isa.nix
@@ -1,7 +1,7 @@
 {
   python39,
   python39Packages,
-  fetchgit,
+  fetchFromGitHub,
   pkgsCross,
   writeShellApplication,
   gnumake,
@@ -16,10 +16,13 @@ with python39Packages;
     name = "libresoc-openpower-isa";
     version = "unstable-2024-03-31";
 
-    src = fetchgit {
-      url = "https://git.libre-soc.org/git/openpower-isa.git";
-      sha256 = "sha256-OKUb3BmVEZD2iRV8sbNEEA7ANJImWX8FEj06o5+HQwU=";
+
+    # mirror of https://git.libre-soc.org/git/openpower-isa.git";
+    src = fetchFromGitHub {
+      owner = "Libre-SOC-mirrors";
+      repo = "openpower-isa";
       rev = "3cb597b99d414dbdb35336eb3734b5d46edd597f"; # HEAD @ version date
+      hash= "sha256-OKUb3BmVEZD2iRV8sbNEEA7ANJImWX8FEj06o5+HQwU=";
     };
 
     # TODO: potential upstream patches

diff --git a/pkgs/by-name/libresoc/pinmux.nix b/pkgs/by-name/libresoc/pinmux.nix
@@ -1,16 +1,18 @@
 {
   stdenv,
-  fetchgit,
+  fetchFromGitHub,
   python39,
 }:
 stdenv.mkDerivation {
   pname = "libresoc-pinmux";
   version = "unstable-2024-03-31";
 
-  src = fetchgit {
-    url = "https://git.libre-soc.org/git/pinmux.git";
-    sha256 = "sha256-Tux2RvcRmlpXMsHwve/+5rOyBRSThg9MVW2NGP3ZJxs=";
+  # mirror of https://git.libre-soc.org/git/pinmux.git
+  src = fetchFromGitHub {
+    owner = "Libre-SOC-mirrors";
+    repo = "pinmux";
     rev = "ee6c6c5020f11e7debfd8262ffdb8abd6e1782c"; # HEAD @ version date
+    hash = "sha256-Tux2RvcRmlpXMsHwve/+5rOyBRSThg9MVW2NGP3ZJxs=";
   };
 
   nativeBuildInputs = [python39];

diff --git a/pkgs/by-name/libresoc/power-instruction-analyzer.nix b/pkgs/by-name/libresoc/power-instruction-analyzer.nix
@@ -1,7 +1,7 @@
 {
   python39Packages,
   rustPlatform,
-  fetchgit,
+  fetchFromGitHub,
 }:
 with python39Packages;
 with rustPlatform;
@@ -10,8 +10,11 @@ with rustPlatform;
     version = "0.2.0";
     format = "pyproject";
 
-    src = fetchgit {
-      url = "https://git.libre-soc.org/git/power-instruction-analyzer.git";
+
+    # mirror of https://git.libre-soc.org/git/power-instruction-analyzer.git
+    src = fetchFromGitHub {
+      owner = "Libre-SOC-mirrors";
+      repo = "power-instruction-analyzer";
       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
@@ -1,16 +1,20 @@
 {
-  fetchgit,
+  fetchFromGitHub,
   python39Packages,
 }:
 with python39Packages;
   buildPythonPackage {
     name = "pytest-output-to-files";
     version = "unstable-2024-03-31";
 
-    src = fetchgit {
-      url = "https://git.libre-soc.org/git/pytest-output-to-files.git";
-      sha256 = "sha256-ES8zZ9s6wGcqw60NoN4tZf/Dq/sBvl+UDYrXuOgfMxI=";
+    # mirror of https://git.libre-soc.org/git/pytest-output-to-files.git
+    src = fetchFromGitHub {
+      owner = "Libre-SOC-mirrors";
+      repo = "pytest-output-to-files";
+      rev = "e4d64e643acb1cd6218fc61910ab6266d3da7573"; # HEAD @ version date
+      hash = "sha256-ES8zZ9s6wGcqw60NoN4tZf/Dq/sBvl+UDYrXuOgfMxI=";
     };
 
+
     nativeCheckInputs = [pytestCheckHook];
   }
diff --git a/pkgs/by-name/libresoc/soc.nix b/pkgs/by-name/libresoc/soc.nix
@@ -1,6 +1,6 @@
 {
   python39Packages,
-  fetchgit,
+  fetchFromGitHub,
   yosys,
   libresoc-c4m-jtag,
   libresoc-ieee754fpu,
@@ -14,9 +14,12 @@ with python39Packages;
     pname = "soc";
     version = "unstable-2024-03-31";
 
-    src = fetchgit {
-      url = "https://git.libre-soc.org/git/soc.git";
-      sha256 = "sha256-yJshQYf8V0CB2vPCmWLlnxXMhi/sPXiLKzOn6cqgmxw=";
+    # mirror of https://git.libre-soc.org/git/soc.git
+    src = fetchFromGitHub {
+      owner = "Libre-SOC-mirrors";
+      repo = "soc";
+      rev = "2a66fe18cd77dd5533c65930d1b241cf6faac455"; # HEAD @ version date
+      hash = "sha256-yJshQYf8V0CB2vPCmWLlnxXMhi/sPXiLKzOn6cqgmxw=";
       fetchSubmodules = false;
     };