cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

thanos: fix build go1.20 and unpin go

Browse source
This commit is contained in:
Kirill Radzikhovskyy 2023-06-04 21:15:47 +10:00
parent 962cc00249
commit d79f020366
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/servers/monitoring/thanos/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub }: { lib, buildGoModule, fetchFromGitHub, fetchpatch }:
buildGoModule rec { buildGoModule rec {
pname = "thanos"; pname = "thanos";
version = "0.31.0"; version = "0.31.0";
@ -10,7 +10,15 @@ buildGoModule rec {
sha256 = "sha256-EJZGc4thu0WhVSSRolIRYg39S81Cgm+JHwpW5eE7mDc="; 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; doCheck = true;

6
pkgs/top-level/all-packages.nix
View file

@ -26408,11 +26408,7 @@ with pkgs;
tailspin = callPackage ../tools/misc/tailspin { }; tailspin = callPackage ../tools/misc/tailspin { };
thanos = callPackage ../servers/monitoring/thanos { 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;
};
trafficserver = callPackage ../servers/http/trafficserver { }; trafficserver = callPackage ../servers/http/trafficserver { };