diff options
| author | Yt <raphael@megzari.com> | 2024-03-23 11:51:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-23 11:51:28 +0000 |
| commit | 86de7cd867a32429dc1b4a687931f9675afcb746 (patch) | |
| tree | 13aa21f8710fc4f3886ad2b440842cd42e1e213f /pkgs/servers | |
| parent | 560a21374575fcdd201155119617564ee3163772 (diff) | |
| parent | 72d1bae4063ef7f34658d645af65d764c8bc6fc0 (diff) | |
| download | nixlib-86de7cd867a32429dc1b4a687931f9675afcb746.tar nixlib-86de7cd867a32429dc1b4a687931f9675afcb746.tar.gz nixlib-86de7cd867a32429dc1b4a687931f9675afcb746.tar.bz2 nixlib-86de7cd867a32429dc1b4a687931f9675afcb746.tar.lz nixlib-86de7cd867a32429dc1b4a687931f9675afcb746.tar.xz nixlib-86de7cd867a32429dc1b4a687931f9675afcb746.tar.zst nixlib-86de7cd867a32429dc1b4a687931f9675afcb746.zip | |
Merge pull request #296336 from marsam/refactor-cargo-pgrx
cargo-pgrx: refactor
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix | 21 |
2 files changed, 4 insertions, 39 deletions
diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix index 23d4499029ea..d6a4f24bf5e6 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix @@ -1,6 +1,6 @@ { lib , buildPgrxExtension -, cargo-pgrx +, cargo-pgrx_0_11_2 , clang_16 , fetchCrate , fetchFromGitHub @@ -23,27 +23,11 @@ let bindgenHook = rustPlatform.bindgenHook.override { inherit clang; }; }; +in +(buildPgrxExtension.override { # Upstream only works with a fixed version of cargo-pgrx for each release, # so we're pinning it here to avoid future incompatibility. # See https://docs.pgvecto.rs/developers/development.html#environment, step 6 - cargo-pgrx_0_11_2 = cargo-pgrx.overrideAttrs (old: rec { - pname = "cargo-pgrx"; - version = "0.11.2"; - - src = fetchCrate { - pname = "cargo-pgrx"; - inherit version; - hash = "sha256-8NlpMDFaltTIA8G4JioYm8LaPJ2RGKH5o6sd6lBHmmM="; - }; - - cargoDeps = old.cargoDeps.overrideAttrs (_: { - inherit src; - outputHash = "sha256-qTb3JV3u42EilaK2jP9oa5D09mkuHyRbGGRs9Rg4TzI="; - }); - }); - -in -(buildPgrxExtension.override { cargo-pgrx = cargo-pgrx_0_11_2; rustPlatform = rustPlatform'; }) rec { diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix index 77dd41db7f6d..96bff3fe20b3 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix @@ -3,31 +3,12 @@ , buildPgrxExtension , postgresql , nixosTests -, cargo-pgrx +, cargo-pgrx_0_10_2 , fetchCrate , nix-update-script , stdenv }: -let - cargo-pgrx_0_10_2 = cargo-pgrx.overrideAttrs (old: rec { - name = "cargo-pgrx-${version}"; - version = "0.10.2"; - - src = fetchCrate { - pname = "cargo-pgrx"; - inherit version; - hash = "sha256-FqjfbJmSy5UCpPPPk4bkEyvQCnaH9zYtkI7txgIn+ls="; - }; - - cargoDeps = old.cargoDeps.overrideAttrs (_: { - inherit src; - outputHash = "sha256-XyI3RaPI3Edm/tCP2xoZemib2d2n2cAhobgk9Oafg6s="; - }); - }); - -in - (buildPgrxExtension.override { cargo-pgrx = cargo-pgrx_0_10_2; }) rec { inherit postgresql; |