fix flake

maestro-org · May 26, 2023 · 5ff96ac · 5ff96ac
1 parent db2d045
commit 5ff96ac
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 71 deletions.
diff --git a/Setup.hs b/Setup.hs
@@ -0,0 +1,6 @@
+module Main (main) where
+
+import Distribution.Simple
+
+main :: IO ()
+main = defaultMain
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -6,7 +6,10 @@
   outputs = { self, nixpkgs, flake-utils, haskellNix }:
     let
       supportedSystems = [
-        "x86_64-linux"	"x86_64-darwin" 
+        "x86_64-linux"
+        "x86_64-darwin"
+        "aarch64-linux"
+        "aarch64-darwin"
       ];
     in
       flake-utils.lib.eachSystem supportedSystems (system:
@@ -31,6 +34,7 @@
     # This sets the flake to use the IOG nix cache.
     # Nix should ask for permission before using it,
     # but remove it here if you do not want it to.
+    extra-substituters = ["https://cache.iog.io"];
     allow-import-from-derivation = "true";
   };
 }
diff --git a/nix/hix.nix b/nix/hix.nix
@@ -10,11 +10,9 @@
   # ]);
 
   # Tools to include in the development shell
-    shell = {
-    	tools = {
-    	  cabal = "latest";
-    	  hlint = "3.4.1";
-    	  haskell-language-server = { version = "1.8.0.0"; index-state = "2022-12-17T00:00:00Z"; };
-    	};
-    };
+  shell.tools.cabal = "latest";
+  shell.tools.hlint = "3.4.1";
+  shell.tools.haskell-language-server = { version = "1.8.0.0"; index-state = "2022-12-17T00:00:00Z"; };
+
+  shell.buildInputs = with pkgs; [zlib zlib.dev zlib.out];
 }