From e8db71f5f8e95e20e28b735b29afe7b2fe925bad Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Mon, 12 Sep 2022 22:53:15 +0200 Subject: [PATCH 1/3] usql: 0.12.0 -> 0.12.13 --- pkgs/applications/misc/usql/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index edd1bd588dc7..201eefe17505 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -7,19 +7,28 @@ buildGoModule rec { pname = "usql"; - version = "0.12.0"; + version = "0.12.13"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - sha256 = "sha256-OOu3zWK/ccmaEVriXKl7SZUJLLYaJB3tgF+eR9p+TmM="; + hash = "sha256-F/eOD7/w8HjJBeiXagaf4yBLZcZVuy93rfVFeSESlZo="; }; - vendorSha256 = "sha256-9XyG0Fu3idxGG01MoBr5BMoQSz+dyZFEXRNvvb+XWjA="; + vendorHash = "sha256-7rMCqTfUs89AX0VP689BmKsuvLJWU5ANJVki+JMVf7g="; buildInputs = [ unixODBC icu ]; + # Exclude broken impala driver + # The driver breaks too often and is not used. + # + # See https://github.com/xo/usql/pull/347 + # + excludedPackages = [ + "impala" + ]; + # These tags and flags are copied from build-release.sh tags = [ "most" From 49426793cd9422a6bfcaa53bcbdfba8a19e5dd0f Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Mon, 12 Sep 2022 22:54:05 +0200 Subject: [PATCH 2/3] usql: add anthonyroussel to maintainers --- pkgs/applications/misc/usql/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index 201eefe17505..166a4e1d3019 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -56,9 +56,8 @@ buildGoModule rec { description = "Universal command-line interface for SQL databases"; homepage = "https://github.com/xo/usql"; license = licenses.mit; - maintainers = with maintainers; [ georgyo ]; + maintainers = with maintainers; [ georgyo anthonyroussel ]; # usql does not build on ARM. platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; - } From cbb334055707102ed5f762d732420eb6c57cbfc7 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Mon, 12 Sep 2022 22:59:34 +0200 Subject: [PATCH 3/3] usql: add platforms --- pkgs/applications/misc/usql/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index 166a4e1d3019..cc02a5d1c899 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -57,7 +57,6 @@ buildGoModule rec { homepage = "https://github.com/xo/usql"; license = licenses.mit; maintainers = with maintainers; [ georgyo anthonyroussel ]; - # usql does not build on ARM. - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = with platforms; linux ++ darwin; }; }