diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/by-name/th/thanos/package.nix similarity index 64% rename from pkgs/servers/monitoring/thanos/default.nix rename to pkgs/by-name/th/thanos/package.nix index b0f1ca4f6a3d..4842cb0a7d42 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/by-name/th/thanos/package.nix @@ -1,11 +1,12 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, go -, nix-update-script -, nixosTests -, testers -, thanos +{ + lib, + buildGoModule, + fetchFromGitHub, + go, + nix-update-script, + nixosTests, + testers, + thanos, }: buildGoModule rec { @@ -21,18 +22,22 @@ buildGoModule rec { vendorHash = "sha256-d+jHGmCfx9Ffm5pajm1RvKnMea99JswL0I8nmILXN50="; - doCheck = true; - subPackages = "cmd/thanos"; - ldflags = let t = "github.com/prometheus/common/version"; in [ - "-X ${t}.Version=${version}" - "-X ${t}.Revision=unknown" - "-X ${t}.Branch=unknown" - "-X ${t}.BuildUser=nix@nixpkgs" - "-X ${t}.BuildDate=unknown" - "-X ${t}.GoVersion=${lib.getVersion go}" - ]; + ldflags = + let + t = "github.com/prometheus/common/version"; + in + [ + "-X ${t}.Version=${version}" + "-X ${t}.Revision=unknown" + "-X ${t}.Branch=unknown" + "-X ${t}.BuildUser=nix@nixpkgs" + "-X ${t}.BuildDate=unknown" + "-X ${t}.GoVersion=${lib.getVersion go}" + ]; + + doCheck = true; passthru = { updateScript = nix-update-script { }; @@ -51,6 +56,9 @@ buildGoModule rec { changelog = "https://github.com/thanos-io/thanos/releases/tag/v${version}"; license = licenses.asl20; mainProgram = "thanos"; - maintainers = with maintainers; [ basvandijk anthonyroussel ]; + maintainers = with maintainers; [ + basvandijk + anthonyroussel + ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96f0ba831f9a..be0b06563647 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25525,8 +25525,6 @@ with pkgs; tailspin = callPackage ../tools/misc/tailspin { }; - thanos = callPackage ../servers/monitoring/thanos { }; - trafficserver = callPackage ../servers/http/trafficserver { }; inherit (callPackages ../servers/http/tomcat { })