Skip to content

Commit 9c52372

Browse files
authored
Merge pull request #609 from lafrenierejm/checkmake
chore(checkmake): Remove outdated version checks and comments
2 parents 4bcc124 + 127fbbd commit 9c52372

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

modules/hooks.nix

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2221,13 +2221,7 @@ in
22212221
description = "Experimental linter/analyzer for Makefiles";
22222222
types = [ "makefile" ];
22232223
package = tools.checkmake;
2224-
entry =
2225-
## NOTE: `checkmake` 0.2.2 landed in nixpkgs on 12 April 2023. Once
2226-
## this gets into a NixOS release, the following code will be useless.
2227-
lib.throwIf
2228-
(hooks.checkmake.package == null)
2229-
"The version of nixpkgs used by git-hooks.nix must have `checkmake` in version at least 0.2.2 for it to work on non-Linux systems."
2230-
"${hooks.checkmake.package}/bin/checkmake";
2224+
entry = "${hooks.checkmake.package}/bin/checkmake";
22312225
};
22322226
check-added-large-files =
22332227
{

nix/tools.nix

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ in
115115
cabal-fmt
116116
cabal-gild
117117
cargo
118+
checkmake
118119
circleci-cli
119120
clippy
120121
cljfmt
@@ -215,10 +216,6 @@ in
215216
# Note: Only broken in stable nixpkgs, works fine on latest master.
216217
opam = if stdenv.isDarwin then null else opam;
217218

218-
## NOTE: `checkmake` 0.2.2 landed in nixpkgs on 12 April 2023. Once this gets
219-
## into a NixOS release, the following code will be useless.
220-
checkmake = if stdenv.isLinux || checkmake.version >= "0.2.2" then checkmake else null;
221-
222219
headache = callPackage ./headache { };
223220

224221
# Disable tests as these take way to long on our infra.

0 commit comments

Comments
 (0)