From 1efe165ef3d7f96704948f58de51ee5c54e31238 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <3998+srid@users.noreply.github.com>
Date: Fri, 23 Dec 2022 20:16:59 -0500
Subject: [PATCH] Make Hercules CI succeed (#78)

Remove hlsCheck, sadly.
---
 .github/workflows/ci.yaml | 3 +++
 README.md                 | 3 +--
 flake.nix                 | 4 +++-
 garnix.yaml               | 7 -------
 4 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 100644 garnix.yaml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index bf0afd1..f3ad3ad 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -15,6 +15,9 @@ jobs:
           extra_nix_config: |
             experimental-features = nix-command flakes
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
+            # Srid's cache; leaving disabled for template use.
+            # trusted-public-keys = cache.srid.ca:8sQkbPrOIoXktIwI0OucQBXod2e9fDjjoEZWn8OXbdo=
+            # substituters = https://cache.srid.ca
       - name: Cache Nix dependencies
         run: |
           nix develop -j 4 -c echo
diff --git a/README.md b/README.md
index 4ee40e8..ac17a00 100644
--- a/README.md
+++ b/README.md
@@ -20,14 +20,13 @@ For details, see: https://srid.ca/haskell-template/start
 ## Tips
 
 - Run `nix flake update` to update all flake inputs.
-- Run `nix --option sandbox false build .#check -L` to run the flake checks.
+- Run `nix build .#check -L` to run the flake checks.
 - Run `, fmt` in nix shell to autoformat the project. This uses [treefmt](https://github.com/numtide/treefmt).
 - Run `, docs` to start Hoogle with packages in your cabal file.
 - Run the application without installing: `nix run github:srid/haskell-template` (or `nix run .` from checkout)
 - Common workflows
   - Adding library dependencies in Nix: https://srid.ca/haskell-template/dependency
   - Adding tests: https://srid.ca/haskell-template/tests
-  - Adding Garnix CI: https://srid.ca/haskell-template/garnix
 
 ## Discussions
 
diff --git a/flake.nix b/flake.nix
index 2c20578..6fbb0b8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,7 +29,7 @@
             treefmt = config.treefmt.build.wrapper;
           } // config.treefmt.build.programs;
           # overrides = self: super: {}
-          hlsCheck.enable = true;
+          hlsCheck.enable = false;
           hlintCheck.enable = true;
         };
 
@@ -91,6 +91,8 @@
         devShells.default =
           config.mission-control.installToDevShell self'.devShells.main;
       };
+
+      # CI configuration
       flake.herculesCI.ciSystems = [ "x86_64-linux" "aarch64-darwin" ];
     };
 }
diff --git a/garnix.yaml b/garnix.yaml
deleted file mode 100644
index 2239ede..0000000
--- a/garnix.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-builds:
-  include:
-    - "*.aarch64-darwin.*"
-    - "*.x86_64-linux.*"
-  exclude:
-    # https://github.com/srid/haskell-flake/issues/21
-    - "checks.*.main-hls"