Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-03-11 18:23:54 +00:00
committed by GitHub
48 changed files with 623 additions and 283 deletions
@@ -1,10 +1,10 @@
GEM
remote: https://rubygems.org/
specs:
bundler-audit (0.7.0.1)
bundler-audit (0.8.0)
bundler (>= 1.2.0, < 3)
thor (>= 0.18, < 2)
thor (1.0.1)
thor (~> 1.0)
thor (1.1.0)
PLATFORMS
ruby
+4 -4
View File
@@ -5,19 +5,19 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04l9rs56rlvihbr2ybkrigjajgd3swa98lxvmdl8iylj1g5m7n0j";
sha256 = "00l8rs7cna0j3yh4s9sza0r88x7kjc7j4gp9yl378422k7i0r73v";
type = "gem";
};
version = "0.7.0.1";
version = "0.8.0";
};
thor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm";
sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna";
type = "gem";
};
version = "1.0.1";
version = "1.1.0";
};
}
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "gitleaks";
version = "7.2.2";
version = "7.3.0";
src = fetchFromGitHub {
owner = "zricethezav";
repo = pname;
rev = "v${version}";
sha256 = "sha256-G/7Ezyfp9vkG1QHTG9Xg6mZ3qhQpx952i7rsSr3fFwY=";
sha256 = "sha256-IJaumIFuIhrvXZ45uz8RUxAuprnWdv2lNzxNUascvVc=";
};
vendorSha256 = "0kk8ci7vprqw4v7cigspshfd13k2wyy4pdkxf11pqc2fz8j07kh9";
vendorSha256 = "sha256-Cc4DJPpOMHxDcH22S7znYo7QHNRXv8jOJhznu09kaE4=";
preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w -X github.com/zricethezav/gitleaks/v${lib.versions.major version}/version.Version=${version}")