diff --git a/.cache/vale/config/vocabularies/categorifier/accept.txt b/.cache/vale/config/vocabularies/categorifier/accept.txt new file mode 100644 index 00000000..75413c4c --- /dev/null +++ b/.cache/vale/config/vocabularies/categorifier/accept.txt @@ -0,0 +1,26 @@ +direnv +garnix +[Nn]ix +Pfeil +ShellCheck +bugfix +Categorifier +categorified +categorify +comonad +Conal +concat +conditionalize +functor +GADT +GHC +Hask +inline +inlining +invasive +Kleisli +Kmett +[Mm]onoidal +monomorphization +pragma +unfolding diff --git a/.config/project/default.nix b/.config/project/default.nix index 36bc4a02..f50783a1 100644 --- a/.config/project/default.nix +++ b/.config/project/default.nix @@ -2,6 +2,8 @@ project = { name = "categorifier"; summary = "Defining novel interpretations of Haskell programs"; + + packages = [pkgs.cabal-install]; }; imports = [ diff --git a/.gitattributes b/.gitattributes index 971d9fc7..3fae2e3c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,7 @@ /.cache/git/config linguist-generated /.cache/git/hooks/pre-push linguist-generated /.cache/vale/Vocab/categorifier/accept.txt linguist-generated +/.cache/vale/config/vocabularies/categorifier/accept.txt linguist-generated /.dir-locals.el linguist-generated /.editorconfig linguist-generated /.envrc linguist-generated diff --git a/.gitignore b/.gitignore index beeea809..4e931c6c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,11 @@ /source dist-newstyle /.cache/vale/* +!/.cache/vale/config/ +/.cache/vale/config/* +!/.cache/vale/config/vocabularies/ +/.cache/vale/config/vocabularies/* +!/.cache/vale/config/vocabularies/categorifier/ !/.cache/vale/Vocab/ /.cache/vale/Vocab/* !/.cache/vale/Vocab/categorifier/ diff --git a/flake.nix b/flake.nix index dcc6a542..6d3b0a03 100644 --- a/flake.nix +++ b/flake.nix @@ -190,10 +190,7 @@ self.lib.testedGhcVersions cabalPackages (hpkgs: - [ - self.projectConfigurations.${system}.packages.path - pkgs.cabal-install - ] + [self.projectConfigurations.${system}.packages.path] ## NB: Haskell Language Server no longer supports GHC <9. ++ nixpkgs.lib.optional (nixpkgs.lib.versionAtLeast hpkgs.ghc.version "9") diff --git a/garnix.yaml b/garnix.yaml index 98b46e71..4582a7ed 100644 --- a/garnix.yaml +++ b/garnix.yaml @@ -1,2 +1,2 @@ # This file was generated by Project Manager. -{"builds":{"exclude":["*.x86_64-darwin","*.x86_64-darwin.*","devShells.aarch64-darwin.ghc928","homeConfigurations.x86_64-darwin-categorifier-example","devShells.*.ghc8107","packages.*.ghc8107_all","packages.*.ghc8107_categorifier-ghc-bignum-integration","packages.*.ghc8107_categorifier-ghc-bignum-integration-test","packages.*.ghc8107_categorifier-linear-base-integration","packages.*.ghc8107_categorifier-linear-base-integration-test","checks.*.project-manager-files","checks.*.vale","devShells.*.lax-checks"],"include":["*.*","*.*.*"]}} \ No newline at end of file +{"builds":{"exclude":["*.x86_64-darwin","*.x86_64-darwin.*","devShells.aarch64-darwin.ghc928","homeConfigurations.x86_64-darwin-categorifier-example","devShells.*.ghc8107","packages.*.ghc8107_all","packages.*.ghc8107_categorifier-ghc-bignum-integration","packages.*.ghc8107_categorifier-ghc-bignum-integration-test","packages.*.ghc8107_categorifier-linear-base-integration","packages.*.ghc8107_categorifier-linear-base-integration-test","devShells.*.lax-checks"],"include":["*.*","*.*.*"]}} \ No newline at end of file