From 5b1a377643445877239d6e6f03379fc7039b9169 Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Wed, 15 Feb 2023 09:36:32 +0000 Subject: [PATCH] chore: Disable `exactDeps` and HLS check. Unfortunately, this is required when we use a `source-repository-package`, as we're now doing for the unreleased Selda that we're using. See: https://github.com/hackworthltd/primer/issues/876 --- flake.nix | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index af0056d58..074966755 100644 --- a/flake.nix +++ b/flake.nix @@ -255,18 +255,22 @@ # https://github.com/hackworthltd/primer/issues/632 // (pkgs.lib.optionalAttrs (system == "aarch64-darwin") { + # We're using `source-repository-package`, so we must + # disable this. See: + # https://github.com/hackworthltd/primer/issues/876 + # Make sure HLS can typecheck our project. - check-hls = pkgs.callPackage ./nix/pkgs/check-hls { - src = onlyHaskellSrc; + # check-hls = pkgs.callPackage ./nix/pkgs/check-hls { + # src = onlyHaskellSrc; - # Don't use the flake's version here; we only want to run - # this HLS check when the Haskell source files have - # changed, not on every commit to this repo. - version = "1.0"; + # # Don't use the flake's version here; we only want to run + # # this HLS check when the Haskell source files have + # # changed, not on every commit to this repo. + # version = "1.0"; - # This is a bit of a hack, but we don't know a better way. - inherit (primerFlake) devShell; - }; + # # This is a bit of a hack, but we don't know a better way. + # inherit (primerFlake) devShell; + # }; }) // primerFlake.checks; @@ -456,7 +460,10 @@ ]; shell = { - exactDeps = true; + # We're using a `source-repository-package`, so we must disable this. + # See: + # https://github.com/hackworthltd/primer/issues/876 + #exactDeps = true; withHoogle = true; tools = {