diff options
author | figsoda <figsoda@pm.me> | 2021-09-17 17:34:34 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-17 17:34:34 -0400 |
commit | f3f5bbffb96b8896d13b14e4804f6bd80037228c (patch) | |
tree | f12e2f025af28068e3d57b6084b1737b6daaf7c0 /pkgs/tools | |
parent | 25746859c01b3e4eb8a303fb16fc8425a03378fd (diff) | |
parent | 3c4fe82a3d7fff72c4745656e64d686b46fb0aa5 (diff) |
Merge pull request #138192 from andreyk0/master
cloud-sql-proxy: 1.13 -> 1.25.0
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/misc/cloud-sql-proxy/default.nix | 27 | ||||
-rw-r--r-- | pkgs/tools/misc/cloud-sql-proxy/deps.nix | 48 |
2 files changed, 12 insertions, 63 deletions
diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix index 6f5a6ec25fbb2..f1f7d1bf23926 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -1,27 +1,24 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "cloud-sql-proxy"; - version = "1.13"; + version = "1.25.0"; - goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy"; - - subPackages = [ "cmd/cloud_sql_proxy" ]; - - src = fetchgit { - rev = version; - url = "https://${goPackagePath}"; - sha256 = "07n2hfhqa9hinabmx79aqqwxzzkky76x3jvpd89kch14fijbh532"; + src = fetchFromGitHub { + owner = "GoogleCloudPlatform"; + repo = "cloudsql-proxy"; + rev = "v${version}"; + sha256 = "0vz5fm1bgh2g7b320hchpfb4iql1src1rpm7324sqcd26p7w3mnl"; }; - goDeps = ./deps.nix; + subPackages = [ "cmd/cloud_sql_proxy" ]; - ldflags = [ "-X main.versionString=${version}" ]; + vendorSha256 = "04y6zx3jdyj07d68a4vk4p5rzvvjnvdwk9kkipmlmqg1xqwlb84m"; meta = with lib; { description = "An authenticating proxy for Second Generation Google Cloud SQL databases"; - homepage = "https://${goPackagePath}"; + homepage = "https://github.com/GoogleCloudPlatform/cloudsql-proxy"; license = licenses.asl20; - maintainers = [ maintainers.nicknovitski ]; + maintainers = with maintainers; [ nicknovitski ]; }; } diff --git a/pkgs/tools/misc/cloud-sql-proxy/deps.nix b/pkgs/tools/misc/cloud-sql-proxy/deps.nix deleted file mode 100644 index 6898833b6f12e..0000000000000 --- a/pkgs/tools/misc/cloud-sql-proxy/deps.nix +++ /dev/null @@ -1,48 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "bazil.org/fuse"; - fetch = { - type = "git"; - url = "https://github.com/bazil/fuse"; - rev = "65cc252bf6691cb3c7014bcb2c8dc29de91e3a7e"; - sha256 = "0qjm9yrhc5h632wwhklqzhalid4lxcm9iwsqs3jahp303rm27vpk"; - }; - } - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "dba8c2c195294739180b3e6865f8893eb808676e"; - sha256 = "1l6aj26sd7byjcgi2b4k452fcg949v28lff2fkw5nq2qr2fjnqxy"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "9b4f9f5ad5197c79fd623a3638e70d8b26cef344"; - sha256 = "06hvxy113h76f31gv1mq6vdr6xja1zv0fdig686l2b4y2b6swych"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "9dcd33a902f40452422c2367fefcb95b54f9f8f8"; - sha256 = "15lfa780h2ff50qvcdl7sfs9f9j13fa5kfj6fb292rk3fwxhnx4i"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "39567f0042a03aeb2691599961ed4454e43d5063"; - sha256 = "0c5gx156v1pk0gqvl9w43l06z0rh9g2sackpl9ghds0asnyqx04d"; - }; - } -] |