Unverified Commit 06e72889 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

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

parents 1c0f0944 67871612

pkgs/tools/text/vale/default.nix→pkgs/by-name/va/vale/package.nix

+31 −24
Original line number Diff line number Diff line 
{ lib

, buildGoModule

, fetchFromGitHub

, makeBinaryWrapper

, runCommand

, symlinkJoin

, vale

, valeStyles

{

  lib,

  buildGoModule,

  fetchFromGitHub,

  makeBinaryWrapper,

  symlinkJoin,

  vale,

  valeStyles,

}:



buildGoModule rec {
@@ -23,12 +23,17 @@ 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 {

  passthru.withStyles =

    selector:

    symlinkJoin {

      name = "vale-with-styles-${vale.version}";

      paths = [ vale ] ++ selector valeStyles;

      nativeBuildInputs = [ makeBinaryWrapper ];
@@ -41,18 +46,20 @@ buildGoModule rec { 
      };

    };



  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:



      ```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.nix

+35 −22
Original line number Diff line number Diff line 
{ lib, stdenvNoCC, fetchFromGitHub, fetchzip, nix-update-script }:

{

  lib,

  stdenvNoCC,

  fetchFromGitHub,

  nix-update-script,

}:



let

  buildStyle =

    { name

    , stylePath ? name

    , ...

    {

      name,

      stylePath ? name,

      ...

    }@args:

    stdenvNoCC.mkDerivation ({

    stdenvNoCC.mkDerivation (

      {

        pname = "vale-style-${lib.toLower name}";



        dontConfigure = true;
@@ -27,8 +34,14 @@ let 
          platforms = lib.platforms.all;

          maintainers = with lib.maintainers; [ katexochen ];

        } // (args.meta or { });

    } // removeAttrs args [ "meta" "name" ]);

      }

      // removeAttrs args [

        "meta"

        "name"

      ]

    );

in



{

  alex = buildStyle rec {

    name = "alex";

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -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; };