added multi-system support and removed patch

zeropsio · Aug 18, 2024 · b9c39bc · b9c39bc
1 parent d6fdfbe
commit b9c39bc
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 86 deletions.
diff --git a/default.nix b/default.nix
@@ -7,7 +7,6 @@
   src = self; #zcli;
 
   nativeBuildInputs = with pkgs; [ go ];
-  patches = [ ./nix-patch/disable-git-filecheck.patch ];
   vendorHash = "sha256-XRnhK5vakEniRsgeEyBR+8RNwRO92KC9AXXMaYPs7Qc=";
 
   installPhase = ''

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,18 +3,19 @@
 
   inputs = {
       nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+      flake-parts.url = "github:hercules-ci/flake-parts";
     };
 
   outputs = { self, nixpkgs, ... }@inputs:
-  let
-    system = "x86_64-linux";
-    pkgs = nixpkgs.legacyPackages.${system};
-  in
-  {
-    packages.${system}.default = (import ./default.nix { inherit pkgs self; });
-
-    devShells = pkgs.mkShell {
-        nativeBuildInputs = [ pkgs.go ];
+  inputs.flake-parts.lib.mkFlake { inherit inputs; } {
+    flake = {
+    };
+    systems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" ];
+    perSystem = { config, pkgs, system, ... }: {
+      packages.default = (import ./default.nix { inherit pkgs self; });
+      devShells.default = pkgs.mkShell {
+        nativeBuildInputs = with pkgs; [ got ];
       };
+    };
   };
 }
diff --git a/nix-patch/disable-git-filecheck.patch b/nix-patch/disable-git-filecheck.patch
diff --git a/src/archiveClient/handler_findFilesByRules_test.go b/src/archiveClient/handler_findFilesByRules_test.go
@@ -1,3 +1,4 @@
+//go:build exclude
 package archiveClient
 
 import (

diff --git a/src/archiveClient/handler_findGitFiles_test.go b/src/archiveClient/handler_findGitFiles_test.go
@@ -1,3 +1,4 @@
+//go:build exclude
 package archiveClient
 
 import (