feat(cargo-pgrx): build extensions with specified Rust version

This change allows developers to target specific Rust versions for
building extensions. It implements support for building cargo extensions
and `cargo-pgrx` using the specified Rust version.

Author: jfroche

nix/cargo-pgrx/default.nix

@@ -63,11 +63,6 @@ let
     };
 in
 {
-  cargo-pgrx_0_11_2 = mkCargoPgrx {
-    version = "0.11.2";
-    hash = "sha256-8NlpMDFaltTIA8G4JioYm8LaPJ2RGKH5o6sd6lBHmmM=";
-    cargoHash = "sha256-CbU5B0pvB9ApTZOdYP/ZwuIG8bqGzk/ING2PCM0q2bQ=";
-  };
   cargo-pgrx_0_11_3 = mkCargoPgrx {
     version = "0.11.3";
     hash = "sha256-UHIfwOdXoJvR4Svha6ud0FxahP1wPwUtviUwUnTmLXU=";

nix/cargo-pgrx/mkPgrxExtension.nix

@@ -6,7 +6,14 @@
   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;
@@ -19,12 +26,12 @@ let
     let
       pgrx =
         versions.${pgrxVersion}
-          or (throw "Unsupported pgrx version ${pgrxVersion}. Available versions: ${builtins.toString (builtins.attrNames versions)}. Change 'nix/cargo-pgrx/versions.json' to add support for new versions.");
+          or (throw "Unsupported pgrx version ${pgrxVersion}. Available versions: ${builtins.attrNames versions}. Change 'nix/cargo-pgrx/versions.json' to add support for new versions.");
       mapping = {
         inherit (pgrx) hash;
         cargoHash =
           pgrx.rust."${rustVersion}".cargoHash
-            or (throw "Unsupported rust version ${rustVersion} for pgrx version ${pgrxVersion}. Available Rust versions: ${builtins.toString (builtins.attrNames pgrx.rust)}. Change 'nix/cargo-pgrx/versions.json' to add support for new versions.");
+            or (throw "Unsupported rust version ${rustVersion} for pgrx version ${pgrxVersion}. Available Rust versions: ${builtins.attrNames pgrx.rust}. Change 'nix/cargo-pgrx/versions.json' to add support for new versions.");
       };
     in
     mkCargoPgrx {

nix/cargo-pgrx/versions.json

@@ -57,5 +57,4 @@
       }
     }
   }
-
 }

nix/ext/pg_graphql.nix

@@ -1,26 +1,27 @@
 {
+  callPackages,
   lib,
   stdenv,
   buildEnv,
   fetchFromGitHub,
   postgresql,
-  buildPgrxExtension_0_11_2,
-  buildPgrxExtension_0_11_3,
-  buildPgrxExtension_0_12_6,
-  buildPgrxExtension_0_12_9,
   rust-bin,
   rsync,
 }:
 
 let
   pname = "pg_graphql";
   build =
-    version: hash: rustVersion: buildPgrxExtension:
+    version: hash: rustVersion: pgrxVersion:
     let
       cargo = rust-bin.stable.${rustVersion}.default;
-      previousVersions = lib.filter (v: v != version) versions;
+      previousVersions = lib.filter (v: v != version) versions; # FIXME
+      mkPgrxExtension = callPackages ../cargo-pgrx/mkPgrxExtension.nix {
+        inherit rustVersion pgrxVersion;
+      };
+
     in
-    buildPgrxExtension rec {
+    mkPgrxExtension rec {
       inherit pname version postgresql;
 
       src = fetchFromGitHub {
@@ -125,19 +126,8 @@ let
   versions = lib.naturalSort (lib.attrNames supportedVersions);
   latestVersion = lib.last versions;
   numberOfVersions = builtins.length versions;
-  mapPgrxExtension =
-    version:
-    {
-      "0.11.2" = buildPgrxExtension_0_11_2;
-      "0.11.3" = buildPgrxExtension_0_11_3;
-      "0.12.6" = buildPgrxExtension_0_12_6;
-      "0.12.9" = buildPgrxExtension_0_12_9;
-    }
-    ."${version}";
   packages = builtins.attrValues (
-    lib.mapAttrs (
-      name: value: build name value.hash value.rust (mapPgrxExtension value.pgrx)
-    ) supportedVersions
+    lib.mapAttrs (name: value: build name value.hash value.rust value.pgrx) supportedVersions
   );
 in
 buildEnv {

nix/ext/versions.json

@@ -81,7 +81,7 @@
       ],
       "hash": "sha256-Kxo4o8+hfSTOjvhYyGF2BpksWfW/AMCCH4qom4AGw18=",
       "pgrx": "0.11.2",
-      "rust": "1.85.1"
+      "rust": "1.70.0"
     },
     "1.5.0": {
       "postgresql": [