feat: Update packages

+ sgillespie.cachix.org + mingw64 + All default packages
sgillespie · Jun 13, 2023 · 5946f0c · 5946f0c
1 parent de828fe
commit 5946f0c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,4 +20,8 @@ cabal.sandbox.config
 cabal.project.local
 cabal.project.local~
 .HTF/
-.ghc.environment.*
+.ghc.environment.*
+
+# Nix
+.direnv
+.envrc
diff --git a/flake.nix b/flake.nix
@@ -26,13 +26,20 @@
         flake = pkgs.hixProject.flake {};
       in flake // {
         legacyPackages = pkgs;
-
-        packages.default = flake.packages."seangine:exe:seangine";
+        packages = flake.packages // {
+          default = flake.packages."seangine:exe:seangine";
+        };
       });
 
   nixConfig = {
-    extra-substituters = ["https://cache.iog.io"];
-    extra-trusted-public-keys = ["hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="];
+    extra-substituters = [
+      "https://sgillespie.cachix.org"
+      "https://cache.iog.io"
+    ];
+    extra-trusted-public-keys = [
+      "sgillespie.cachix.org-1:Zgif/WHW2IzHqbMb1z56cMmV5tLAA+zW9d5iB5w/VU4="
+      "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
+    ];
     allow-import-from-derivation = "true";
   };
 }
diff --git a/nix/hix.nix b/nix/hix.nix
@@ -3,10 +3,7 @@
   compiler-nix-name = "ghc928";
 
   crossPlatforms = p: pkgs.lib.optionals pkgs.stdenv.hostPlatform.isx86_64 ([
-    # p.mingwW64
-    # p.ghcjs # TODO GHCJS support for GHC 9.2
-  ] ++ pkgs.lib.optionals pkgs.stdenv.hostPlatform.isLinux [
-    # p.musl64
+    p.mingwW64
   ]);
 
   shell.tools.cabal = "latest";