vale{,Styles}: move to by-name, cleanup, format, refactor (#344862)

Author: pbsds

pkgs/tools/text/vale/default.nix pkgs/by-name/va/vale/package.nixpkgs/tools/text/vale/default.nix renamed to pkgs/by-name/va/vale/package.nix

@@ -1,11 +1,11 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, makeBinaryWrapper
-, runCommand
-, symlinkJoin
-, vale
-, valeStyles
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  makeBinaryWrapper,
+  symlinkJoin,
+  vale,
+  valeStyles,
 }:
 
 buildGoModule rec {
@@ -23,36 +23,43 @@ buildGoModule rec {
 
   vendorHash = "sha256-0AeG0/ALU/mkXxVKzqGhxXLqq2XYmnF/ZRaZkJ5eQxU=";
 
-  ldflags = [ "-s" "-w" "-X main.version=${version}" ];
+  ldflags = [
+    "-s"
+    "-X main.version=${version}"
+  ];
 
   # Tests require network access
   doCheck = false;
 
-  passthru.withStyles = selector: symlinkJoin {
-    name = "vale-with-styles-${vale.version}";
-    paths = [ vale ] ++ selector valeStyles;
-    nativeBuildInputs = [ makeBinaryWrapper ];
-    postBuild = ''
-      wrapProgram "$out/bin/vale" \
-        --set VALE_STYLES_PATH "$out/share/vale/styles/"
-    '';
-    meta = {
-      inherit (vale.meta) mainProgram;
+  passthru.withStyles =
+    selector:
+    symlinkJoin {
+      name = "vale-with-styles-${vale.version}";
+      paths = [ vale ] ++ selector valeStyles;
+      nativeBuildInputs = [ makeBinaryWrapper ];
+      postBuild = ''
+        wrapProgram "$out/bin/vale" \
+          --set VALE_STYLES_PATH "$out/share/vale/styles/"
+      '';
+      meta = {
+        inherit (vale.meta) mainProgram;
+      };
     };
-  };
 
-  meta = with lib; {
+  meta = {
     description = "Syntax-aware linter for prose built with speed and extensibility in mind";
     longDescription = ''
       Vale in Nixpkgs offers the helper `.withStyles` allow you to install it
       predefined styles:
 
-          vale.withStyles (s: [ s.alex s.google ])
+      ```nix
+      vale.withStyles (s: [ s.alex s.google ])
+      ```
     '';
     homepage = "https://vale.sh/";
     changelog = "https://github.com/errata-ai/vale/releases/tag/v${version}";
     mainProgram = "vale";
-    license = licenses.mit;
-    maintainers = [ maintainers.pbsds ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pbsds ];
   };
 }

pkgs/tools/text/vale/styles.nix pkgs/by-name/va/vale/styles.nixpkgs/tools/text/vale/styles.nix renamed to pkgs/by-name/va/vale/styles.nix

@@ -1,34 +1,47 @@
-{ lib, stdenvNoCC, fetchFromGitHub, fetchzip, nix-update-script }:
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  nix-update-script,
+}:
 
 let
   buildStyle =
-    { name
-    , stylePath ? name
-    , ...
+    {
+      name,
+      stylePath ? name,
+      ...
     }@args:
-    stdenvNoCC.mkDerivation ({
-      pname = "vale-style-${lib.toLower name}";
+    stdenvNoCC.mkDerivation (
+      {
+        pname = "vale-style-${lib.toLower name}";
 
-      dontConfigure = true;
-      dontBuild = true;
-      doCheck = false;
-      dontFixup = true;
+        dontConfigure = true;
+        dontBuild = true;
+        doCheck = false;
+        dontFixup = true;
 
-      installPhase = ''
-        runHook preInstall
-        mkdir -p $out/share/vale/styles
-        cp -R ${stylePath} "$out/share/vale/styles/${name}"
-        runHook postInstall
-      '';
+        installPhase = ''
+          runHook preInstall
+          mkdir -p $out/share/vale/styles
+          cp -R ${stylePath} "$out/share/vale/styles/${name}"
+          runHook postInstall
+        '';
 
-      passthru.updateScript = nix-update-script { };
+        passthru.updateScript = nix-update-script { };
 
-      meta = {
-        platforms = lib.platforms.all;
-        maintainers = with lib.maintainers; [ katexochen ];
-      } // (args.meta or { });
-    } // removeAttrs args [ "meta" "name" ]);
+        meta = {
+          platforms = lib.platforms.all;
+          maintainers = with lib.maintainers; [ katexochen ];
+        } // (args.meta or { });
+      }
+      // removeAttrs args [
+        "meta"
+        "name"
+      ]
+    );
 in
+
 {
   alex = buildStyle rec {
     name = "alex";

pkgs/top-level/all-packages.nix

@@ -23620,9 +23620,7 @@ with pkgs;
 
   libva-vdpau-driver = callPackage ../development/libraries/libva-vdpau-driver { };
 
-  vale = callPackage ../tools/text/vale { };
-
-  valeStyles = recurseIntoAttrs (callPackages ../tools/text/vale/styles.nix { });
+  valeStyles = recurseIntoAttrs (callPackages ../by-name/va/vale/styles.nix { });
 
   valhalla = callPackage ../development/libraries/valhalla {
     boost = boost.override { enablePython = true; python = python3; };