Skip to content

Commit 7915de0

Browse files
authored
Merge pull request #230 from cachix/nixos-21.11
nixos: 22.05 -> 22.11
2 parents 756cc26 + ebff638 commit 7915de0

File tree

6 files changed

+13
-43
lines changed

6 files changed

+13
-43
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
name: pre-commit-hooks
1717
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
18-
- run: nix-build
18+
- run: nix-build --keep-going
1919
tests-flakes:
2020
strategy:
2121
matrix:

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ use nix
8484
- [deadnix](https://github.com/astro/deadnix)
8585
- [nixpkgs-fmt](https://github.com/nix-community/nixpkgs-fmt)
8686
- [nixfmt](https://github.com/serokell/nixfmt/)
87-
- [nix-linter](https://github.com/Synthetica9/nix-linter)
8887
- [statix](https://github.com/nerdypepper/statix)
8988

9089
## Haskell
@@ -95,7 +94,6 @@ use nix
9594
- [stylish-haskell](https://github.com/jaspervdj/stylish-haskell)
9695
- [hlint](https://github.com/ndmitchell/hlint)
9796
- [cabal-fmt](https://github.com/phadej/cabal-fmt)
98-
- [brittany](https://github.com/lspitzner/brittany)
9997
- [hpack](https://github.com/sol/hpack)
10098

10199
## Elm

flake.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
description = "Seamless integration of https://pre-commit.com git hooks with Nix.";
33

44
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
5-
inputs.nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-22.05";
5+
inputs.nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-22.11";
66
inputs.flake-utils.url = "github:numtide/flake-utils";
77
inputs.flake-compat = {
88
url = "github:edolstra/flake-compat";
@@ -46,7 +46,7 @@
4646
inherit (exposed.checks.pre-commit-check) shellHook;
4747
};
4848

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

5151
lib = { inherit (exposed) run; };
5252
}

modules/hooks.nix

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -118,16 +118,6 @@ in
118118
default = { };
119119
};
120120
};
121-
nix-linter =
122-
{
123-
checks =
124-
mkOption {
125-
type = types.listOf types.str;
126-
description = lib.mdDoc
127-
"Available checks. See `nix-linter --help-for [CHECK]` for more details.";
128-
default = [ ];
129-
};
130-
};
131121
nixfmt =
132122
{
133123
width =
@@ -385,13 +375,6 @@ in
385375
"proto"
386376
];
387377
};
388-
brittany =
389-
{
390-
name = "brittany";
391-
description = "Haskell source code formatter.";
392-
entry = "${tools.brittany}/bin/brittany --write-mode=inplace";
393-
files = "\\.l?hs(-boot)?$";
394-
};
395378
dhall-format = {
396379
name = "dhall-format";
397380
description = "Dhall code formatter.";
@@ -554,16 +537,6 @@ in
554537
files = "\\.nix$";
555538
pass_filenames = false;
556539
};
557-
nix-linter =
558-
{
559-
name = "nix-linter";
560-
description = "Linter for the Nix expression language.";
561-
entry =
562-
"${tools.nix-linter}/bin/nix-linter ${
563-
lib.escapeShellArgs (lib.concatMap (check: [ "-W" "${check}" ]) settings.nix-linter.checks)
564-
}";
565-
files = "\\.nix$";
566-
};
567540
elm-format =
568541
{
569542
name = "elm-format";

nix/tools.nix

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
, hunspell
2525
, luaPackages
2626
, mdsh
27-
, nix-linter
2827
, nixfmt
2928
, nixpkgs-fmt
3029
, nodePackages
@@ -40,6 +39,7 @@
4039
, stylua
4140
, texlive
4241
, typos
42+
, yamllint
4343
, writeScript
4444
, writeText
4545
, go
@@ -54,13 +54,12 @@ let
5454
};
5555
in
5656
{
57-
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;
57+
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;
5858
inherit (elmPackages) elm-format elm-review elm-test;
5959
# TODO: these two should be statically compiled
60-
inherit (haskellPackages) brittany fourmolu;
60+
inherit (haskellPackages) fourmolu;
6161
inherit (luaPackages) luacheck;
6262
inherit (nodePackages) eslint markdownlint-cli prettier;
63-
inherit (python39Packages) ansible-lint yamllint;
6463
purs-tidy = nodePackages.purs-tidy or null;
6564
cabal2nix-dir = callPackage ./cabal2nix-dir { };
6665
hpack-dir = callPackage ./hpack-dir { };

0 commit comments

Comments
 (0)