From 49ab84dbe74b0465c4f91e913a5af94b5b857054 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Dec 2022 20:25:11 +0000 Subject: [PATCH 1/2] sq: 0.16.0 -> 0.18.2 --- pkgs/development/tools/sq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/development/tools/sq/default.nix index 602358fe99dd..95d32874ee36 100644 --- a/pkgs/development/tools/sq/default.nix +++ b/pkgs/development/tools/sq/default.nix @@ -1,18 +1,18 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, sq }: buildGoModule rec { pname = "sq"; - version = "0.16.0"; + version = "0.18.2"; src = fetchFromGitHub { owner = "neilotoole"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0BpQDlLWERm8UOcmxAVH5aWBGrcdV64YB7S+3etOtU0="; + sha256 = "sha256-x5NHMTyOZSGOnAUCRu1qZggU5m832TFrBTSNJU6DUKo="; }; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-tzq22S3fuaxOIoXL1mMPV90El8cUwzm2XSaiDHIuc4g="; + vendorSha256 = "sha256-OHgdvitHi2f/svn0QDlknmteii+5rLKaZ7f7VJ+7H4w="; # Some tests violates sandbox constraints. doCheck = false; From d38feecb89d11effbeaf3d183d68a7b56dbcf0f3 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 26 Dec 2022 20:06:49 -0500 Subject: [PATCH 2/2] sq: fix build on darwin --- pkgs/development/tools/sq/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/development/tools/sq/default.nix index 95d32874ee36..d150332ae63e 100644 --- a/pkgs/development/tools/sq/default.nix +++ b/pkgs/development/tools/sq/default.nix @@ -1,4 +1,5 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, sq }: + buildGoModule rec { pname = "sq"; version = "0.18.2"; @@ -10,15 +11,19 @@ buildGoModule rec { sha256 = "sha256-x5NHMTyOZSGOnAUCRu1qZggU5m832TFrBTSNJU6DUKo="; }; - nativeBuildInputs = [ installShellFiles ]; + vendorSha256 = "sha256-IRuwX+VF0ltASTt/QKlZ3A00tgDhc9qpBfzhINp3HgQ="; - vendorSha256 = "sha256-OHgdvitHi2f/svn0QDlknmteii+5rLKaZ7f7VJ+7H4w="; + proxyVendor = true; + + nativeBuildInputs = [ installShellFiles ]; # Some tests violates sandbox constraints. doCheck = false; ldflags = [ - "-s" "-w" "-X github.com/neilotoole/sq/cli/buildinfo.Version=${version}" + "-s" + "-w" + "-X=github.com/neilotoole/sq/cli/buildinfo.Version=${version}" ]; postInstall = ''