summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorSteve Purcell <steve@sanityinc.com>2021-04-02 17:50:24 +1300
committerSteve Purcell <steve@sanityinc.com>2021-04-02 21:02:54 +1300
commitdde94e3d8322f9f5b24c9f01321f08e64b3c50a9 (patch)
tree73aa072b7088be88826efe814f670c28d7051d60 /pkgs/development
parentb092bdccfacc7433e4fde52e8446948d77e61584 (diff)
downloadnixpkgs-dde94e3d8322f9f5b24c9f01321f08e64b3c50a9.tar
nixpkgs-dde94e3d8322f9f5b24c9f01321f08e64b3c50a9.tar.gz
nixpkgs-dde94e3d8322f9f5b24c9f01321f08e64b3c50a9.tar.bz2
nixpkgs-dde94e3d8322f9f5b24c9f01321f08e64b3c50a9.tar.lz
nixpkgs-dde94e3d8322f9f5b24c9f01321f08e64b3c50a9.tar.xz
nixpkgs-dde94e3d8322f9f5b24c9f01321f08e64b3c50a9.tar.zst
nixpkgs-dde94e3d8322f9f5b24c9f01321f08e64b3c50a9.zip
defaultGemConfig.pg_query: 2.0.1 -> 2.0.2
pg_query 2.0.2 apparently has working ARM support.

This change also re-locks sqlint to use the newer version, and
generalises the platform spec to avoid being unnecessarily
restrictive.

As before, other packages which refer to pg_query are unaffected,
because they pin an older version of pg_query which is handled
separately in the gem-config expressions.

Follow-up to #116785
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/ruby-modules/gem-config/default.nix6
-rw-r--r--pkgs/development/tools/sqlint/Gemfile.lock2
-rw-r--r--pkgs/development/tools/sqlint/default.nix2
-rw-r--r--pkgs/development/tools/sqlint/gemset.nix4
4 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index ebe1396d1d7..6d8313954c3 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -211,12 +211,12 @@ in
     '';
   };
 
-  pg_query = attrs: lib.optionalAttrs (attrs.version == "2.0.1") {
+  pg_query = attrs: lib.optionalAttrs (attrs.version == "2.0.2") {
     dontBuild = false;
     postPatch = ''
       sed -i "s;'https://codeload.github.com.*';'${fetchurl {
-        url = "https://codeload.github.com/lfittl/libpg_query/tar.gz/13-2.0.0";
-        sha256 = "0ghk0dlmrn634p3zjr41fy4ipgw8i44f67a4l8cspqg0395m3rp5";
+        url = "https://codeload.github.com/lfittl/libpg_query/tar.gz/13-2.0.2";
+        sha256 = "0ms2s6hmy8qyzv4g1hj4i2p5fws1v8lrj73b2knwbp2ipd45yj7y";
       }}';" ext/pg_query/extconf.rb
     '';
   } // lib.optionalAttrs (attrs.version == "1.3.0") {
diff --git a/pkgs/development/tools/sqlint/Gemfile.lock b/pkgs/development/tools/sqlint/Gemfile.lock
index 67d348974fe..94587de9ac3 100644
--- a/pkgs/development/tools/sqlint/Gemfile.lock
+++ b/pkgs/development/tools/sqlint/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     google-protobuf (3.15.6)
-    pg_query (2.0.1)
+    pg_query (2.0.2)
       google-protobuf (~> 3.15.5)
     sqlint (0.2.0)
       pg_query (~> 2)
diff --git a/pkgs/development/tools/sqlint/default.nix b/pkgs/development/tools/sqlint/default.nix
index e81bc4fc5d5..960792d648b 100644
--- a/pkgs/development/tools/sqlint/default.nix
+++ b/pkgs/development/tools/sqlint/default.nix
@@ -13,6 +13,6 @@ bundlerApp {
     homepage    = "https://github.com/purcell/sqlint";
     license     = licenses.mit;
     maintainers = with maintainers; [ ariutta nicknovitski purcell ];
-    platforms   = with platforms; [ "x86_64-linux" "x86_64-darwin" ];
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/sqlint/gemset.nix b/pkgs/development/tools/sqlint/gemset.nix
index f2389e5d90b..674fe75dc18 100644
--- a/pkgs/development/tools/sqlint/gemset.nix
+++ b/pkgs/development/tools/sqlint/gemset.nix
@@ -15,10 +15,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01a8asbgkr7f1gp50ikzr1zzmvwv50da389943hrrqzxwd202268";
+      sha256 = "0bvn0swyzzhl9x8hlgaz7m7s1jqmpdi2c4klarix0hiyapy2il9y";
       type = "gem";
     };
-    version = "2.0.1";
+    version = "2.0.2";
   };
   sqlint = {
     dependencies = ["pg_query"];