diff options
author | Silvan Mosberger <infinisil@icloud.com> | 2019-04-23 00:41:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-23 00:41:45 +0200 |
commit | ed569c149267f7ab3e508de92939257d29bd2dfe (patch) | |
tree | 4e456df861a05ff1319bd8af8fc610c3d61402c0 | |
parent | 676144a11d38e729144f74c16a2e1fa8558c896f (diff) | |
parent | 64ed902a330ac5a5257a7ccc720c791807d22c3d (diff) |
Merge pull request #60007 from marsam/update-pgmetrics
pgmetrics: 1.6.1 -> 1.6.2
-rw-r--r-- | pkgs/tools/misc/pgmetrics/default.nix | 16 | ||||
-rw-r--r-- | pkgs/tools/misc/pgmetrics/deps.nix | 84 |
2 files changed, 7 insertions, 93 deletions
diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index 1fcb79663c489..053c2efe441db 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -1,19 +1,17 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "pgmetrics"; - version = "1.6.1"; - - goPackagePath = "github.com/rapidloop/pgmetrics"; + version = "1.6.2"; src = fetchFromGitHub { owner = "rapidloop"; - repo = "pgmetrics"; - rev = "refs/tags/v${version}"; - sha256 = "0dj4b4gghzzwnzb0fdix1ps97scfr24f6dfa7d0vwak95ds5vz3s"; + repo = pname; + rev = "v${version}"; + sha256 = "06yqv6a6p7h10rkp95ssifzqp2h2j0vlm57hliyi94jxd8srgwh5"; }; - goDeps = ./deps.nix; + modSha256 = "0llbx2sgcx95ym2q4l3334rdj3nkgr9z5jyp8406cp3k1ixi7gdb"; meta = with stdenv.lib; { homepage = https://pgmetrics.io/; diff --git a/pkgs/tools/misc/pgmetrics/deps.nix b/pkgs/tools/misc/pgmetrics/deps.nix deleted file mode 100644 index 3d04249d5dda8..0000000000000 --- a/pkgs/tools/misc/pgmetrics/deps.nix +++ /dev/null @@ -1,84 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "bb3d318650d4"; - sha256 = "1lqd8ix3cb164j5iazjby2jpa6bdsflhy0h9mi4yldvvcvrc194c"; - }; - } - { - goPackagePath = "github.com/howeyc/gopass"; - fetch = { - type = "git"; - url = "https://github.com/howeyc/gopass"; - rev = "bf9dde6d0d2c"; - sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; - }; - } - { - goPackagePath = "github.com/pborman/getopt"; - fetch = { - type = "git"; - url = "https://github.com/pborman/getopt"; - rev = "7148bc3a4c30"; - sha256 = "0zhvvmv671r1fbdd5hbv3flx8k2rb60giqx115w0553c56qkqfpj"; - }; - } - { - goPackagePath = "github.com/rapidloop/pq"; - fetch = { - type = "git"; - url = "https://github.com/rapidloop/pq"; - rev = "66681b501d6d"; - sha256 = "1pa3h40b52g3vdwgh6ny0hw66qmxf64jqapxyy1zkjhhwab1h71y"; - }; - } - { - goPackagePath = "github.com/xdg-go/stringprep"; - fetch = { - type = "git"; - url = "https://github.com/xdg-go/stringprep"; - rev = "v1.0.0"; - sha256 = "03nard51zgzbaq64p6gsvrz8fps3yazl3ydd115y0bppkdx2i4ji"; - }; - } - { - goPackagePath = "github.com/xdg/stringprep"; - fetch = { - type = "git"; - url = "https://github.com/xdg/stringprep"; - rev = "v1.0.0"; - sha256 = "03nard51zgzbaq64p6gsvrz8fps3yazl3ydd115y0bppkdx2i4ji"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "432090b8f568"; - sha256 = "1i8616qqwih6g5nx8c1hfqhp0kb110ml3xkgsn6qvc36q04amjmq"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "37707fdb30a5"; - sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } -] |