Refactoring and build pg_graphql 1.0.2 using pgx 0.6.1

Author: jfroche

nix/cargo-pgrx/buildPgrxExtension.nix

@@ -53,6 +53,10 @@
   buildFeatures ? [ ],
   cargoBuildFlags ? [ ],
   postgresql,
+  # enable override to generate bindings using bindgenHook.
+  # Some older versions of cargo-pgrx use a bindgenHook that is not compatible with the
+  # current clang version present in stdenv
+  bindgenHook ? rustPlatform.bindgenHook,
   # cargo-pgrx calls rustfmt on generated bindings, this is not strictly necessary, so we avoid the
   # dependency here. Set to false and provide rustfmt in nativeBuildInputs, if you need it, e.g.
   # if you include the generated code in the output via postInstall.
@@ -129,6 +133,7 @@ let
         cargo-pgrx
         postgresql
         pkg-config
+        bindgenHook
       ]
       ++ lib.optionals useFakeRustfmt [ fakeRustfmt ];
 

nix/cargo-pgrx/default.nix

@@ -20,11 +20,8 @@ let
       hash,
       cargoHash,
     }:
-    let 
-      pname =  if builtins.compareVersions "0.7.4" version >= 0 then
-        "cargo-pgx"
-      else
-        "cargo-pgrx";
+    let
+      pname = if builtins.compareVersions "0.7.4" version >= 0 then "cargo-pgx" else "cargo-pgrx";
     in
     rustPlatform.buildRustPackage rec {
       # rust-overlay uses 'cargo-auditable' wrapper for 'cargo' command, but it
@@ -36,16 +33,10 @@ let
       inherit version;
       src = fetchCrate { inherit version pname hash; };
       inherit cargoHash;
-      nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
-        pkg-config
-      ];
+      nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
       buildInputs =
-        lib.optionals stdenv.hostPlatform.isLinux [
-          openssl
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [
-          darwin.apple_sdk.frameworks.Security
-        ];
+        lib.optionals stdenv.hostPlatform.isLinux [ openssl ]
+        ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
       OPENSSL_DIR = "${openssl.dev}";
       OPENSSL_INCLUDE_DIR = "${openssl.dev}/include";

nix/cargo-pgrx/mkPgrxExtension.nix

@@ -6,14 +6,7 @@
   rust-bin,
 }:
 let
-  inherit
-    (
-      (callPackage ./default.nix {
-        inherit rustVersion;
-      })
-    )
-    mkCargoPgrx
-    ;
+  inherit ((callPackage ./default.nix { inherit rustVersion; })) mkCargoPgrx;
 
   rustPlatform = makeRustPlatform {
     cargo = rust-bin.stable.${rustVersion}.default;

nix/checks.nix

@@ -309,7 +309,10 @@
             ;
         }
         // pkgs.lib.optionalAttrs (system == "x86_64-linux") {
-          pg_graphql = import ./ext/tests/pg_graphql.nix { inherit self; inherit pkgs; };
+          pg_graphql = import ./ext/tests/pg_graphql.nix {
+            inherit self;
+            inherit pkgs;
+          };
           wrappers = import ./ext/tests/wrappers.nix {
             inherit self;
             inherit pkgs;