From 2cebdeefcf83b00e5729684c9e2a565cd4d3ce03 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 26 Mar 2024 09:52:53 +0100 Subject: [PATCH 1/4] steampipe: fix vendorHash --- pkgs/tools/misc/steampipe/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index 95b7f23b5eca..4c97cf6a3a9f 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { hash = "sha256-Oz1T9koeXnmHc5oru1apUtmhhvKi/gAtg/Hb7HKkkP0="; }; - vendorHash = "sha256-jC77z/1EerJSMK75np9R5kX+cLzTh55cFFlliAXASEw="; + vendorHash = "sha256-U0BeGCRLjL56ZmVKcKqrrPTCXpShJzJq5/wnXDKax6g="; proxyVendor = true; patchPhase = '' From ee7969386d3dda2541835151581aa8a1b006795c Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 26 Mar 2024 10:05:42 +0100 Subject: [PATCH 2/4] steampipe: add meta.mainProgram --- pkgs/tools/misc/steampipe/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index 4c97cf6a3a9f..9d76bbe0f445 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -42,6 +42,7 @@ buildGoModule rec { homepage = "https://steampipe.io/"; description = "select * from cloud;"; license = licenses.agpl3Only; + mainProgram = "steampipe"; maintainers = with maintainers; [ hardselius ]; changelog = "https://github.com/turbot/steampipe/blob/v${version}/CHANGELOG.md"; }; From 9f5caec3abeceef36fbd12e44ff6d4123c291765 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 26 Mar 2024 10:08:54 +0100 Subject: [PATCH 3/4] steampipe: add passthru.{tests.version,updateScript} --- pkgs/tools/misc/steampipe/default.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index 9d76bbe0f445..d14aed0d376d 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ + buildGoModule, + fetchFromGitHub, + installShellFiles, + lib, + nix-update-script, + stdenv, + steampipe, + testers, +}: buildGoModule rec { pname = "steampipe"; @@ -38,6 +47,15 @@ buildGoModule rec { --zsh <($out/bin/steampipe --install-dir $INSTALL_DIR completion zsh) ''; + passthru = { + tests.version = testers.testVersion { + command = "${lib.getExe steampipe} --version"; + package = steampipe; + version = "v${version}"; + }; + updateScript = nix-update-script { }; + }; + meta = with lib; { homepage = "https://steampipe.io/"; description = "select * from cloud;"; From e766848d816c0e3fef8643000e30008dd8d92960 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 26 Mar 2024 10:04:43 +0100 Subject: [PATCH 4/4] steampipe: move to pkgs/by-name --- .../steampipe/default.nix => by-name/st/steampipe/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/steampipe/default.nix => by-name/st/steampipe/package.nix} (100%) diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/by-name/st/steampipe/package.nix similarity index 100% rename from pkgs/tools/misc/steampipe/default.nix rename to pkgs/by-name/st/steampipe/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31b97fc21e1c..4d5db66f9882 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6333,8 +6333,6 @@ with pkgs; statserial = callPackage ../tools/misc/statserial { }; - steampipe = callPackage ../tools/misc/steampipe { }; - step-ca = callPackage ../tools/security/step-ca { inherit (darwin.apple_sdk.frameworks) PCSC; };