Merge pull request #193887 from nagy/steampipe-0164

steampipe: 0.15.3 -> 0.16.4
This commit is contained in:
Mario Rodas 2022-10-01 14:37:13 -05:00 committed by GitHub
commit 12656fca8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions

View file

@ -2,23 +2,25 @@
buildGoModule rec {
pname = "steampipe";
version = "0.15.3";
version = "0.16.4";
src = fetchFromGitHub {
owner = "turbot";
repo = "steampipe";
rev = "v${version}";
sha256 = "sha256-7TIEdT+s6Am2hPiMPKH+YioNfsCmLVZg6BQiO94Xiu0=";
sha256 = "sha256-awZlA02lKYpFdvCsGUC8Blv8FHek5XskkljseDGjDmk=";
};
vendorSha256 = "sha256-x57IvMKSE2F5bGTC8ao+wLJmYlz8nMh4SoMhtGlwQyE=";
vendorSha256 = "sha256-6l3bBxGhdZGIXmdzgF44TGZQqT6gSUHSwOAE2SlgLgg=";
proxyVendor = true;
patchPhase = ''
runHook prePatch
# Patch test that relies on looking up homedir in user struct to prefer ~
substituteInPlace pkg/steampipeconfig/shared_test.go \
--replace '"github.com/turbot/go-kit/helpers"' "" \
--replace 'filepaths.SteampipeDir, _ = helpers.Tildefy("~/.steampipe")' 'filepaths.SteampipeDir = "~/.steampipe"';
runHook postPatch
'';
nativeBuildInputs = [ installShellFiles ];
@ -38,5 +40,6 @@ buildGoModule rec {
description = "select * from cloud;";
license = licenses.agpl3;
maintainers = with maintainers; [ hardselius ];
changelog = "https://github.com/turbot/steampipe/blob/v${version}/CHANGELOG.md";
};
}

View file

@ -4722,7 +4722,9 @@ with pkgs;
statserial = callPackage ../tools/misc/statserial { };
steampipe = callPackage ../tools/misc/steampipe { };
steampipe = callPackage ../tools/misc/steampipe {
buildGoModule = buildGo119Module;
};
step-ca = callPackage ../tools/security/step-ca {
inherit (darwin.apple_sdk.frameworks) PCSC;