refactor: use harbor

flake.nix

@@ -5,7 +5,6 @@
       url = "github:hercules-ci/flake-parts";
       inputs.nixpkgs-lib.follows = "nixpkgs";
     };
-    systems.url = "github:nix-systems/default";
     treefmt-nix = {
       url = "github:numtide/treefmt-nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -17,14 +16,16 @@
       self,
       nixpkgs,
       flake-parts,
-      systems,
       treefmt-nix,
       ...
     }@inputs:
     flake-parts.lib.mkFlake { inherit inputs; } (
       { inputs, ... }:
       {
-        systems = import inputs.systems;
+        systems = [
+          "aarch64-linux"
+          "aarch64-darwin"
+        ];
 
         perSystem =
           {
@@ -41,7 +42,7 @@
             inherit (pkgs) buildDartApplication;
 
             gitHashes = {
-              rohd_hcl = "sha256-YobXIH2PTUXxp6MfcAIJG8aXhkc1MZOLthOEaQUJxOM=";
+              harbor = "sha256-bIDBFNui/5pebnlqjab/NsaXezOSAO12PoTsSBOKldA=";
             };
 
             buildDartTest =
@@ -91,7 +92,6 @@
               lib.genAttrs
                 [
                   "bintools"
-                  "riscv"
                   "river"
                   "river_adl"
                   "river_emulator"
@@ -123,6 +123,7 @@
                 dartEntryPoints = {
                   "bin/river-emulator" = "packages/river_emulator/bin/river_emulator.dart";
                   "bin/river-hdlgen" = "packages/river_hdl/bin/river_hdlgen.dart";
+                  "bin/river-sim" = "packages/river_hdl/bin/river_sim.dart";
                 };
 
                 preBuild = ''
@@ -149,7 +150,10 @@
                 src = ./.;
                 packageRoot = "packages/river_hdl";
 
-                dartEntryPoints."bin/river-hdlgen" = "packages/river_hdl/bin/river_hdlgen.dart";
+                dartEntryPoints = {
+                  "bin/river-hdlgen" = "packages/river_hdl/bin/river_hdlgen.dart";
+                  "bin/river-sim" = "packages/river_hdl/bin/river_sim.dart";
+                };
 
                 preBuild = ''
                   mkdir -p bin
@@ -158,27 +162,15 @@
             };
 
             devShells.default = pkgs.mkShell {
-              packages =
-                with pkgs;
-                (
-                  [
-                    yq
-                    dart
-                    yosys
-                    icestorm
-                    nextpnr
-                    gtkwave
-                    surfer
-                    pkgsCross.riscv32-embedded.stdenv.cc
-                    pkgsCross.riscv64-embedded.stdenv.cc
-                  ]
-                  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-                    icesprog
-                    (openroad.overrideAttrs {
-                      doCheck = !pkgs.stdenv.hostPlatform.isAarch64;
-                    })
-                  ]
-                );
+              packages = with pkgs; ([
+                yq
+                dart
+                yosys
+                nextpnr
+                surfer
+                pkgsCross.riscv32-embedded.stdenv.cc
+                pkgsCross.riscv64-embedded.stdenv.cc
+              ]);
             };
           };
       }

packages/bintools/lib/bintools.dart

@@ -2,3 +2,6 @@ library;
 
 export 'src/bintools_base.dart';
 export 'src/elf.dart';
+export 'src/elf_writer.dart';
+export 'src/linker.dart';
+export 'src/section.dart';

packages/bintools/lib/src/elf.dart

@@ -37,7 +37,6 @@ class Elf {
       case ElfClass.elf64:
         return reader.load64(endian, enc);
       case ElfClass.none:
-      default:
         throw UnsupportedError('Unsupported ELF class: $klass');
     }
   }