From c2f12ded06cc2f86c31d31d91b412b32b708a420 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Tue, 30 May 2023 14:01:33 -0400 Subject: [PATCH] Update haskell-flake (modular overrides) --- flake.lock | 6 +++--- flake.nix | 30 ++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 89b9377..e95f1d2 100644 --- a/flake.lock +++ b/flake.lock @@ -35,11 +35,11 @@ }, "haskell-flake": { "locked": { - "lastModified": 1683641774, - "narHash": "sha256-6clCN5n/qd5/hk/f+M+4sr1VVs/sEgwH+sgE7PkKQOc=", + "lastModified": 1685469326, + "narHash": "sha256-esxJLsGexI/J6Fc32tJd2p3K5IOBZSCHgFvegjIpc+0=", "owner": "srid", "repo": "haskell-flake", - "rev": "ebfe70269fce376a7c95d6e9f011e16cbfd29b8d", + "rev": "996f5c2cdc67285c4990df378976f9dbf26f8401", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 15f87d2..7046d8b 100644 --- a/flake.nix +++ b/flake.nix @@ -25,14 +25,40 @@ # has only one. # See https://github.com/srid/haskell-flake/blob/master/example/flake.nix haskellProjects.default = { - # packages.haskell-template.root = ./.; # Auto-discovered by haskell-flake - overrides = self: super: { }; + # The base package set (this value is the default) + # basePackages = pkgs.haskellPackages; + + # Packages to add on top of `basePackages` + packages = { + # Add source or Hackage overrides here + # (Local packages are added automatically) + /* + aeson.source = "1.5.0.0" # Hackage version + shower.source = inputs.shower; # Flake input + */ + }; + + # Add your package overrides here + settings = { + /* + haskell-template = { + haddock = false; + }; + aeson = { + check = false; + }; + */ + }; + + # Development shell configuration devShell = { tools = hp: { treefmt = config.treefmt.build.wrapper; } // config.treefmt.build.programs; hlsCheck.enable = false; }; + + # What should haskell-flake add to flake outputs? autoWire = [ "packages" "apps" "checks" ]; # Wire all but the devShell };