Skip to content

nixos: 22.05 -> 22.11 #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 18, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
with:
name: pre-commit-hooks
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
- run: nix-build
- run: nix-build --keep-going
tests-flakes:
strategy:
matrix:
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ use nix
- [deadnix](https://github.com/astro/deadnix)
- [nixpkgs-fmt](https://github.com/nix-community/nixpkgs-fmt)
- [nixfmt](https://github.com/serokell/nixfmt/)
- [nix-linter](https://github.com/Synthetica9/nix-linter)
- [statix](https://github.com/nerdypepper/statix)

## Haskell
Expand All @@ -95,7 +94,6 @@ use nix
- [stylish-haskell](https://github.com/jaspervdj/stylish-haskell)
- [hlint](https://github.com/ndmitchell/hlint)
- [cabal-fmt](https://github.com/phadej/cabal-fmt)
- [brittany](https://github.com/lspitzner/brittany)
- [hpack](https://github.com/sol/hpack)

## Elm
Expand Down
14 changes: 7 additions & 7 deletions flake.lock

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

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
description = "Seamless integration of https://pre-commit.com git hooks with Nix.";

inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
inputs.nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-22.05";
inputs.nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-22.11";
inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.flake-compat = {
url = "github:edolstra/flake-compat";
Expand Down Expand Up @@ -46,7 +46,7 @@
inherit (exposed.checks.pre-commit-check) shellHook;
};

checks = exposed.checks // (builtins.removeAttrs exposed-stable.checks [ "revive" "purs-tidy" ]);
checks = exposed.checks // exposed-stable.checks;

lib = { inherit (exposed) run; };
}
Expand Down
27 changes: 0 additions & 27 deletions modules/hooks.nix
Original file line number Diff line number Diff line change
Expand Up @@ -118,16 +118,6 @@ in
default = { };
};
};
nix-linter =
{
checks =
mkOption {
type = types.listOf types.str;
description = lib.mdDoc
"Available checks. See `nix-linter --help-for [CHECK]` for more details.";
default = [ ];
};
};
nixfmt =
{
width =
Expand Down Expand Up @@ -385,13 +375,6 @@ in
"proto"
];
};
brittany =
{
name = "brittany";
description = "Haskell source code formatter.";
entry = "${tools.brittany}/bin/brittany --write-mode=inplace";
files = "\\.l?hs(-boot)?$";
};
dhall-format = {
name = "dhall-format";
description = "Dhall code formatter.";
Expand Down Expand Up @@ -554,16 +537,6 @@ in
files = "\\.nix$";
pass_filenames = false;
};
nix-linter =
{
name = "nix-linter";
description = "Linter for the Nix expression language.";
entry =
"${tools.nix-linter}/bin/nix-linter ${
lib.escapeShellArgs (lib.concatMap (check: [ "-W" "${check}" ]) settings.nix-linter.checks)
}";
files = "\\.nix$";
};
elm-format =
{
name = "elm-format";
Expand Down
7 changes: 3 additions & 4 deletions nix/tools.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
, hunspell
, luaPackages
, mdsh
, nix-linter
, nixfmt
, nixpkgs-fmt
, nodePackages
Expand All @@ -40,6 +39,7 @@
, stylua
, texlive
, typos
, yamllint
, writeScript
, writeText
, go
Expand All @@ -54,13 +54,12 @@ let
};
in
{
inherit actionlint alejandra cabal-fmt cabal2nix cargo clang-tools clippy deadnix dhall editorconfig-checker hadolint hindent hlint hpack html-tidy nix-linter nixfmt nixpkgs-fmt ormolu rustfmt shellcheck shfmt statix stylish-haskell stylua typos go mdsh revive go-tools;
inherit actionlint ansible-lint alejandra cabal-fmt cabal2nix cargo clang-tools clippy deadnix dhall editorconfig-checker hadolint hindent hlint hpack html-tidy nixfmt nixpkgs-fmt ormolu rustfmt shellcheck shfmt statix stylish-haskell stylua typos go mdsh revive go-tools yamllint;
inherit (elmPackages) elm-format elm-review elm-test;
# TODO: these two should be statically compiled
inherit (haskellPackages) brittany fourmolu;
inherit (haskellPackages) fourmolu;
inherit (luaPackages) luacheck;
inherit (nodePackages) eslint markdownlint-cli prettier;
inherit (python39Packages) ansible-lint yamllint;
purs-tidy = nodePackages.purs-tidy or null;
cabal2nix-dir = callPackage ./cabal2nix-dir { };
hpack-dir = callPackage ./hpack-dir { };
Expand Down