diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2023-11-11 09:49:45 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-11 09:49:45 -0500 |
commit | c89dda7c89d766937150681f2965c438f04994ad (patch) | |
tree | 61a89671e818bf79ac8e35c2adb8bfbac75f8c19 | |
parent | f9611764c699fe98ad45996f3c87b9bdd14db716 (diff) | |
parent | 504116975ff079dc7a27a93ee743a85d3bbf073d (diff) |
Merge pull request #266835 from purcell/sqlint-0.3.0
sqlint: 0.2.1 -> 0.3.0
-rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/tools/sqlint/Gemfile.lock | 12 | ||||
-rw-r--r-- | pkgs/development/tools/sqlint/gemset.nix | 12 |
3 files changed, 19 insertions, 12 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index ff9e3b1968cfa..cd814e4b41452 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -334,6 +334,13 @@ in ''; }; + google-protobuf = attrs: + lib.optionalAttrs (lib.versionAtLeast attrs.version "3.25.0") { + # Fails on 3.25.0 with: + # convert.c:312:32: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security] + hardeningDisable = [ "format" ]; + }; + grpc = attrs: { nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin cctools diff --git a/pkgs/development/tools/sqlint/Gemfile.lock b/pkgs/development/tools/sqlint/Gemfile.lock index 2449a6038ec19..dab324f352f10 100644 --- a/pkgs/development/tools/sqlint/Gemfile.lock +++ b/pkgs/development/tools/sqlint/Gemfile.lock @@ -1,11 +1,11 @@ GEM remote: https://rubygems.org/ specs: - google-protobuf (3.21.2) - pg_query (2.1.3) - google-protobuf (>= 3.19.2) - sqlint (0.2.1) - pg_query (~> 2) + google-protobuf (3.25.0) + pg_query (4.2.3) + google-protobuf (>= 3.22.3) + sqlint (0.3.0) + pg_query (>= 1) PLATFORMS ruby @@ -14,4 +14,4 @@ DEPENDENCIES sqlint BUNDLED WITH - 2.3.9 + 2.4.20 diff --git a/pkgs/development/tools/sqlint/gemset.nix b/pkgs/development/tools/sqlint/gemset.nix index 0bbd8fe005745..05925a45e69e8 100644 --- a/pkgs/development/tools/sqlint/gemset.nix +++ b/pkgs/development/tools/sqlint/gemset.nix @@ -4,10 +4,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i5g23mjc4fiwymrfkvgcmsym50rapw7vm988fm46rlpg3zijgl1"; + sha256 = "18d1w5j7vjaza3v1ig9j7zyis04kxqdkb1272vbgncxn03ck45mm"; type = "gem"; }; - version = "3.21.2"; + version = "3.25.0"; }; pg_query = { dependencies = ["google-protobuf"]; @@ -15,10 +15,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00bhwkhjy6bkp04313m5il7vd165i3fz0x4jissflf66i164ppgk"; + sha256 = "15ynrzqsmmbmxib8ri8n9k6z3l6rwd91j7y1mghm33nfgdf9bj8w"; type = "gem"; }; - version = "2.1.3"; + version = "4.2.3"; }; sqlint = { dependencies = ["pg_query"]; @@ -26,9 +26,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wbsi0ivashmpgavz7j22qns3zcya8j6sd2f9y8hk8bnqx7i3ak0"; + sha256 = "06gljzjhbfvxs85699jr1p7y2j8hhi629kfarad7yjqy7ssl541n"; type = "gem"; }; - version = "0.2.1"; + version = "0.3.0"; }; } |