From 2ff5135bb5d81353c716aff19f23b35aa66f1dee Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 16 Feb 2024 16:31:49 +0000 Subject: [PATCH] doc2go: 0.5.0 -> 0.8.1 Use go1.22 as required by the go.mod toolchain directive Ignore the integration tests because it's its own module Diff: https://github.com/abhinav/doc2go/compare/v0.5.0...v0.8.1 Changelog: https://github.com/abhinav/doc2go/blob/v0.8.1/CHANGELOG.md --- pkgs/development/tools/doc2go/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/doc2go/default.nix b/pkgs/development/tools/doc2go/default.nix index 92a2e09ee446..fc2e2e8151c0 100644 --- a/pkgs/development/tools/doc2go/default.nix +++ b/pkgs/development/tools/doc2go/default.nix @@ -5,19 +5,21 @@ buildGoModule rec { pname = "doc2go"; - version = "0.5.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "abhinav"; repo = "doc2go"; rev = "v${version}"; - hash = "sha256-CFqr1laPxKNhaluGmwW7apxLQqkAFKVznDKezH8gjx0="; + hash = "sha256-b4L20/9jm+bFGdNsHmcwSnzcmr3Il9XoV20284Ba8PU="; }; - vendorHash = "sha256-2WvlH69iYqIA3d9aFVec8TZL+pMJItoNKSoDBL/NNyg="; + vendorHash = "sha256-d5ZRMFi7GIfDHsYRNvMnDdfnGhTM1sA0WDYD2aDoEd0="; ldflags = [ "-s" "-w" "-X main._version=${version}" ]; subPackages = [ "." ]; + # integration is it's own module + excludedPackages = [ "integration" ]; checkFlags = [ # needs to fetch additional go modules diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bee2c964d709..4fb55b2bffcc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -897,7 +897,9 @@ with pkgs; docker-slim = callPackage ../applications/virtualization/docker-slim { }; - doc2go = callPackage ../development/tools/doc2go { }; + doc2go = callPackage ../development/tools/doc2go { + buildGoModule = buildGo122Module; + }; docker-sync = callPackage ../tools/misc/docker-sync { };