Skip to content

Commit

Permalink
Merge pull request #10 from sellout/renovate/ubuntu-24.x
Browse files Browse the repository at this point in the history
Update dependency ubuntu to v24
  • Loading branch information
sellout authored Oct 20, 2024
2 parents 4a57f2b + 1705dec commit 45d3a4e
Show file tree
Hide file tree
Showing 21 changed files with 235 additions and 222 deletions.
22 changes: 12 additions & 10 deletions .cache/vale/Vocab/haskerwaul/accept.txt

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

22 changes: 12 additions & 10 deletions .cache/vale/config/vocabularies/haskerwaul/accept.txt

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

121 changes: 25 additions & 96 deletions .config/project/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,46 +10,16 @@
githubSystems = [
"macos-13" # x86_64-darwin
"macos-14" # aarch64-darwin
"ubuntu-22.04" # x86_64-linux
"ubuntu-24.04" # x86_64-linux
"windows-2022"
];
in {
project = {
name = "haskerwaul";
summary = "Category-parametric programming";

devPackages = [
pkgs.cabal-install
pkgs.graphviz
## So cabal-plan(-bounds) can be built in a devShell, since it doesn’t
## work in Nix proper.
pkgs.zlib
];
};

imports = [
(import ./github-ci.nix {
inherit (self.lib) defaultGhcVersion;
exclude = [
## FIXME: There seems to be a general issue with this GHC version and
## aarch64-darwin.
{
ghc = "9.4.1";
os = "macos-14";
}
];
latestGhcVersion = "9.10.1";
packages = {
haskerwaul = "haskerwaul";
haskerwaul-base = "base";
haskerwaul-hedgehog = "hedgehog";
haskerwaul-trample = "trample";
};
systems = githubSystems;
})
./hackage-publish.nix
./hlint.nix
];
imports = [./hlint.nix];

## dependency management
services.renovate.enable = true;
Expand All @@ -60,101 +30,43 @@ in {
# This should default by whether there is a .git file/dir (and whether it’s
# a file (worktree) or dir determines other things – like where hooks
# are installed.
git = {
enable = true;
ignores = [
# Cabal build
"dist-newstyle"
];
};
git.enable = true;
};

## formatting
editorconfig.enable = true;

programs = {
treefmt = {
enable = true;
## Haskell formatter
programs.ormolu.enable = true;
settings.formatter.prettier.excludes = ["*/docs/license-report.md"];
};
treefmt.enable = true;
vale = {
enable = true;
excludes = [
"*.cabal"
"*.hs"
"*.hs-boot"
"*.lhs"
"*/docs/license-report.md"
"./cabal.project"
];
vocab.${config.project.name}.accept = [
"API"
"Bool"
"bugfix"
"categorification"
"categorified"
"comonad"
"concat"
"conditionalize"
"coproduct"
"dev"
"enrichment"
"exponential"
"formatter"
"functor"
"GADT"
"Hask"
"Haskerwaul"
"Hom"
"Kleisli"
"Kmett"
"monoidal"
"morphism"
"newtype"
"nLab"
"oidification"
"overconstrained"
"pragma"
"preorder"
"README"
"topos"
"unformatted"
"widening"
];
};
};

## CI
services.garnix = {
enable = true;
builds = {
## TODO: Remove once garnix-io/garnix#285 is fixed.
exclude = ["homeConfigurations.x86_64-darwin-example"];
include = lib.mkForce (
[
"homeConfigurations.*"
"nixosConfigurations.*"
]
++ flaky.lib.forGarnixSystems supportedSystems (
sys:
[
"checks.${sys}.*"
"devShells.${sys}.default"
"packages.${sys}.default"
]
++ lib.concatMap (version: let
ghc = self.lib.nixifyGhcVersion version;
in [
"devShells.${sys}.${ghc}"
"packages.${sys}.${ghc}_all"
])
(self.lib.testedGhcVersions sys)
)
);
};
};
services.garnix.enable = true;
## FIXME: Shouldn’t need `mkForce` here (or to duplicate the base contexts).
## Need to improve module merging.
services.github.settings.branches.main.protection.required_status_checks.contexts =
Expand Down Expand Up @@ -184,11 +96,28 @@ in {
"check vale [${sys}]"
"devShell default [${sys}]"
]));
services.haskell-ci = {
inherit (self.lib) defaultGhcVersion;
systems = githubSystems;
ghcVersions = self.lib.nonNixTestedGhcVersions;
exclude = [
## FIXME: There seems to be a general issue with this GHC version and
## aarch64-darwin.
{
ghc = "9.4.1";
os = "macos-14";
}
];
cabalPackages = {
haskerwaul = "haskerwaul";
haskerwaul-base = "base";
haskerwaul-hedgehog = "hedgehog";
haskerwaul-trample = "trample";
};
latestGhcVersion = "9.10.1";
};

## publishing
# NB: Can’t use IFD on FlakeHub (see DeterminateSystems/flakehub-push#69), so
# this is disabled until we have a way to build Haskell without IFD.
services.flakehub.enable = false;
services.github.enable = true;
services.github.settings.repository.topics = ["category-theory"];
}
2 changes: 2 additions & 0 deletions .dir-locals.el

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

Loading

0 comments on commit 45d3a4e

Please sign in to comment.