diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index c463f14dbbe2..7a73f70854b0 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -440,6 +440,7 @@ in { gns3-server = handleTest ./gns3-server.nix {}; gnupg = handleTest ./gnupg.nix {}; goatcounter = handleTest ./goatcounter.nix {}; + go-camo = handleTest ./go-camo.nix { }; go-neb = handleTest ./go-neb.nix {}; gobgpd = handleTest ./gobgpd.nix {}; gocd-agent = handleTest ./gocd-agent.nix {}; diff --git a/pkgs/by-name/go/go-camo/package.nix b/pkgs/by-name/go/go-camo/package.nix index 55ae97fc3bed..54a24c15e853 100644 --- a/pkgs/by-name/go/go-camo/package.nix +++ b/pkgs/by-name/go/go-camo/package.nix @@ -1,21 +1,28 @@ { lib, - buildGoModule, + buildGo124Module, fetchFromGitHub, + installShellFiles, + scdoc, }: -buildGoModule rec { +buildGo124Module rec { pname = "go-camo"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "cactus"; repo = pname; rev = "v${version}"; - hash = "sha256-916XMmSRopudpLVKSBVp415nGkRCGkkunvQZiR46aSU="; + hash = "sha256-f4XviRqu4muc2owwV3p7y5Rehl1jrf0jDhQQvGxnw7M="; }; - vendorHash = "sha256-IYXVc6SkhayYtHKbojHrQSaCQlt3E+nwrZ4sR/fuV0Y="; + vendorHash = "sha256-s6OPmtTx2/AxSm6Y0UjYORSuozPUemGyfdtv1NNlZHc="; + + nativeBuildInputs = [ + installShellFiles + scdoc + ]; ldflags = [ "-s" @@ -23,6 +30,14 @@ buildGoModule rec { "-X=main.ServerVersion=${version}" ]; + postBuild = '' + make man + ''; + + postInstall = '' + installManPage build/man/* + ''; + preCheck = '' # requires network access rm pkg/camo/proxy_{,filter_}test.go