diff --git a/example/flake.nix b/example/flake.nix index d3105728..e5a56d9c 100644 --- a/example/flake.nix +++ b/example/flake.nix @@ -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. diff --git a/example/test.sh b/example/test.sh deleted file mode 100644 index ac5f97f8..00000000 --- a/example/test.sh +++ /dev/null @@ -1,24 +0,0 @@ -source ../test/common.sh -set -euo pipefail - -function templateTest () { - # Build haskell executable - nix build ${OVERRIDE_ALL} - # Test haskell devshell (via HLS check) - nix develop \ - ${OVERRIDE_ALL} \ - -c haskell-language-server -} - -TEMP_DIR=$(mktemp -d) -cd $TEMP_DIR - -set -x -#### Test "#example" template -nix flake init -t ${HASKELL_FLAKE}#example -templateTest - -### Test "#default" template -rm -f flake.nix -nix flake init -t ${HASKELL_FLAKE} -templateTest \ No newline at end of file diff --git a/flake.nix b/flake.nix index a6e35ad1..a2d1be17 100644 --- a/flake.nix +++ b/flake.nix @@ -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 diff --git a/runtest.sh b/runtest.sh index efa17bfb..72948ca8 100755 --- a/runtest.sh +++ b/runtest.sh @@ -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 )