From f38d6171c94d67bc00cb9f931737e5472d9c818e Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Sun, 22 Sep 2024 18:13:43 +0900
Subject: [PATCH] actionlint: moved to by-name and modernized derivation -
 Removed `rec` - Formatted via nixfmt-rfc-style - Removed `with lib;`

---
 .../ac/actionlint/package.nix}                | 49 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 33 insertions(+), 18 deletions(-)
 rename pkgs/{development/tools/analysis/actionlint/default.nix => by-name/ac/actionlint/package.nix} (56%)

diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/by-name/ac/actionlint/package.nix
similarity index 56%
rename from pkgs/development/tools/analysis/actionlint/default.nix
rename to pkgs/by-name/ac/actionlint/package.nix
index 417a28cd1599..38090f7bebde 100644
--- a/pkgs/development/tools/analysis/actionlint/default.nix
+++ b/pkgs/by-name/ac/actionlint/package.nix
@@ -1,16 +1,20 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, installShellFiles
-, makeWrapper
-, python3Packages
-, ronn
-, shellcheck
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+  makeWrapper,
+  python3Packages,
+  ronn,
+  shellcheck,
 }:
 
-buildGoModule rec {
-  pname = "actionlint";
+let
   version = "1.7.1";
+in
+buildGoModule {
+  pname = "actionlint";
+  inherit version;
 
   subPackages = [ "cmd/actionlint" ];
 
@@ -23,23 +27,36 @@ buildGoModule rec {
 
   vendorHash = "sha256-ZREtrdHUD1B1Mogidp1y/kFTK+KR4qYJj1c/M+0utPM=";
 
-  nativeBuildInputs = [ makeWrapper ronn installShellFiles ];
+  nativeBuildInputs = [
+    makeWrapper
+    ronn
+    installShellFiles
+  ];
 
   postInstall = ''
     ronn --roff man/actionlint.1.ronn
     installManPage man/actionlint.1
     wrapProgram "$out/bin/actionlint" \
-      --prefix PATH : ${lib.makeBinPath [ python3Packages.pyflakes shellcheck ]}
+      --prefix PATH : ${
+        lib.makeBinPath [
+          python3Packages.pyflakes
+          shellcheck
+        ]
+      }
   '';
 
-  ldflags = [ "-s" "-w" "-X github.com/rhysd/actionlint.version=${version}" ];
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/rhysd/actionlint.version=${version}"
+  ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://rhysd.github.io/actionlint/";
     description = "Static checker for GitHub Actions workflow files";
     changelog = "https://github.com/rhysd/actionlint/raw/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ momeemt ];
     mainProgram = "actionlint";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 587c69d8ed05..f6bcdbd181a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16948,8 +16948,6 @@ with pkgs;
 
   actiona = libsForQt5.callPackage ../applications/misc/actiona { };
 
-  actionlint = callPackage ../development/tools/analysis/actionlint { };
-
   adreaper = callPackage ../tools/security/adreaper { };
 
   aeron = callPackage ../servers/aeron { };