From 102913e76f1e34d601c77eacd1dbc6f56acc18b1 Mon Sep 17 00:00:00 2001 From: Martin Fischer Date: Thu, 21 May 2026 19:37:20 +0200 Subject: [PATCH] sqlint: update deps to fix build failure Also add a --help smoke test. --- pkgs/by-name/sq/sqlint/Gemfile.lock | 12 ++++++---- pkgs/by-name/sq/sqlint/gemset.nix | 34 ++++++++++++++++++++++++----- pkgs/by-name/sq/sqlint/package.nix | 10 ++++++++- 3 files changed, 46 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/sq/sqlint/Gemfile.lock b/pkgs/by-name/sq/sqlint/Gemfile.lock index 9359528117d1..6392331c2da8 100644 --- a/pkgs/by-name/sq/sqlint/Gemfile.lock +++ b/pkgs/by-name/sq/sqlint/Gemfile.lock @@ -1,9 +1,13 @@ GEM remote: https://rubygems.org/ specs: - google-protobuf (3.25.5) - pg_query (4.2.3) - google-protobuf (>= 3.22.3) + bigdecimal (4.1.2) + google-protobuf (4.35.0) + bigdecimal + rake (~> 13.3) + pg_query (6.2.2) + google-protobuf (>= 3.25.3) + rake (13.4.2) sqlint (0.3.0) pg_query (>= 1) @@ -14,4 +18,4 @@ DEPENDENCIES sqlint BUNDLED WITH - 2.4.20 + 2.7.2 diff --git a/pkgs/by-name/sq/sqlint/gemset.nix b/pkgs/by-name/sq/sqlint/gemset.nix index dd8ce2f48e5c..50320b075c61 100644 --- a/pkgs/by-name/sq/sqlint/gemset.nix +++ b/pkgs/by-name/sq/sqlint/gemset.nix @@ -1,13 +1,27 @@ { - google-protobuf = { + bigdecimal = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0fanhdf3vzghma51w1hqpp8s585mwzxgqkwvxj5is4q9j0pgwcs3"; + sha256 = "1g9zi8c4i7g8zz0c3hxrw6mblrjvgn7akys60clb9si7c1k1gljk"; type = "gem"; }; - version = "3.25.5"; + version = "4.1.2"; + }; + google-protobuf = { + dependencies = [ + "bigdecimal" + "rake" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "038cqc1kzxl22m3jfspkdpg0dxskga9jvgwclb4pivcjqxi62d4m"; + type = "gem"; + }; + version = "4.35.0"; }; pg_query = { dependencies = [ "google-protobuf" ]; @@ -15,10 +29,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15ynrzqsmmbmxib8ri8n9k6z3l6rwd91j7y1mghm33nfgdf9bj8w"; + sha256 = "0vwvfxz4gp5xqrv4jwyqigfkpldjqp6mbzvskapwiyncc10ijv1i"; type = "gem"; }; - version = "4.2.3"; + version = "6.2.2"; + }; + rake = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "009p524zl0p0kfa65nii8wdmaigkmawv9pbvlcffky7islmmp0nb"; + type = "gem"; + }; + version = "13.4.2"; }; sqlint = { dependencies = [ "pg_query" ]; diff --git a/pkgs/by-name/sq/sqlint/package.nix b/pkgs/by-name/sq/sqlint/package.nix index 8c0d754ce960..9a0de27935c1 100644 --- a/pkgs/by-name/sq/sqlint/package.nix +++ b/pkgs/by-name/sq/sqlint/package.nix @@ -2,6 +2,8 @@ lib, bundlerApp, bundlerUpdateScript, + runCommand, + sqlint, }: bundlerApp { @@ -10,7 +12,13 @@ bundlerApp { exes = [ "sqlint" ]; - passthru.updateScript = bundlerUpdateScript "sqlint"; + passthru = { + updateScript = bundlerUpdateScript "sqlint"; + tests.help = runCommand "sqlint-help-test" { } '' + ${sqlint}/bin/sqlint --help + touch $out + ''; + }; meta = { description = "Simple SQL linter";