tflint: moved to by-name and modernized derivation (#343856)

This commit is contained in:
Tomo 2024-10-24 19:55:54 -07:00 committed by GitHub
commit 94e7097c53
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 28 additions and 21 deletions

View File

@ -1,21 +1,25 @@
{ lib
, buildGoModule
, fetchFromGitHub
, runCommand
, makeWrapper
, tflint
, tflint-plugins
, symlinkJoin
{
lib,
buildGoModule,
fetchFromGitHub,
runCommand,
makeWrapper,
tflint,
tflint-plugins,
symlinkJoin,
}:
buildGoModule rec {
let
pname = "tflint";
version = "0.52.0";
in
buildGoModule {
inherit pname version;
src = fetchFromGitHub {
owner = "terraform-linters";
repo = pname;
rev = "v${version}";
rev = "refs/tags/v${version}";
hash = "sha256-H27krznCX00F0EZ4ahdsMVh+wcAAUC/ErQac9Y4QaJs=";
};
@ -25,9 +29,13 @@ buildGoModule rec {
subPackages = [ "." ];
ldflags = [ "-s" "-w" ];
ldflags = [
"-s"
"-w"
];
passthru.withPlugins = plugins:
passthru.withPlugins =
plugins:
let
actualPlugins = plugins tflint-plugins;
pluginDir = symlinkJoin {
@ -38,17 +46,18 @@ buildGoModule rec {
runCommand "tflint-with-plugins"
{
nativeBuildInputs = [ makeWrapper ];
} ''
makeWrapper ${tflint}/bin/tflint $out/bin/tflint \
--set TFLINT_PLUGIN_DIR "${pluginDir}"
'';
}
''
makeWrapper ${tflint}/bin/tflint $out/bin/tflint \
--set TFLINT_PLUGIN_DIR "${pluginDir}"
'';
meta = with lib; {
meta = {
description = "Terraform linter focused on possible errors, best practices, and so on";
mainProgram = "tflint";
homepage = "https://github.com/terraform-linters/tflint";
changelog = "https://github.com/terraform-linters/tflint/blob/v${version}/CHANGELOG.md";
license = licenses.mpl20;
maintainers = [ ];
license = lib.licenses.mpl20;
maintainers = with lib.maintainers; [ momeemt ];
};
}

View File

@ -18556,8 +18556,6 @@ with pkgs;
time-ghc-modules = callPackage ../development/tools/time-ghc-modules { };
tflint = callPackage ../development/tools/analysis/tflint { };
tflint-plugins = recurseIntoAttrs (
callPackage ../development/tools/analysis/tflint-plugins { }
);