From f01157ba6242c50cf2704f088dbf7968a2e9d0d8 Mon Sep 17 00:00:00 2001 From: Oliver Rice Date: Tue, 3 Oct 2023 17:18:56 -0500 Subject: [PATCH] upgrade pgrx extensions in prep for pg16 support --- ext/pg_graphql.nix | 8 +- ext/pg_jsonschema.nix | 8 +- ext/wrappers/Cargo.lock | 164 +++++++++++++++++++++++++++++---------- ext/wrappers/default.nix | 10 +-- flake.lock | 12 +-- flake.nix | 2 +- overlays/cargo-pgrx.nix | 12 +-- 7 files changed, 150 insertions(+), 66 deletions(-) diff --git a/ext/pg_graphql.nix b/ext/pg_graphql.nix index 0d95f78..6f9dbe9 100644 --- a/ext/pg_graphql.nix +++ b/ext/pg_graphql.nix @@ -2,17 +2,17 @@ buildPgrxExtension rec { pname = "pg_graphql"; - version = "unstable-2023-08-01"; + version = "unstable-1.4.0"; inherit postgresql; src = fetchFromGitHub { owner = "supabase"; repo = pname; - rev = "4ac0ca1c0c94f4a9ceccb4ffe81a6dedcd4c3686"; - hash = "sha256-bAsb3/CFjWw9xUhKJD5/S/VBiSnFL6A8H0z5c4eB6GQ="; + rev = "v1.4.0"; + hash = "sha256-vpMNN7xKCFCqCsMHNOpWbeNYfUCREszBLSxPl3iBFLM="; }; - cargoHash = "sha256-DOTujO3KH7AawB7qwHvWg6OeWTzWj3FxbRUQfapEJf4="; + cargoHash = "sha256-jB5cV6r4sf3TBlR9Zsrb7hZp25fIc0DcKvIetYut2ZU="; # FIXME (aseipp): disable the tests since they try to install .control # files into the wrong spot, aside from that the one main test seems diff --git a/ext/pg_jsonschema.nix b/ext/pg_jsonschema.nix index 9806e0f..6e06571 100644 --- a/ext/pg_jsonschema.nix +++ b/ext/pg_jsonschema.nix @@ -2,17 +2,17 @@ buildPgrxExtension rec { pname = "pg_jsonschema"; - version = "unstable-2023-07-23"; + version = "unstable-0.2.0"; inherit postgresql; src = fetchFromGitHub { owner = "supabase"; repo = pname; - rev = "13044b7e2ce720e13e91130b4ea674783cf4a583"; - hash = "sha256-SxftRBWBZoDtF7mirKSavUJ/vZbWIC3TKy7L66uwQfc="; + rev = "v0.2.0"; + hash = "sha256-57gZbUVi8P4EB8T0P19JBVXcetQcr6IxuIx96NNFA/0="; }; - cargoHash = "sha256-B0gn4DBryB9l27Hi2FMnSZfqwI/pAxCjr3f2t2+m8Og="; + cargoHash = "sha256-GXzoAOwDwGbHNWOJvaGdOvkU8L/ei703590ClkrDN+Y="; # FIXME (aseipp): testsuite tries to write files into /nix/store; we'll have # to fix this a bit later. diff --git a/ext/wrappers/Cargo.lock b/ext/wrappers/Cargo.lock index 353a2a6..c3774dd 100644 --- a/ext/wrappers/Cargo.lock +++ b/ext/wrappers/Cargo.lock @@ -689,9 +689,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.66.1" +version = "0.68.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" dependencies = [ "bitflags 2.4.0", "cexpr", @@ -707,6 +707,21 @@ dependencies = [ "syn 2.0.29", ] +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + [[package]] name = "bitflags" version = "1.3.2" @@ -812,9 +827,9 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.15.3" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" +checksum = "70a1f1117a8ff2f3547295da90f473c392d8d1107c90cea1ea82b1a544a97a4a" dependencies = [ "serde", "toml", @@ -906,9 +921,9 @@ dependencies = [ [[package]] name = "clap-cargo" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca953650a7350560b61db95a0ab1d9c6f7b74d146a9e08fb258b834f3cf7e2c" +checksum = "25122ca6ebad5f53578c26638afd9f0160426969970dc37ec6c363ff6b082ebd" dependencies = [ "clap", "doc-comment", @@ -1271,18 +1286,18 @@ dependencies = [ [[package]] name = "enum-map" -version = "2.6.1" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9705d8de4776df900a4a0b2384f8b0ab42f775e93b083b42f8ce71bdc32a47e3" +checksum = "c188012f8542dee7b3996e44dd89461d64aa471b0a7c71a1ae2f595d259e96e5" dependencies = [ "enum-map-derive", ] [[package]] name = "enum-map-derive" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb14d927583dd5c2eac0f2cf264fc4762aefe1ae14c47a8a20fc1939d3a5fc0" +checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25" dependencies = [ "proc-macro2", "quote", @@ -2016,9 +2031,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "libloading" @@ -2529,9 +2544,9 @@ dependencies = [ [[package]] name = "pgrx" -version = "0.9.8" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e80e25d7f85997d5d24c824297529bcb73231bbdc74d77906004d41cd3ffee3" +checksum = "dde2cf81d16772f2e75c91edd2e868de1bd67a79d6c45c3d25c62b2ed3851d70" dependencies = [ "atomic-traits", "bitflags 2.4.0", @@ -2554,9 +2569,9 @@ dependencies = [ [[package]] name = "pgrx-macros" -version = "0.9.8" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "999ef782b36bb511806277f2a74a7f9e075edcad8c9439a3b90f4c90384f2a29" +checksum = "1b9c035c16a41b126f8c2b37307f2c717b5ee72ff8e7495ff502ad35471a0b38" dependencies = [ "pgrx-sql-entity-graph", "proc-macro2", @@ -2566,9 +2581,9 @@ dependencies = [ [[package]] name = "pgrx-pg-config" -version = "0.9.8" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7b27ccd3d892e3b27bcb7a6e2bf86588d82fad3da622db168261bc6b534a737" +checksum = "16f9d9b6310ea9f13570d773d173bbcfe47ac844075bf6a3e207e7209786c631" dependencies = [ "cargo_toml", "dirs", @@ -2584,9 +2599,9 @@ dependencies = [ [[package]] name = "pgrx-pg-sys" -version = "0.9.8" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0767fdf6930ba6fa2d1b1934313aae3694b70732e0b6169ece26b03de27f8dc" +checksum = "f821614646963302a8499b8ac8332cc0e2ae3f8715a0220986984443d8880f74" dependencies = [ "bindgen", "eyre", @@ -2606,9 +2621,9 @@ dependencies = [ [[package]] name = "pgrx-sql-entity-graph" -version = "0.9.8" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d632abaa9c3da42e5e2a17a6268afb0449a7f655764c65e06695ee55763ff0e" +checksum = "4743b5b23fd418cded0c2dbe4b1529628f7fa59b8d68426eafdde0cb51541c96" dependencies = [ "convert_case", "eyre", @@ -2621,9 +2636,9 @@ dependencies = [ [[package]] name = "pgrx-tests" -version = "0.9.8" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d44327bd084bcdc6fe4e72dfce8065e23b5b4522f36d63d14ee21c5000e7c73c" +checksum = "177bb8f6811bd65180c5a24a33666baed0ed5c08cc584c4bdb78f7fe19304363" dependencies = [ "clap-cargo", "eyre", @@ -2634,6 +2649,7 @@ dependencies = [ "pgrx-macros", "pgrx-pg-config", "postgres", + "proptest", "rand 0.8.5", "regex", "serde", @@ -2776,13 +2792,39 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] +[[package]] +name = "proptest" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" +dependencies = [ + "bit-set", + "bitflags 1.3.2", + "byteorder", + "lazy_static", + "num-traits", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rand_xorshift", + "regex-syntax 0.6.29", + "rusty-fork", + "tempfile", + "unarray", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + [[package]] name = "quote" version = "1.0.33" @@ -2869,6 +2911,15 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rand_xorshift" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" +dependencies = [ + "rand_core 0.6.4", +] + [[package]] name = "rayon" version = "1.7.0" @@ -2922,27 +2973,33 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax", + "regex-syntax 0.7.5", ] [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.7.5", ] +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + [[package]] name = "regex-syntax" version = "0.7.5" @@ -3148,6 +3205,18 @@ dependencies = [ "untrusted", ] +[[package]] +name = "rusty-fork" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" +dependencies = [ + "fnv", + "quick-error", + "tempfile", + "wait-timeout", +] + [[package]] name = "ryu" version = "1.0.15" @@ -3335,9 +3404,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "signal-hook-registry" @@ -3488,9 +3557,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.29.9" +version = "0.29.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d0e9cc2273cc8d31377bdd638d72e3ac3e5607b18621062b169d02787f1bab" +checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" dependencies = [ "cfg-if", "core-foundation-sys", @@ -3728,9 +3797,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "c226a7bba6d859b63c92c4b4fe69c5b6b72d0cb897dbc8e6012298e6154cb56e" dependencies = [ "serde", "serde_spanned", @@ -3749,9 +3818,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "8ff63e60a958cefbb518ae1fd6566af80d9d4be430a33f3723dfc47d1d411d95" dependencies = [ "indexmap 2.0.0", "serde", @@ -3849,6 +3918,12 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + [[package]] name = "uncased" version = "0.9.9" @@ -3957,6 +4032,15 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" +[[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + [[package]] name = "waker-fn" version = "1.1.0" diff --git a/ext/wrappers/default.nix b/ext/wrappers/default.nix index 9ae26b8..1841da9 100644 --- a/ext/wrappers/default.nix +++ b/ext/wrappers/default.nix @@ -1,17 +1,17 @@ { lib, stdenv, fetchFromGitHub, openssl, pkg-config -, postgresql, buildPgrxExtension_0_9_8 +, postgresql, buildPgrxExtension_0_10_2 }: -buildPgrxExtension_0_9_8 rec { +buildPgrxExtension_0_10_2 rec { pname = "supabase-wrappers"; - version = "unstable-2023-09-20"; + version = "unstable-2023-10-03"; inherit postgresql; src = fetchFromGitHub { owner = "supabase"; repo = "wrappers"; - rev = "b749a4928ab8b85afdce45eb005596a90c7ef0ed"; - hash = "sha256-53QOv6q5dw3X53InMiJxd5GcQl9J2y8u1aGMtiIdN1Q="; + rev = "4b64a6e55dcfae408627c5c52a3a15aecc9c56d5"; + hash = "sha256-nlpRkr/L4owv+ulBhD5BGPCRIkAADwtOCA0nUcABiX4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/flake.lock b/flake.lock index 35dd168..cde2012 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1692190437, - "narHash": "sha256-yJUZzmzSmDYb9ONPnMQDru66RjZgGQZRvj3tQebkexk=", + "lastModified": 1696261572, + "narHash": "sha256-s8TtSYJ1LBpuITXjbPLUPyxzAKw35LhETcajJjCS5f0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9b2aa98db6b10503666a50f4eb93b2fc0d57bde5", + "rev": "0c7ffbc66e6d78c50c38e717ec91a2a14e0622fb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1ff672c..21ff904 100644 --- a/flake.nix +++ b/flake.nix @@ -347,7 +347,7 @@ # set can go here. inherit (pkgs) # NOTE: comes from our cargo-pgrx.nix overlay - cargo-pgrx_0_9_8 + cargo-pgrx_0_10_2 ; }; diff --git a/overlays/cargo-pgrx.nix b/overlays/cargo-pgrx.nix index 77640c0..b07daca 100644 --- a/overlays/cargo-pgrx.nix +++ b/overlays/cargo-pgrx.nix @@ -1,11 +1,11 @@ final: prev: { - cargo-pgrx_0_9_8 = prev.cargo-pgrx.overrideAttrs (oldAttrs: rec { + cargo-pgrx_0_10_2 = prev.cargo-pgrx.overrideAttrs (oldAttrs: rec { pname = "cargo-pgrx"; - version = "0.9.8"; + version = "0.10.2"; src = prev.fetchCrate { inherit version pname; - hash = "sha256-Sk9fz84EheP+Ohq2e2E1q7dKDPE2Y4QSsHGlNvNb/g0="; + hash = "sha256-FqjfbJmSy5UCpPPPk4bkEyvQCnaH9zYtkI7txgIn+ls="; }; # NOTE (aseipp): normally, we would just use 'cargoHash' here, but @@ -17,11 +17,11 @@ final: prev: { cargoDeps = oldAttrs.cargoDeps.overrideAttrs (prev.lib.const { name = "${pname}-vendor.tar.gz"; inherit src; - outputHash = "sha256-F3/hdS7derrdSprSH4ONrhlhEDxJ52+X9jVFBU5Co8U="; + outputHash = "sha256-0blBUEm8PPbDyF+NnSwoMJpu+a20zq1/2+dzP0H9i+E="; }); }); - buildPgrxExtension_0_9_8 = prev.buildPgrxExtension.override { - cargo-pgrx = final.cargo-pgrx_0_9_8; + buildPgrxExtension_0_10_2 = prev.buildPgrxExtension.override { + cargo-pgrx = final.cargo-pgrx_0_10_2; }; }