Unverified Commit 8d08c933 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #235916 from kirillrdy/thanos 

thanos: fix build go1.20 and unpin go
parents a807192d d79f0203

pkgs/servers/monitoring/thanos/default.nix

+10 −2
Original line number Diff line number Diff line 
{ lib, buildGoModule, fetchFromGitHub }:

{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:

buildGoModule rec {

  pname = "thanos";

  version = "0.31.0";
@@ -10,7 +10,15 @@ buildGoModule rec { 
    sha256 = "sha256-EJZGc4thu0WhVSSRolIRYg39S81Cgm+JHwpW5eE7mDc=";

  };



  vendorHash = "sha256-bNQwDttJ7YuQFrpp0alqe37/lue0CX5gB2UDRWWtTXQ=";

  patches = [

    # https://github.com/thanos-io/thanos/pull/6126

    (fetchpatch {

      url = "https://github.com/thanos-io/thanos/commit/a4c218bd690259fc0c78fe67e0739bd33d38541e.patch";

      hash = "sha256-Hxc1s5IXAyw01/o4JvOXuyYuOFy0+cBUv3OkRv4DCXs=";

    })

  ];



  vendorHash = "sha256-8+MUMux6v/O2syVyTx758yUBfJkertzibz6yFB05nWk=";



  doCheck = true;

pkgs/top-level/all-packages.nix

+1 −5
Original line number Diff line number Diff line
@@ -26414,11 +26414,7 @@ with pkgs; 














  tailspin = callPackage ../tools/misc/tailspin { };



























  thanos = callPackage ../servers/monitoring/thanos {













    # Fails to run with go1.20 due to go4.org/unsafe/assume-no-moving-gc not being













    # update to be compatible with Go 1.20













    buildGoModule = buildGo119Module;













  };













  thanos = callPackage ../servers/monitoring/thanos { };





























  trafficserver = callPackage ../servers/http/trafficserver { };