Update lint-utils to master, and fix checks

This commit is contained in:
Sridhar Ratnakumar 2022-03-26 11:59:19 -04:00
parent 082ed32bae
commit 3a330068f1
3 changed files with 10 additions and 10 deletions

View file

@ -23,4 +23,4 @@ jobs:
- name: Flake check - name: Flake check
id: flake-check id: flake-check
run: | run: |
nix flake check nix build .#check.x86_64-linux

10
flake.lock generated
View file

@ -54,16 +54,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1648232278, "lastModified": 1648246591,
"narHash": "sha256-GDyLjj64sA65MPMlOtzs5DHPK4O5O8u6jMYKiGHgaPU=", "narHash": "sha256-GDyLjj64sA65MPMlOtzs5DHPK4O5O8u6jMYKiGHgaPU=",
"ref": "lc/fourmolu", "ref": "master",
"rev": "822770e9ca42d594a25f5b161f93f21c5d023bbd", "rev": "3a4289e086d48b409c8c6eb51de1d9e405c7f379",
"revCount": 19, "revCount": 20,
"type": "git", "type": "git",
"url": "https://gitlab.homotopic.tech/nix/lint-utils.git" "url": "https://gitlab.homotopic.tech/nix/lint-utils.git"
}, },
"original": { "original": {
"ref": "lc/fourmolu", "ref": "master",
"type": "git", "type": "git",
"url": "https://gitlab.homotopic.tech/nix/lint-utils.git" "url": "https://gitlab.homotopic.tech/nix/lint-utils.git"
} }

View file

@ -11,7 +11,7 @@
lint-utils = { lint-utils = {
type = "git"; type = "git";
url = "https://gitlab.homotopic.tech/nix/lint-utils.git"; url = "https://gitlab.homotopic.tech/nix/lint-utils.git";
ref = "lc/fourmolu"; ref = "master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
@ -67,9 +67,9 @@
# Used by `nix flake check` # Used by `nix flake check`
checks = { checks = {
format-haskell = inputs.lint-utils.linters.${system}.${haskellFormatter}; format-haskell = inputs.lint-utils.linters.${system}.${haskellFormatter} ./.;
format-cabal = inputs.lint-utils.linters.${system}.cabal; format-cabal = inputs.lint-utils.linters.${system}.cabal-fmt ./.;
format-nix = inputs.lint-utils.linters.${system}.nixpkgs-fmt; format-nix = inputs.lint-utils.linters.${system}.nixpkgs-fmt ./.;
}; };
check = check =
pkgs.runCommand "combined-checks" pkgs.runCommand "combined-checks"