diff --git a/flake.lock b/flake.lock index 3a0c359be..42ffa3cf1 100644 --- a/flake.lock +++ b/flake.lock @@ -316,11 +316,11 @@ ] }, "locked": { - "lastModified": 1765248027, - "narHash": "sha256-ngar+yP06x3+2k2Iey29uU0DWx5ur06h3iPBQXlU+yI=", + "lastModified": 1787834454, + "narHash": "sha256-jXSvqn04IOecJCvSvl8+g3PsbDVNP6qKs6dKUs/b16k=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7b50ad68415ae5be7ee4cc68fa570c420741b644", + "rev": "dc2fd1acc537f3583744e1373597a5731ff7a6e3", "type": "github" }, "original": { diff --git a/nix/cargo-pgrx/default.nix b/nix/cargo-pgrx/default.nix index ff9b916eb..5972e2b98 100644 --- a/nix/cargo-pgrx/default.nix +++ b/nix/cargo-pgrx/default.nix @@ -45,6 +45,11 @@ let checkFlags = [ # requires pgrx to be properly initialized with cargo pgrx init "--skip=command::schema::tests::test_parse_managed_postmasters" + "--skip=object_utils::tests::parses_managed_postmasters" + # require test fixtures not included in the crates.io source tarball + "--skip=command::upgrade::tests::find_package_manifest_in_workspace" + "--skip=command::upgrade::tests::process_workspace_manifest" + "--skip=command::upgrade::tests::process_workspace_package_manifest" ]; meta = with lib; { description = "Build Postgres Extensions with Rust"; @@ -81,5 +86,10 @@ in hash = "sha256-3TsNpEqNm3Uol5XPW1i0XEbP2fF2+RKB2d7lO6BDnvQ="; cargoHash = "sha256-LZUXhjMxkBs3O5feH4X5NQC7Qk4Ja6M5+sAYaSCikrY="; }; + cargo-pgrx_0_19_2 = mkCargoPgrx { + version = "0.19.2"; + hash = "sha256-PANc819AhIE9yJ6NFHGJxHJHWZyR2Srmj2cEz3vQmJk="; + cargoHash = "sha256-cTD7x36FvFUIwVLuAqrOJ75vLDppITiDrY8Fs3RjPqU="; + }; inherit mkCargoPgrx; } diff --git a/nix/cargo-pgrx/versions.json b/nix/cargo-pgrx/versions.json index 7f28c940b..47da9e7df 100644 --- a/nix/cargo-pgrx/versions.json +++ b/nix/cargo-pgrx/versions.json @@ -115,5 +115,13 @@ "cargoHash": "sha256-95DHq5GLnAqb3bbKwwaeBeKEmkfRh81ZTRaJ7L59DAg=" } } + }, + "0.19.2": { + "hash": "sha256-PANc819AhIE9yJ6NFHGJxHJHWZyR2Srmj2cEz3vQmJk=", + "rust": { + "1.97.1": { + "cargoHash": "sha256-cTD7x36FvFUIwVLuAqrOJ75vLDppITiDrY8Fs3RjPqU=" + } + } } } diff --git a/nix/ext/versions.json b/nix/ext/versions.json index 78a51b5f6..8bac5a7ef 100644 --- a/nix/ext/versions.json +++ b/nix/ext/versions.json @@ -259,6 +259,15 @@ "hash": "sha256-DOmxdLuYlRoQRprN4tni6JyXZ3nWaEqVQU0DNSYRYTc=", "pgrx": "0.16.1", "rust": "1.88.0" + }, + "1.6.2": { + "postgresql": [ + "15", + "17" + ], + "hash": "sha256-/qpAfou/shsLKyUmJsya/Zph9nhdtQwXOcXpqmsOnIw=", + "pgrx": "0.19.2", + "rust": "1.97.1" } }, "pg_net": {