diff options
author | WilliButz <wbutz@cyberfnord.de> | 2019-09-06 21:33:32 +0200 |
---|---|---|
committer | WilliButz <wbutz@cyberfnord.de> | 2019-09-06 21:55:19 +0200 |
commit | 283d9a09427e8a13111a943409f6963b983c9f7f (patch) | |
tree | d758180fb0ff841e5ce286dfadf6940d7a2cab4d /pkgs/servers/monitoring/prometheus | |
parent | 0f52e11c404260832e6eeb3cf3b3bc9481f9cd7f (diff) | |
download | nixlib-283d9a09427e8a13111a943409f6963b983c9f7f.tar nixlib-283d9a09427e8a13111a943409f6963b983c9f7f.tar.gz nixlib-283d9a09427e8a13111a943409f6963b983c9f7f.tar.bz2 nixlib-283d9a09427e8a13111a943409f6963b983c9f7f.tar.lz nixlib-283d9a09427e8a13111a943409f6963b983c9f7f.tar.xz nixlib-283d9a09427e8a13111a943409f6963b983c9f7f.tar.zst nixlib-283d9a09427e8a13111a943409f6963b983c9f7f.zip |
prometheus: remove prometheus_1, rename prometheus_2
As prometheus is no longer developed, nixpkgs now only includes prometheus 2. Having only one version of prometheus, there is no need for having the version in the attribute name.
Diffstat (limited to 'pkgs/servers/monitoring/prometheus')
-rw-r--r-- | pkgs/servers/monitoring/prometheus/default.nix | 82 |
1 files changed, 37 insertions, 45 deletions
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 627186e47ac3..e55d0018b882 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,54 +1,46 @@ -{ stdenv, go, buildGoPackage, fetchFromGitHub }: +{ lib, go, buildGoPackage, fetchFromGitHub }: let goPackagePath = "github.com/prometheus/prometheus"; -in rec { - buildPrometheus = { version, sha256, doCheck ? true, ... }@attrs: - let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in - buildGoPackage ({ - name = "prometheus-${version}"; +in +buildGoPackage rec { + pname = "prometheus"; + version = "2.12.0"; - inherit goPackagePath; + inherit goPackagePath; - src = fetchFromGitHub { - rev = "v${version}"; - owner = "prometheus"; - repo = "prometheus"; - inherit sha256; - }; - - buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in '' - -ldflags= - -X ${t}.Version=${version} - -X ${t}.Revision=unknown - -X ${t}.Branch=unknown - -X ${t}.BuildUser=nix@nixpkgs - -X ${t}.BuildDate=unknown - -X ${t}.GoVersion=${stdenv.lib.getVersion go} - ''; - - preInstall = '' - mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus" - cp -a $src/documentation/* $bin/share/doc/prometheus - cp -a $src/console_libraries $src/consoles $bin/etc/prometheus - ''; - - meta = with stdenv.lib; { - description = "Service monitoring system and time series database"; - homepage = https://prometheus.io; - license = licenses.asl20; - maintainers = with maintainers; [ benley fpletz globin ]; - platforms = platforms.unix; - }; - } // attrs'); - - prometheus_1 = buildPrometheus { - version = "1.8.2"; - sha256 = "088flpg3qgnj9afl9vbaa19v2s1d21yxy38nrlv5m7cxwy2pi5pv"; + src = fetchFromGitHub { + rev = "v${version}"; + owner = "prometheus"; + repo = "prometheus"; + sha256 = "1ci9dc512c1hry1b8jqif0mrnks6w3yagwm3jf69ihcwilr2n7vs"; }; - prometheus_2 = buildPrometheus { - version = "2.12.0"; - sha256 = "1ci9dc512c1hry1b8jqif0mrnks6w3yagwm3jf69ihcwilr2n7vs"; + buildFlagsArray = let + t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; + in '' + -ldflags= + -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} + ''; + + preInstall = '' + mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus" + cp -a $src/documentation/* $bin/share/doc/prometheus + cp -a $src/console_libraries $src/consoles $bin/etc/prometheus + ''; + + doCheck = true; + + meta = with lib; { + description = "Service monitoring system and time series database"; + homepage = "https://prometheus.io"; + license = licenses.asl20; + maintainers = with maintainers; [ benley fpletz globin willibutz ]; + platforms = platforms.unix; }; } |