Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
index-state: 2023-02-23T00:00:00Z
index-state: 2023-03-18T00:00:00Z

packages:
primer
Expand All @@ -19,7 +19,8 @@ package primer
package primer-service
test-options: "--size-cutoff=32768"

allow-newer: logging-effect:text
-- Temporary during GHC 9.6.1 bring-up.
allow-newer: *:*

-- We need a newer version of Selda than what's been released to Hackage.
source-repository-package
Expand All @@ -35,3 +36,10 @@ source-repository-package
tag: ab9619db13b93867d1a244441bb4de03d3e1dadb
subdir: selda-sqlite
--sha256: 0rdpazkhx6wfxlf6izg9xzxjr9wqywzqmk0c2a23qyfvih0ylj9z

-- https://github.com/ocharles/logging-effect/issues/37
source-repository-package
type: git
location: https://github.com/brprice/logging-effect
tag: de60d39a0cbc7b450f4efdf32bb6dd886b2a87db
--sha256: 12d1yq4493mg9128zbyl62vsqwjxcsrr9vhlphriq9a18lamgsa6
78 changes: 39 additions & 39 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 3 additions & 23 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
in
builtins.trace "Nix Primer version is ${v}" "git-${v}";

ghcVersion = "ghc926";
ghcVersion = "ghc961";

# We must keep the weeder version in sync with the version of
# GHC we're using.
Expand Down Expand Up @@ -180,20 +180,13 @@
let
# Override the default nix-pre-commit-hooks tools with the version
# we're using.
haskellNixTools = pkgs.haskell-nix.tools ghcVersion {
hlint = "latest";
fourmolu = fourmoluVersion;
cabal-fmt = "latest";
};
haskellNixTools = pkgs.haskell-nix.tools ghcVersion { };
in
{
check.enable = true;
settings = {
src = ./.;
hooks = {
hlint.enable = true;
fourmolu.enable = true;
cabal-fmt.enable = true;
nixpkgs-fmt.enable = true;

actionlint = {
Expand All @@ -210,9 +203,6 @@
# https://github.com/cachix/pre-commit-hooks.nix/issues/204
tools = {
nixpkgs-fmt = pkgs.lib.mkForce pkgs.nixpkgs-fmt;
hlint = pkgs.lib.mkForce haskellNixTools.hlint;
fourmolu = pkgs.lib.mkForce haskellNixTools.fourmolu;
cabal-fmt = pkgs.lib.mkForce haskellNixTools.cabal-fmt;
};

excludes = [
Expand Down Expand Up @@ -257,7 +247,7 @@
// primerFlake.packages;

checks = {
inherit weeder openapi-validate;
inherit openapi-validate;

inherit primer-sqitch-test-sqlite;
}
Expand Down Expand Up @@ -496,17 +486,7 @@
withHoogle = true;

tools = {
ghcid = "latest";
haskell-language-server = "latest";
implicit-hie = "latest";

cabal = "latest";
hlint = "latest";
weeder = weederVersion;

fourmolu = fourmoluVersion;

cabal-fmt = "latest";

#TODO Explicitly requiring tasty-discover shouldn't be necessary - see the commented-out `build-tool-depends` in primer.cabal.
tasty-discover = "latest";
Expand Down