Merge pull request #99179 from 0x4A6F/master-promscale

timescale-prometheus -> promscale: 0.1.0-beta.4 -> 0.1.0-beta.5
NixOS · Oct 1, 2020 · 6aa4df7 · 6aa4df7
2 parents 25666f9 + 04a8c8a
commit 6aa4df7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/...nitoring/timescale-prometheus/default.nix → ...rvers/monitoring/prometheus/promscale.nix b/...nitoring/timescale-prometheus/default.nix → ...rvers/monitoring/prometheus/promscale.nix
@@ -4,8 +4,8 @@
 }:
 
 buildGoModule rec {
-  pname = "timescale-prometheus";
-  version = "0.1.0-beta.4";
+  pname = "promscale";
+  version = "0.1.0-beta.5";
 
   src = fetchFromGitHub {
     owner = "timescale";
@@ -16,13 +16,13 @@ buildGoModule rec {
 
   vendorSha256 = "sha256:0y5rq2y48kf2z1z3a8ags6rqzfvjs54klk2679fk8x0yjamj5x04";
 
-  buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/timescale-prometheus/pkg/version.Version=${version} -X github.com/timescale/timescale-prometheus/pkg/version.CommitHash=${src.rev}" ];
+  buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/promscale/pkg/version.Version=${version} -X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ];
 
   doCheck = false;
 
   meta = with stdenv.lib; {
     description = "An open-source analytical platform for Prometheus metrics";
-    homepage = "https://github.com/timescale/timescale-prometheus";
+    homepage = "https://github.com/timescale/promscale";
     license = licenses.asl20;
     platforms = platforms.unix;
     maintainers = with maintainers; [ _0x4A6F ];

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
@@ -597,6 +597,7 @@ mapAliases ({
   tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03
   tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03
   tftp_hpa = tftp-hpa; # added 2015-04-03
+  timescale-prometheus = promscale; # added 2020-09-29
   tomcat85 = tomcat8; # added 2020-03-11
   torbrowser = tor-browser-bundle-bin; # added 2017-04-05
   torch = throw "torch has been removed, as the upstream project has been abandoned"; # added 2020-03-28

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -16926,7 +16926,7 @@ in
     asciidoc = asciidoc-full;
   };
 
-  timescale-prometheus = callPackage ../servers/monitoring/timescale-prometheus { };
+  promscale = callPackage ../servers/monitoring/prometheus/promscale.nix { };
 
   timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { };