From 445b0b4395b30c8ed6149183a12c2e310666c61a Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 1 Nov 2023 07:50:28 +0100 Subject: [PATCH 1/5] terraform-plugin-docs: rename from tfplugindocs --- .../te/terraform-plugin-docs/package.nix} | 2 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) rename pkgs/{development/tools/tfplugindocs/default.nix => by-name/te/terraform-plugin-docs/package.nix} (94%) diff --git a/pkgs/development/tools/tfplugindocs/default.nix b/pkgs/by-name/te/terraform-plugin-docs/package.nix similarity index 94% rename from pkgs/development/tools/tfplugindocs/default.nix rename to pkgs/by-name/te/terraform-plugin-docs/package.nix index 7f3e4a80ba3c..dbe9ba723c3c 100644 --- a/pkgs/development/tools/tfplugindocs/default.nix +++ b/pkgs/by-name/te/terraform-plugin-docs/package.nix @@ -1,7 +1,7 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { - pname = "tfplugindocs"; + pname = "terraform-plugin-docs"; version = "0.14.1"; src = fetchFromGitHub { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 38c4126a20f1..094416b32af1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -883,6 +883,7 @@ mapAliases ({ telegram-cli = throw "telegram-cli was removed because it was broken and abandoned upstream"; # Added 2023-07-28 tensile = throw "'tensile' has been replaced with 'rocmPackages.tensile'"; # Added 2023-10-08 testVersion = testers.testVersion; # Added 2022-04-20 + tfplugindocs = terraform-plugin-docs; # Added 2023-11-01 invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 timescale-prometheus = promscale; # Added 2020-09-29 tinygltf = throw "TinyglTF has been embedded in draco due to lack of other users and compatibility breaks."; # Added 2023-06-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bce2f4635b70..388f41cb5412 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2057,8 +2057,6 @@ with pkgs; tfk8s = callPackage ../tools/misc/tfk8s { }; - tfplugindocs = callPackage ../development/tools/tfplugindocs { }; - thumbs = callPackage ../tools/misc/thumbs { }; tnat64 = callPackage ../tools/networking/tnat64 { }; From d7cd2337c8e5929d6d33a2e21cbfff383e655634 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 1 Nov 2023 07:54:50 +0100 Subject: [PATCH 2/5] terraform-plugin-docs: add meta.{changelog,mainProgram} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Philipp Böschen --- pkgs/by-name/te/terraform-plugin-docs/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/te/terraform-plugin-docs/package.nix b/pkgs/by-name/te/terraform-plugin-docs/package.nix index dbe9ba723c3c..85c0dd25d0fe 100644 --- a/pkgs/by-name/te/terraform-plugin-docs/package.nix +++ b/pkgs/by-name/te/terraform-plugin-docs/package.nix @@ -16,7 +16,9 @@ buildGoModule rec { meta = with lib; { description = "Generate and validate Terraform plugin/provider documentation"; homepage = "https://github.com/hashicorp/terraform-plugin-docs"; + changelog = "https://github.com/hashicorp/terraform-plugin-docs/releases/tag/v${version}"; license = licenses.mpl20; + mainProgram = "tfplugindocs"; maintainers = with maintainers; [ lewo ]; }; } From a5f02131483e15b4bd71c63c2ba277ca5e2a966f Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 1 Nov 2023 07:56:12 +0100 Subject: [PATCH 3/5] terraform-plugin-docs: add passthru.{tests,updateScript} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Philipp Böschen --- .../by-name/te/terraform-plugin-docs/package.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/te/terraform-plugin-docs/package.nix b/pkgs/by-name/te/terraform-plugin-docs/package.nix index 85c0dd25d0fe..183ac15c97ba 100644 --- a/pkgs/by-name/te/terraform-plugin-docs/package.nix +++ b/pkgs/by-name/te/terraform-plugin-docs/package.nix @@ -1,4 +1,10 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ lib +, buildGoModule +, fetchFromGitHub +, testers +, terraform-plugin-docs +, nix-update-script +}: buildGoModule rec { pname = "terraform-plugin-docs"; @@ -13,6 +19,14 @@ buildGoModule rec { vendorHash = "sha256-qUlyOAiLzLgrtaAfs/aGpAikGmGcQ9PI7QRyp9+Qn4w="; + passthru = { + tests.version = testers.testVersion { + command = "tfplugindocs --version"; + package = terraform-plugin-docs; + }; + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "Generate and validate Terraform plugin/provider documentation"; homepage = "https://github.com/hashicorp/terraform-plugin-docs"; From 3ac34032569468f3abd21b31ad53722dbbb843ba Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 1 Nov 2023 07:56:55 +0100 Subject: [PATCH 4/5] terraform-plugin-docs: 0.14.1 -> 0.16.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/hashicorp/terraform-plugin-docs/releases/tag/v0.16.0 https://github.com/hashicorp/terraform-plugin-docs/compare/v0.14.1...v0.16.0 Co-authored-by: Philipp Böschen --- .../te/terraform-plugin-docs/package.nix | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/te/terraform-plugin-docs/package.nix b/pkgs/by-name/te/terraform-plugin-docs/package.nix index 183ac15c97ba..9f3af301c338 100644 --- a/pkgs/by-name/te/terraform-plugin-docs/package.nix +++ b/pkgs/by-name/te/terraform-plugin-docs/package.nix @@ -8,16 +8,29 @@ buildGoModule rec { pname = "terraform-plugin-docs"; - version = "0.14.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "terraform-plugin-docs"; - rev = "v${version}"; - sha256 = "sha256-GiMjm7XG/gFGOQXYeXsKbU7WQdrkQ0+J/SvfbLu24bo="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-5vbi69GMgkzvN3aEQbNTbk99rg+kfvAvUrdDsuyIm9s="; }; - vendorHash = "sha256-qUlyOAiLzLgrtaAfs/aGpAikGmGcQ9PI7QRyp9+Qn4w="; + vendorHash = "sha256-AjW6BokLVDkIWXToJ7wNq/g19xKTAfpQ/gVlKCV5qw0="; + + subPackages = [ + "cmd/tfplugindocs" + ]; + + CGO_ENABLED = 0; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + "-X main.commit=${src.rev}" + ]; passthru = { tests.version = testers.testVersion { From dcb886fba70583e7313bfb3c5dcb670ea30ec548 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 1 Nov 2023 08:06:19 +0100 Subject: [PATCH 5/5] terraform-plugin-docs: ensure go is in the PATH MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Philipp Böschen --- pkgs/by-name/te/terraform-plugin-docs/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/te/terraform-plugin-docs/package.nix b/pkgs/by-name/te/terraform-plugin-docs/package.nix index 9f3af301c338..de64c81093c5 100644 --- a/pkgs/by-name/te/terraform-plugin-docs/package.nix +++ b/pkgs/by-name/te/terraform-plugin-docs/package.nix @@ -1,6 +1,8 @@ { lib , buildGoModule , fetchFromGitHub +, makeWrapper +, go , testers , terraform-plugin-docs , nix-update-script @@ -19,10 +21,14 @@ buildGoModule rec { vendorHash = "sha256-AjW6BokLVDkIWXToJ7wNq/g19xKTAfpQ/gVlKCV5qw0="; + nativeBuildInputs = [ makeWrapper ]; + subPackages = [ "cmd/tfplugindocs" ]; + allowGoReference = true; + CGO_ENABLED = 0; ldflags = [ @@ -32,6 +38,10 @@ buildGoModule rec { "-X main.commit=${src.rev}" ]; + postInstall = '' + wrapProgram $out/bin/tfplugindocs --prefix PATH : ${lib.makeBinPath [ go ]} + ''; + passthru = { tests.version = testers.testVersion { command = "tfplugindocs --version";