From 43efcc72be4dbb04360ba0a81961a86d7636ad6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Apr 2024 00:07:15 +0000 Subject: [PATCH 1/2] cnquery: 10.9.2 -> 10.11.0 --- pkgs/tools/security/cnquery/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnquery/default.nix b/pkgs/tools/security/cnquery/default.nix index c3e8caf06e47..3a8ae609fe76 100644 --- a/pkgs/tools/security/cnquery/default.nix +++ b/pkgs/tools/security/cnquery/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "cnquery"; - version = "10.9.2"; + version = "10.11.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; rev = "v${version}"; - hash = "sha256-4oAJ55qCUaqsJJ+memW078ZuKyvHoO71XhfowEg7dpg="; + hash = "sha256-Dm001NDTi+KO3+OoF9f/X/m83KtqfnWmj0hZU6Zf71k="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-M8U6M3ejRrbQMfTh4JWYRLMQLfaDwtPiJOUEywiH6sg="; + vendorHash = "sha256-prtiCzIJizh0/viXwYylJc+GS2dVpNlBd3YvIDfltvs="; meta = with lib; { description = "cloud-native, graph-based asset inventory"; From 41f1e78ccb9db5003f30573c772325ef761993b3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 6 Apr 2024 13:03:54 +0200 Subject: [PATCH 2/2] cnquery;: format with nixfmt - refactor --- pkgs/tools/security/cnquery/default.nix | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/cnquery/default.nix b/pkgs/tools/security/cnquery/default.nix index 3a8ae609fe76..a731d5e4e661 100644 --- a/pkgs/tools/security/cnquery/default.nix +++ b/pkgs/tools/security/cnquery/default.nix @@ -1,6 +1,7 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { @@ -10,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-Dm001NDTi+KO3+OoF9f/X/m83KtqfnWmj0hZU6Zf71k="; }; @@ -18,11 +19,18 @@ buildGoModule rec { vendorHash = "sha256-prtiCzIJizh0/viXwYylJc+GS2dVpNlBd3YvIDfltvs="; + ldflags = [ + "-w" + "-s" + ]; + meta = with lib; { - description = "cloud-native, graph-based asset inventory"; + description = "Cloud-native, graph-based asset inventory"; longDescription = '' - cnquery is a cloud-native tool for querying your entire fleet. It answers thousands of questions about your infrastructure and integrates with over 300 resources across cloud accounts, Kubernetes, containers, services, VMs, APIs, and more. - ''; + cnquery is a cloud-native tool for querying your entire fleet. It answers thousands of + questions about your infrastructure and integrates with over 300 resources across cloud + accounts, Kubernetes, containers, services, VMs, APIs, and more. + ''; homepage = "https://mondoo.com/cnquery"; changelog = "https://github.com/mondoohq/cnquery/releases/tag/v${version}"; license = licenses.bsl11;