git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #138192 from andreyk0/master

cloud-sql-proxy: 1.13 -> 1.25.0

commitf3f5bbffb96b8896d13b14e4804f6bd80037228c authorfigsoda <figsoda@pm.me> dateFri 17 Sep 2021, 17:34 (5 years ago) parent25746853c4fe82
2 files changed+12−63
compare with master
unifiedsplit
pkgs/tools/misc/cloud-sql-proxy/default.nix+12−15 pkgs/tools/misc/cloud-sql-proxy/deps.nix−48
pkgs/tools/misc/cloud-sql-proxy/default.nix+12−15
@@ -1,27 +1,24 @@
1−{ lib, buildGoPackage, fetchgit }:
1+{ lib, buildGoModule, fetchFromGitHub }:
22
3−buildGoPackage rec {
3+buildGoModule rec {
44 pname = "cloud-sql-proxy";
5− version = "1.13";
5+ version = "1.25.0";
66
7− goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy";
8−
9− subPackages = [ "cmd/cloud_sql_proxy" ];
10−
11− src = fetchgit {
12− rev = version;
13− url = "https://${goPackagePath}";
14− sha256 = "07n2hfhqa9hinabmx79aqqwxzzkky76x3jvpd89kch14fijbh532";
7+ src = fetchFromGitHub {
8+ owner = "GoogleCloudPlatform";
9+ repo = "cloudsql-proxy";
10+ rev = "v${version}";
11+ sha256 = "0vz5fm1bgh2g7b320hchpfb4iql1src1rpm7324sqcd26p7w3mnl";
1512 };
1613
17− goDeps = ./deps.nix;
14+ subPackages = [ "cmd/cloud_sql_proxy" ];
1815
19− ldflags = [ "-X main.versionString=${version}" ];
16+ vendorSha256 = "04y6zx3jdyj07d68a4vk4p5rzvvjnvdwk9kkipmlmqg1xqwlb84m";
2017
2118 meta = with lib; {
2219 description = "An authenticating proxy for Second Generation Google Cloud SQL databases";
23− homepage = "https://${goPackagePath}";
20+ homepage = "https://github.com/GoogleCloudPlatform/cloudsql-proxy";
2421 license = licenses.asl20;
25− maintainers = [ maintainers.nicknovitski ];
22+ maintainers = with maintainers; [ nicknovitski ];
2623 };
2724}
pkgs/tools/misc/cloud-sql-proxy/deps.nixdeleted−48
@@ -1,48 +0,0 @@
1−# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
2−[
3− {
4− goPackagePath = "bazil.org/fuse";
5− fetch = {
6− type = "git";
7− url = "https://github.com/bazil/fuse";
8− rev = "65cc252bf6691cb3c7014bcb2c8dc29de91e3a7e";
9− sha256 = "0qjm9yrhc5h632wwhklqzhalid4lxcm9iwsqs3jahp303rm27vpk";
10− };
11− }
12− {
13− goPackagePath = "cloud.google.com/go";
14− fetch = {
15− type = "git";
16− url = "https://code.googlesource.com/gocloud";
17− rev = "dba8c2c195294739180b3e6865f8893eb808676e";
18− sha256 = "1l6aj26sd7byjcgi2b4k452fcg949v28lff2fkw5nq2qr2fjnqxy";
19− };
20− }
21− {
22− goPackagePath = "golang.org/x/net";
23− fetch = {
24− type = "git";
25− url = "https://go.googlesource.com/net";
26− rev = "9b4f9f5ad5197c79fd623a3638e70d8b26cef344";
27− sha256 = "06hvxy113h76f31gv1mq6vdr6xja1zv0fdig686l2b4y2b6swych";
28− };
29− }
30− {
31− goPackagePath = "golang.org/x/oauth2";
32− fetch = {
33− type = "git";
34− url = "https://go.googlesource.com/oauth2";
35− rev = "9dcd33a902f40452422c2367fefcb95b54f9f8f8";
36− sha256 = "15lfa780h2ff50qvcdl7sfs9f9j13fa5kfj6fb292rk3fwxhnx4i";
37− };
38− }
39− {
40− goPackagePath = "google.golang.org/api";
41− fetch = {
42− type = "git";
43− url = "https://code.googlesource.com/google-api-go-client";
44− rev = "39567f0042a03aeb2691599961ed4454e43d5063";
45− sha256 = "0c5gx156v1pk0gqvl9w43l06z0rh9g2sackpl9ghds0asnyqx04d";
46− };
47− }
48−]