From e753322c481707fa3d972260e46ab04fdc967807 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sun, 16 Jun 2019 15:38:57 +0200 Subject: [PATCH] thanos: remove bzr because 0.5.0 apparently doesn't need it anymore I'll leave in the support for overrideModAttrs because that can be useful for other go packages. --- pkgs/servers/monitoring/thanos/default.nix | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index b7df978fd7a..4bb7e8e037c 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,11 +1,4 @@ -{ stdenv, runCommandNoCC, makeWrapper, buildGoModule, fetchFromGitHub, bazaar }: -let - bazaarNoCertValidation = - runCommandNoCC "bzr-no-cert-validation" { - inherit bazaar; - buildInputs = [ makeWrapper ]; - } "makeWrapper $bazaar/bin/bzr $out/bin/bzr --add-flags -Ossl.cert_reqs=none"; -in +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; version = "0.5.0"; @@ -17,12 +10,6 @@ buildGoModule rec { sha256 = "0my0653mkb14m93s4x3nyf8khyljkvi5sq049lir8yqzqn7p1654"; }; - overrideModAttrs = oldAttrs : { - nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [ - bazaarNoCertValidation - ]; - }; - modSha256 = "1236cg00h8077fmvyddwjsnw85r69ac18b2chcpgzd85xdcaxavk"; subPackages = "cmd/thanos";