diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-26 10:51:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-26 10:51:06 +0100 |
| commit | 53cfb7e81727ebe6b5f65a6e5fde48c8ac5025f6 (patch) | |
| tree | c36669a98870dc9a4b77a075341ac19a350403bd | |
| parent | 2f345e762872ab941847abf06de2f1c779c33159 (diff) | |
| parent | e766848d816c0e3fef8643000e30008dd8d92960 (diff) | |
| download | nixlib-53cfb7e81727ebe6b5f65a6e5fde48c8ac5025f6.tar nixlib-53cfb7e81727ebe6b5f65a6e5fde48c8ac5025f6.tar.gz nixlib-53cfb7e81727ebe6b5f65a6e5fde48c8ac5025f6.tar.bz2 nixlib-53cfb7e81727ebe6b5f65a6e5fde48c8ac5025f6.tar.lz nixlib-53cfb7e81727ebe6b5f65a6e5fde48c8ac5025f6.tar.xz nixlib-53cfb7e81727ebe6b5f65a6e5fde48c8ac5025f6.tar.zst nixlib-53cfb7e81727ebe6b5f65a6e5fde48c8ac5025f6.zip | |
Merge pull request #299130 from anthonyroussel/fix/steampipe
steampipe: fix vendorHash
| -rw-r--r-- | pkgs/by-name/st/steampipe/package.nix (renamed from pkgs/tools/misc/steampipe/default.nix) | 23 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 21 insertions, 4 deletions
diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/by-name/st/steampipe/package.nix index 95b7f23b5eca..d14aed0d376d 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/by-name/st/steampipe/package.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ + buildGoModule, + fetchFromGitHub, + installShellFiles, + lib, + nix-update-script, + stdenv, + steampipe, + testers, +}: buildGoModule rec { pname = "steampipe"; @@ -11,7 +20,7 @@ buildGoModule rec { hash = "sha256-Oz1T9koeXnmHc5oru1apUtmhhvKi/gAtg/Hb7HKkkP0="; }; - vendorHash = "sha256-jC77z/1EerJSMK75np9R5kX+cLzTh55cFFlliAXASEw="; + vendorHash = "sha256-U0BeGCRLjL56ZmVKcKqrrPTCXpShJzJq5/wnXDKax6g="; proxyVendor = true; patchPhase = '' @@ -38,10 +47,20 @@ 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;"; license = licenses.agpl3Only; + mainProgram = "steampipe"; maintainers = with maintainers; [ hardselius ]; changelog = "https://github.com/turbot/steampipe/blob/v${version}/CHANGELOG.md"; }; 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; }; |