summary refs log tree commit diff
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2023-11-14 07:12:05 -0500
committerGitHub <noreply@github.com>2023-11-14 07:12:05 -0500
commitbf744fe90419885eefced41b3e5ae442d732712d (patch)
tree3c49b827251405b83fcff593da58fa27956a5e2b
parentd9eb1d98cd6c5836743c50d19cb8fb0f5baca972 (diff)
parent434020410f9735e5aada9761d88721b1370c94ee (diff)
downloadnixpkgs-bf744fe90419885eefced41b3e5ae442d732712d.tar
nixpkgs-bf744fe90419885eefced41b3e5ae442d732712d.tar.gz
nixpkgs-bf744fe90419885eefced41b3e5ae442d732712d.tar.bz2
nixpkgs-bf744fe90419885eefced41b3e5ae442d732712d.tar.lz
nixpkgs-bf744fe90419885eefced41b3e5ae442d732712d.tar.xz
nixpkgs-bf744fe90419885eefced41b3e5ae442d732712d.tar.zst
nixpkgs-bf744fe90419885eefced41b3e5ae442d732712d.zip
Merge pull request #267422 from anthonyroussel/updates/usql
usql: 0.15.2 -> 0.16.0
-rw-r--r--pkgs/by-name/us/usql/package.nix (renamed from pkgs/applications/misc/usql/default.nix)9
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/by-name/us/usql/package.nix
index 780be25a33b..2faeda9b09b 100644
--- a/pkgs/applications/misc/usql/default.nix
+++ b/pkgs/by-name/us/usql/package.nix
@@ -10,18 +10,18 @@
 
 buildGoModule rec {
   pname = "usql";
-  version = "0.15.2";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "xo";
     repo = "usql";
     rev = "v${version}";
-    hash = "sha256-SJypezOTQr+TiG/rePXxgjrspeErqj6qw9TBen41e4Q=";
+    hash = "sha256-XfzCJOr0lOkimUKbOW0+qFNQMmYc0DBgi+0ItmEOjwE=";
   };
 
   buildInputs = [ unixODBC icu ];
 
-  vendorHash = "sha256-i2lH6ajRmfJHsh7nzCjt7mi3issA4kSBdG42w67pOC4=";
+  vendorHash = "sha256-sijt6YOp1pFNhaxLIOLH90Z5ODVbWFj/mp8Csx8n+ac=";
   proxyVendor = true;
 
   # Exclude broken genji, hive & impala drivers (bad group)
@@ -35,7 +35,7 @@ buildGoModule rec {
     "impala"
   ];
 
-  # These tags and flags are copied from build-release.sh
+  # These tags and flags are copied from build.sh
   tags = [
     "most"
     "sqlite_app_armor"
@@ -46,7 +46,6 @@ buildGoModule rec {
     "sqlite_stat4"
     "sqlite_userauth"
     "sqlite_vtable"
-    "sqlite_icu"
     "no_adodb"
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3fdd954dba2..b49f5814804 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -41238,8 +41238,6 @@ with pkgs;
 
   usb-reset = callPackage ../applications/misc/usb-reset { };
 
-  usql = callPackage ../applications/misc/usql { };
-
   utf8cpp = callPackage ../development/libraries/utf8cpp { };
 
   utf8proc = callPackage ../development/libraries/utf8proc { };