about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEric Wolf <eric.wolf@vier.ai>2023-03-20 11:45:10 +0100
committerYt <happysalada@proton.me>2023-04-23 15:23:38 -0400
commit815fed2e05a17838b7c3f6be448428fa5fccd1e4 (patch)
treec3f52d0509afd41ea26a7c1cac1b229e013eb6f0
parent8f33856a79e28b6370357d149e39536ba24d3b89 (diff)
cargo-pgx: 0.6.1 -> 0.7.4, keep 0.6.1, add 0.7.1
0.6.1 keeping until timescaledb_toolkit got upgraded to 1.15.0
0.7.1 because timescaledb_toolkit 1.15.0 needs it
0.7.4 because it is the most recent cargo-pgx version
-rw-r--r--pkgs/development/tools/rust/cargo-pgx/0_6_1.nix (renamed from pkgs/development/tools/rust/cargo-pgx/default.nix)0
-rw-r--r--pkgs/development/tools/rust/cargo-pgx/0_7_1.nix25
-rw-r--r--pkgs/development/tools/rust/cargo-pgx/0_7_4.nix25
-rw-r--r--pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix3
-rw-r--r--pkgs/top-level/all-packages.nix9
5 files changed, 60 insertions, 2 deletions
diff --git a/pkgs/development/tools/rust/cargo-pgx/default.nix b/pkgs/development/tools/rust/cargo-pgx/0_6_1.nix
index 004b6ed27543e..004b6ed27543e 100644
--- a/pkgs/development/tools/rust/cargo-pgx/default.nix
+++ b/pkgs/development/tools/rust/cargo-pgx/0_6_1.nix
diff --git a/pkgs/development/tools/rust/cargo-pgx/0_7_1.nix b/pkgs/development/tools/rust/cargo-pgx/0_7_1.nix
new file mode 100644
index 0000000000000..408244f638bed
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-pgx/0_7_1.nix
@@ -0,0 +1,25 @@
+{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, openssl, Security }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "cargo-pgx";
+  version = "0.7.1";
+
+  src = fetchCrate {
+    inherit version pname;
+    sha256 = "sha256-t/gdlrBeP6KFkBFJiZUa8KKVJVYMf6753vQGKJdytss=";
+  };
+
+  cargoSha256 = "sha256-muce9wT4LAJmfNLWWEShARnpZgglXe/KrfxlitmGgXk=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ openssl ]
+    ++ lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with lib; {
+    description = "Cargo subcommand for ‘pgx’ to make Postgres extension development easy";
+    homepage = "https://github.com/tcdi/pgx/tree/v${version}/cargo-pgx";
+    license = licenses.mit;
+    maintainers = with maintainers; [ typetetris ];
+  };
+}
diff --git a/pkgs/development/tools/rust/cargo-pgx/0_7_4.nix b/pkgs/development/tools/rust/cargo-pgx/0_7_4.nix
new file mode 100644
index 0000000000000..e54a3c6a877ea
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-pgx/0_7_4.nix
@@ -0,0 +1,25 @@
+{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, openssl, Security }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "cargo-pgx";
+  version = "0.7.4";
+
+  src = fetchCrate {
+    inherit version pname;
+    sha256 = "sha256-uyMWfxI+A8mws8oZFm2pmvr7hJgSNIb328SrVtIDGdA=";
+  };
+
+  cargoSha256 = "sha256-RgpL/hJdfrtLDANs5U53m5a6aEEAhZ9SFOIM7V8xABM=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ openssl ]
+    ++ lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with lib; {
+    description = "Cargo subcommand for ‘pgx’ to make Postgres extension development easy";
+    homepage = "https://github.com/tcdi/pgx/tree/v${version}/cargo-pgx";
+    license = licenses.mit;
+    maintainers = with maintainers; [ typetetris ];
+  };
+}
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
index d672928cd3d6b..13b29f4503b01 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
@@ -4,9 +4,10 @@
 , postgresql
 , stdenv
 , nixosTests
+, cargo-pgx_0_6_1
 }:
 
-buildPgxExtension rec {
+(buildPgxExtension.override {cargo-pgx = cargo-pgx_0_6_1;})rec {
   inherit postgresql;
 
   pname = "timescaledb_toolkit";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f3dcb3c1705b..81ae716ea4df4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16097,9 +16097,16 @@ with pkgs;
   cargo-outdated = callPackage ../development/tools/rust/cargo-outdated {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
   };
-  cargo-pgx = callPackage ../development/tools/rust/cargo-pgx {
+  cargo-pgx_0_6_1 = callPackage ../development/tools/rust/cargo-pgx/0_6_1.nix {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
+  cargo-pgx_0_7_1 = callPackage ../development/tools/rust/cargo-pgx/0_7_1.nix {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+  cargo-pgx_0_7_4 = callPackage ../development/tools/rust/cargo-pgx/0_7_4.nix {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+  cargo-pgx = cargo-pgx_0_7_4;
   buildPgxExtension = callPackage ../development/tools/rust/cargo-pgx/buildPgxExtension.nix {
     inherit (darwin.apple_sdk.frameworks) Security;
   };