From 9617c1d1dbc410436f7daa97dfa1f455dea4cdb2 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <3998+srid@users.noreply.github.com>
Date: Sun, 30 Oct 2022 19:22:49 -0400
Subject: [PATCH] Update flake.lock & reintroduce garnix CI (#66)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* flake.lock: Update

Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/45298bd207b26e1bcd030a0bb075aa2da29f8e30' (2022-09-28)
  → 'github:hercules-ci/flake-parts/0e101dbae756d35a376a5e1faea532608e4a4b9a' (2022-10-27)
• Removed input 'flake-parts/nixpkgs'
• Added input 'flake-parts/nixpkgs-lib':
    'github:NixOS/nixpkgs/34c5293a71ffdb2fe054eb5288adc1882c1eb0b1?dir=lib' (2022-10-09)
• Updated input 'haskell-flake':
    'github:srid/haskell-flake/e1f757d7c48a81ec53e8a952b0d8304f2315da7e' (2022-10-24)
  → 'github:srid/haskell-flake/2ef06a73fef2856fb5d0f5a8a7a4fef964e0d94f' (2022-10-24)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/0cfb3c002b61807ca0bab3efe514476bdf2e5478' (2022-09-17)
  → 'github:nixos/nixpkgs/f44ba1be526c8da9e79a5759feca2365204003f6' (2022-10-28)

* Run treefmt (new cabal-fmt?)

* Add garnix.yaml to exclude HLS check

* include m1 (via glob(

* include linux too

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock             | 40 ++++++++++++++++++++++++++++------------
 garnix.yaml            |  7 +++++++
 haskell-template.cabal |  2 +-
 3 files changed, 36 insertions(+), 13 deletions(-)
 create mode 100644 garnix.yaml

diff --git a/flake.lock b/flake.lock
index 159a88f..f092f6a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,16 +2,14 @@
   "nodes": {
     "flake-parts": {
       "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1664385320,
-        "narHash": "sha256-uSCHb9RUqHRjTpI8OzyaUuHckFnnxwZqlXEuo+yUpYQ=",
+        "lastModified": 1666885127,
+        "narHash": "sha256-uXA/3lhLhwOTBMn9a5zJODKqaRT+SuL5cpEmOz2ULoo=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "45298bd207b26e1bcd030a0bb075aa2da29f8e30",
+        "rev": "0e101dbae756d35a376a5e1faea532608e4a4b9a",
         "type": "github"
       },
       "original": {
@@ -22,11 +20,11 @@
     },
     "haskell-flake": {
       "locked": {
-        "lastModified": 1666647007,
-        "narHash": "sha256-wajLBBuTDikof7hkyNq+TYWNGOqvOEQIJmqSNNRs7/Q=",
+        "lastModified": 1666647145,
+        "narHash": "sha256-Jzmm+BhUai/r8Qo2ZXYUnW3OIcy36OcMWNLPC7dF68E=",
         "owner": "srid",
         "repo": "haskell-flake",
-        "rev": "e1f757d7c48a81ec53e8a952b0d8304f2315da7e",
+        "rev": "2ef06a73fef2856fb5d0f5a8a7a4fef964e0d94f",
         "type": "github"
       },
       "original": {
@@ -37,11 +35,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1663419078,
-        "narHash": "sha256-cxEeMnaTGMTeDAvXnZmqcF50qoyJOsQENhYxSnW9ZMs=",
+        "lastModified": 1666926733,
+        "narHash": "sha256-+gYfOEnQVISPDRNoWm2VJD5OEuTUySt48RchLpvm61o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0cfb3c002b61807ca0bab3efe514476bdf2e5478",
+        "rev": "f44ba1be526c8da9e79a5759feca2365204003f6",
         "type": "github"
       },
       "original": {
@@ -51,6 +49,24 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "dir": "lib",
+        "lastModified": 1665349835,
+        "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1",
+        "type": "github"
+      },
+      "original": {
+        "dir": "lib",
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "flake-parts": "flake-parts",
diff --git a/garnix.yaml b/garnix.yaml
new file mode 100644
index 0000000..27ddbb5
--- /dev/null
+++ b/garnix.yaml
@@ -0,0 +1,7 @@
+builds:
+  include:
+    - "*.aarch64-darwin.*"
+    - "*.x86_64-linux.*"
+  exclude:
+    # https://github.com/srid/haskell-flake/issues/21
+    - "checks.*.default-hls"
diff --git a/haskell-template.cabal b/haskell-template.cabal
index 496f8d7..770a028 100644
--- a/haskell-template.cabal
+++ b/haskell-template.cabal
@@ -76,7 +76,7 @@ common shared
   build-depends:
     , aeson
     , async
-    , base          >=4.13.0.0 && <=4.18.0.0
+    , base          >=4.13.0.0 && <4.18.0.0.0
     , data-default
     , directory
     , filepath