Merge pull request #80408 from marsam/update-circleci-cli

circleci-cli: 0.1.5879 -> 0.1.6072
This commit is contained in:
Mario Rodas 2020-02-18 08:52:37 -05:00 committed by GitHub
commit 7a5cdb7996
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions

View File

@ -2,16 +2,18 @@
buildGoModule rec { buildGoModule rec {
pname = "circleci-cli"; pname = "circleci-cli";
version = "0.1.5879"; version = "0.1.6072";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "CircleCI-Public"; owner = "CircleCI-Public";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1471g56apaw0c5dpa0jrr7hvzh3kbwfr3yr0m4mz2dlf27d481ac"; sha256 = "1sbzl6y7974sib14qr2qa6d20cs54h6a3mc1whbxifg87cw02qjn";
}; };
modSha256 = "0cvmcsl00jfikpkw3f7k5zw65156z5g5l2b6s5803a2i9d613268"; modSha256 = "1pxqc2a1hb6bk67sd2c37zwg6n7h0jay3yqsjcs4jc0bqv48gzip";
buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" ];
preBuild = '' preBuild = ''
substituteInPlace data/data.go \ substituteInPlace data/data.go \

View File

@ -2409,11 +2409,7 @@ in
ciopfs = callPackage ../tools/filesystems/ciopfs { }; ciopfs = callPackage ../tools/filesystems/ciopfs { };
circleci-cli = callPackage ../development/tools/misc/circleci-cli { circleci-cli = callPackage ../development/tools/misc/circleci-cli { };
# Version 0.1.5879 fails to build with go 1.13 due to:
# build github.com/CircleCI-Public/circleci-cli: cannot load github.com/gobuffalo/packr/v2: github.com/gobuffalo/packr@v1.21.0: reading file:///nix/store/hh9hrfdg3gbqz37sa3hx44mkzkxpkkyw-circleci-cli-0.1.5879-go-modules/github.com/gobuffalo/packr/@v/v1.21.0.zip: Not Found
buildGoModule = buildGo112Module;
};
circus = callPackage ../tools/networking/circus { }; circus = callPackage ../tools/networking/circus { };