b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

defaultGemConfig.pg_query: 2.0.1 -> 2.0.2

Browse source 
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
This commit is contained in:
Steve Purcell 2021-04-02 17:50:24 +13:00
parent b092bdccfa
commit dde94e3d83
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/ruby-modules/gem-config/default.nix
View file

@ -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; dontBuild = false;
postPatch = '' postPatch = ''
sed -i "s;'https://codeload.github.com.*';'${fetchurl { sed -i "s;'https://codeload.github.com.*';'${fetchurl {
url = "https://codeload.github.com/lfittl/libpg_query/tar.gz/13-2.0.0"; url = "https://codeload.github.com/lfittl/libpg_query/tar.gz/13-2.0.2";
sha256 = "0ghk0dlmrn634p3zjr41fy4ipgw8i44f67a4l8cspqg0395m3rp5"; sha256 = "0ms2s6hmy8qyzv4g1hj4i2p5fws1v8lrj73b2knwbp2ipd45yj7y";
}}';" ext/pg_query/extconf.rb }}';" ext/pg_query/extconf.rb
''; '';
} // lib.optionalAttrs (attrs.version == "1.3.0") { } // lib.optionalAttrs (attrs.version == "1.3.0") {

2
pkgs/development/tools/sqlint/Gemfile.lock
View file

@ -2,7 +2,7 @@ GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
google-protobuf (3.15.6) google-protobuf (3.15.6)
pg_query (2.0.1) pg_query (2.0.2)
google-protobuf (~> 3.15.5) google-protobuf (~> 3.15.5)
sqlint (0.2.0) sqlint (0.2.0)
pg_query (~> 2) pg_query (~> 2)

2
pkgs/development/tools/sqlint/default.nix
View file

@ -13,6 +13,6 @@ bundlerApp {
homepage = "https://github.com/purcell/sqlint"; homepage = "https://github.com/purcell/sqlint";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ ariutta nicknovitski purcell ]; maintainers = with maintainers; [ ariutta nicknovitski purcell ];
platforms = with platforms; [ "x86_64-linux" "x86_64-darwin" ]; platforms = platforms.unix;
}; };
} }

4
pkgs/development/tools/sqlint/gemset.nix
View file

@ -15,10 +15,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "01a8asbgkr7f1gp50ikzr1zzmvwv50da389943hrrqzxwd202268"; sha256 = "0bvn0swyzzhl9x8hlgaz7m7s1jqmpdi2c4klarix0hiyapy2il9y";
type = "gem"; type = "gem";
}; };
version = "2.0.1"; version = "2.0.2";
}; };
sqlint = { sqlint = {
dependencies = ["pg_query"]; dependencies = ["pg_query"];