[dependencies] remove berkeley-hardfloat from remote

chipsalliance · Feb 8, 2025 · 5da7388 · 5da7388
1 parent f81ca2d
commit 5da7388
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 88 deletions.
diff --git a/nix/t1/dependencies/_sources/generated.json b/nix/t1/dependencies/_sources/generated.json
@@ -19,29 +19,9 @@
         },
         "version": "7f167dd90874afa5717fcfb1b8bbfb15ba6317a7"
     },
-    "berkeley-hardfloat": {
-        "cargoLocks": null,
-        "date": "2024-06-05",
-        "extract": null,
-        "name": "berkeley-hardfloat",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "deepClone": false,
-            "fetchSubmodules": false,
-            "leaveDotGit": false,
-            "name": null,
-            "owner": "ucb-bar",
-            "repo": "berkeley-hardfloat",
-            "rev": "26f00d00c3f3f57480065e02bfcfde3d3b41ec51",
-            "sha256": "sha256-gA1Ol7xnzC+10lGwK9+ftfJcMhKsC0KhjENQvUg3u88=",
-            "type": "github"
-        },
-        "version": "26f00d00c3f3f57480065e02bfcfde3d3b41ec51"
-    },
     "chisel": {
         "cargoLocks": null,
-        "date": "2025-02-07",
+        "date": "2025-02-08",
         "extract": null,
         "name": "chisel",
         "passthru": null,
@@ -53,11 +33,11 @@
             "name": null,
             "owner": "chipsalliance",
             "repo": "chisel",
-            "rev": "f4dc077ac710ca0b4580ffaa8ca68bc8a19aa6ad",
-            "sha256": "sha256-B2NFV0rDC0sSIdG9KH2pgV+72dPN22Sf3JyrzXCbUFc=",
+            "rev": "a2b40360e3dd4e2faedad52989865ffc3a1abbdd",
+            "sha256": "sha256-w0e2GONv0wk0lGGosDfQfuKv2olRIj+FvaqwVVLXQCE=",
             "type": "github"
         },
-        "version": "f4dc077ac710ca0b4580ffaa8ca68bc8a19aa6ad"
+        "version": "a2b40360e3dd4e2faedad52989865ffc3a1abbdd"
     },
     "chisel-interface": {
         "cargoLocks": null,

diff --git a/nix/t1/dependencies/_sources/generated.nix b/nix/t1/dependencies/_sources/generated.nix
@@ -13,29 +13,17 @@
     };
     date = "2025-02-07";
   };
-  berkeley-hardfloat = {
-    pname = "berkeley-hardfloat";
-    version = "26f00d00c3f3f57480065e02bfcfde3d3b41ec51";
-    src = fetchFromGitHub {
-      owner = "ucb-bar";
-      repo = "berkeley-hardfloat";
-      rev = "26f00d00c3f3f57480065e02bfcfde3d3b41ec51";
-      fetchSubmodules = false;
-      sha256 = "sha256-gA1Ol7xnzC+10lGwK9+ftfJcMhKsC0KhjENQvUg3u88=";
-    };
-    date = "2024-06-05";
-  };
   chisel = {
     pname = "chisel";
-    version = "f4dc077ac710ca0b4580ffaa8ca68bc8a19aa6ad";
+    version = "a2b40360e3dd4e2faedad52989865ffc3a1abbdd";
     src = fetchFromGitHub {
       owner = "chipsalliance";
       repo = "chisel";
-      rev = "f4dc077ac710ca0b4580ffaa8ca68bc8a19aa6ad";
+      rev = "a2b40360e3dd4e2faedad52989865ffc3a1abbdd";
       fetchSubmodules = false;
-      sha256 = "sha256-B2NFV0rDC0sSIdG9KH2pgV+72dPN22Sf3JyrzXCbUFc=";
+      sha256 = "sha256-w0e2GONv0wk0lGGosDfQfuKv2olRIj+FvaqwVVLXQCE=";
     };
-    date = "2025-02-07";
+    date = "2025-02-08";
   };
   chisel-interface = {
     pname = "chisel-interface";

diff --git a/nix/t1/dependencies/default.nix b/nix/t1/dependencies/default.nix
@@ -13,51 +13,8 @@
 
 let
   submodules = lib.filterAttrs (_: v: v ? src) (pkgs.callPackage ./_sources/generated.nix { });
-  makeRemote = module: "[email protected]:${module.src.owner}/${module.src.repo}.git";
 in
 lib.makeScope newScope (scope: {
-  setupHook = makeSetupHook { name = "submodules-setup.sh"; } (writeText "submodules-setup.sh" (''
-    _setupOneSubmodule() {
-      src="$1"
-      name="$2"
-
-      echo "[nix-shell] linking '$src' to 'dependencies/$name'"
-      ln -sfT "$src" "dependencies/$name"
-    }
-
-    _setupOneSubmoduleEditable() {
-      name="$1"; shift
-      remote="$1"; shift
-      rev="$1"; shift
-      depDir="dependencies/$name"
-
-      if [ -d "$depDir" -a ! -L "$depDir" ]; then
-        echo "[nix-shell] ignored existing submodule directory '$depDir', remove them if you want a update"
-      else 
-        if [ -L "$depDir" ]; then
-          echo "[nix-shell] replacing symlink '$depDir' with full git worktree"
-          rm "$depDir"
-        else
-          echo "[nix-shell] fetching submodule $name"
-        fi
-
-        git clone $remote $depDir
-        git -C $depDir -c advice.detachedHead=false checkout $rev
-      fi
-    }
-
-    setupSubmodules() {
-      mkdir -p dependencies
-  '' + lib.concatLines (lib.mapAttrsToList (k: v: "_setupOneSubmodule '${v.src}' '${k}'") submodules) + ''
-    }
-
-    # for use of shellHook
-    setupSubmodulesEditable() {
-      mkdir -p dependencies
-  '' + lib.concatLines (lib.mapAttrsToList (k: v: "_setupOneSubmoduleEditable '${k}' '${makeRemote v}' '${v.src.rev}'") submodules) + ''
-    }
-    prePatchHooks+=(setupSubmodules)
-  ''));
   sources = submodules;
 
   ivy-chisel =

diff --git a/nix/t1/dependencies/nvfetcher.toml b/nix/t1/dependencies/nvfetcher.toml
@@ -3,11 +3,6 @@ src.git = "https://github.com/sequencer/arithmetic"
 src.branch = "master"
 fetch.github = "sequencer/arithmetic"
 
-[berkeley-hardfloat]
-src.git = "https://github.com/ucb-bar/berkeley-hardfloat"
-src.branch = "master"
-fetch.github = "ucb-bar/berkeley-hardfloat"
-
 [chisel]
 src.git = "https://github.com/chipsalliance/chisel"
 src.branch = "main"