about summary refs log tree commit diff
path: root/pkgs/tools/misc/steampipe
diff options
context:
space:
mode:
authorajs124 <ajs124@users.noreply.github.com>2022-07-31 14:31:52 +0200
committerGitHub <noreply@github.com>2022-07-31 14:31:52 +0200
commitd0ea2452a2ed49faa0e52876b69a071c12e52dfa (patch)
treec9726f0802ae48047807e7021124aa30449d55c7 /pkgs/tools/misc/steampipe
parent81e3a7874d2c83196615546c6453e76110d10b07 (diff)
parentee63b2cd5ff502818db1547a90b9dfe957d61013 (diff)
Merge pull request #181677 from flurie/steampipe-bump
steampipe: 0.15.0 -> 0.15.3
Diffstat (limited to 'pkgs/tools/misc/steampipe')
-rw-r--r--pkgs/tools/misc/steampipe/default.nix19
1 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix
index 43a184a99426a..42fb4a451f30d 100644
--- a/pkgs/tools/misc/steampipe/default.nix
+++ b/pkgs/tools/misc/steampipe/default.nix
@@ -2,24 +2,28 @@
 
 buildGoModule rec {
   pname = "steampipe";
-  version = "0.15.0";
+  version = "0.15.3";
 
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "steampipe";
     rev = "v${version}";
-    sha256 = "sha256-ly64p8shbhixLbK9hpDNYhmBKoAt4iXB//pdFSIYZMc=";
+    sha256 = "sha256-7TIEdT+s6Am2hPiMPKH+YioNfsCmLVZg6BQiO94Xiu0=";
   };
 
-  vendorSha256 = "sha256-/VU8VNDqU7CMm/lIBqTChyUWP4svVCgsw0CBcp/u+U0=";
+  vendorSha256 = "sha256-x57IvMKSE2F5bGTC8ao+wLJmYlz8nMh4SoMhtGlwQyE=";
   proxyVendor = true;
 
+  patchPhase = ''
+    # 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"';
+  '';
+
   nativeBuildInputs = [ installShellFiles ];
 
-  ldflags = [
-    "-s"
-    "-w"
-  ];
+  ldflags = [ "-s" "-w" ];
 
   postInstall = ''
     INSTALL_DIR=$(mktemp -d)
@@ -30,7 +34,6 @@ buildGoModule rec {
   '';
 
   meta = with lib; {
-    broken = stdenv.isDarwin;
     homepage = "https://steampipe.io/";
     description = "select * from cloud;";
     license = licenses.agpl3;