From aeb3a34a9105e202fd5e32c71fd57f1f36fdd798 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Tue, 25 Feb 2020 20:23:38 -0500 Subject: [PATCH 1/3] vale: 2.0.0 -> 2.2.2 Switch from buildGoPackage to buildGoModule According to documentation, buildGoPackage is designed for legacy Go packages which do not support go.mod, while "vale" do support it. --- pkgs/tools/text/vale/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 6035c2950a9625..0e4166a7bd5584 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "vale"; - version = "2.0.0"; + version = "2.2.2"; subPackages = [ "." ]; @@ -10,9 +10,13 @@ buildGoPackage rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "068973ayd883kzkxl60lpammf3icjz090nw07kfccvhcf24x07bh"; + sha256 = "11pgszm9cb65liczpnq04l1rx0v68jgmkzrw7ax5kln5hgnrh4kb"; }; + deleteVendor = true; + + vendorSha256 = "150pvy94vfjvn74d63az917szixw1nhl60y1adixg8xqpcjnv9hj"; + goPackagePath = "github.com/errata-ai/vale"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; From 589fb6b3744ac64e4d67ae14beb10a456d59f0bd Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Tue, 25 Feb 2020 20:33:33 -0500 Subject: [PATCH 2/3] vale: install documentation into $doc output --- pkgs/tools/text/vale/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 0e4166a7bd5584..c7b06b7e0f6f56 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -5,6 +5,7 @@ buildGoModule rec { version = "2.2.2"; subPackages = [ "." ]; + outputs = ["out" "doc"]; src = fetchFromGitHub { owner = "errata-ai"; @@ -18,6 +19,10 @@ buildGoModule rec { vendorSha256 = "150pvy94vfjvn74d63az917szixw1nhl60y1adixg8xqpcjnv9hj"; goPackagePath = "github.com/errata-ai/vale"; + postInstall = '' + mkdir -p $doc/share/doc/vale + cp -r docs/* $doc/share/doc/vale + ''; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; From 90a4f2d9bac48b6833f1c952c25d8c606bc159ce Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Tue, 25 Feb 2020 21:33:10 -0500 Subject: [PATCH 3/3] vale: install styles provided by upstream --- pkgs/tools/text/vale/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index c7b06b7e0f6f56..96969b0a310ab1 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { version = "2.2.2"; subPackages = [ "." ]; - outputs = ["out" "doc"]; + outputs = ["out" "doc" "data"]; src = fetchFromGitHub { owner = "errata-ai"; @@ -21,7 +21,9 @@ buildGoModule rec { goPackagePath = "github.com/errata-ai/vale"; postInstall = '' mkdir -p $doc/share/doc/vale + mkdir -p $data/share/vale cp -r docs/* $doc/share/doc/vale + cp -r styles $data/share/vale ''; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];