Skip to content
Merged
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
46 changes: 23 additions & 23 deletions example/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,30 +24,30 @@
# Note that local packages are automatically included in `packages`
# (defined by `defaults.packages` option).
#
# packages = {
# aeson.source = "1.5.0.0"; # Hackage version override
# shower.source = inputs.shower;
# };
# settings = {
# aeson = {
# check = false;
# };
# relude = {
# haddock = false;
# broken = false;
# };
# };
packages = {
# aeson.source = "1.5.0.0"; # Hackage version override
# shower.source = inputs.shower;
};
settings = {
# aeson = {
# check = false;
# };
# relude = {
# haddock = false;
# broken = false;
# };
};

# devShell = {
# # Enabled by default
# enable = true;
#
# # Programs you want to make available in the shell.
# # Default programs can be disabled by setting to 'null'
# tools = hp: { fourmolu = hp.fourmolu; ghcid = null; };
#
# hlsCheck.enable = true;
# };
devShell = {
# Enabled by default
# enable = true;

# Programs you want to make available in the shell.
# Default programs can be disabled by setting to 'null'
# tools = hp: { fourmolu = hp.fourmolu; ghcid = null; };

hlsCheck.enable = pkgs.stdenv.isDarwin; # On darwin, sandbox is disabled, so HLS can use the network.
};
};

# haskell-flake doesn't set the default package, but you can do it here.
Expand Down
24 changes: 0 additions & 24 deletions example/test.sh

This file was deleted.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
};
templates.example = {
description = "Example Haskell project using haskell-flake";
path = builtins.path { path = ./example; filter = path: _: baseNameOf path != "test.sh"; };
path = builtins.path { path = ./example; };
};

# CI spec
Expand Down
3 changes: 1 addition & 2 deletions runtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ nix --version
# directory.
# TODO: Supplant these scripts with Nix. See https://github.com/srid/haskell-flake/issues/241
TESTS=(
./example
# TODO: Move these to flake check, just like ./test/{simple, project-module}
# TODO: Move this to flake check, just like ./test/{simple, project-module}
./test/with-subdir
)

Expand Down