Skip to content

Commit 11e426f

Browse files
jfrochesamrose
authored andcommitted
fix: overlay and use our buildPgrxExtension function
These overlay packages will be removed once the extensions are updated to use the new `buildPgrxExtension` function.
1 parent b21e306 commit 11e426f

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

nix/cargo-pgrx/default.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,17 @@ in
7373
cargo-pgrx_0_12_6 = mkCargoPgrx {
7474
version = "0.12.6";
7575
hash = "sha256-7aQkrApALZe6EoQGVShGBj0UIATnfOy2DytFj9IWdEA=";
76-
cargoHash = "sha256-Di4UldQwAt3xVyvgQT1gUhdvYUVp7n/a72pnX45kP0w=";
76+
cargoHash = "sha256-pnMxWWfvr1/AEp8DvG4awig8zjdHizJHoZ5RJA8CL08=";
7777
};
7878
cargo-pgrx_0_12_9 = mkCargoPgrx {
7979
version = "0.12.9";
8080
hash = "sha256-aR3DZAjeEEAjLQfZ0ZxkjLqTVMIEbU0UiZ62T4BkQq8=";
81-
cargoHash = "sha256-KTKcol9qSNLQZGW32e6fBb6cPkUGItknyVpLdBYqrBY=";
81+
cargoHash = "sha256-yZpD3FriL9UbzRtdFkfIfFfYIrRPYxr/lZ5rb0YBTPc=";
8282
};
8383
cargo-pgrx_0_14_3 = mkCargoPgrx {
8484
version = "0.14.3";
8585
hash = "sha256-3TsNpEqNm3Uol5XPW1i0XEbP2fF2+RKB2d7lO6BDnvQ=";
86-
cargoHash = "sha256-Ny7j56pwB+2eEK62X0nWfFKQy5fBz+Q1oyvecivxLkk=";
86+
cargoHash = "sha256-LZUXhjMxkBs3O5feH4X5NQC7Qk4Ja6M5+sAYaSCikrY=";
8787
};
8888
inherit mkCargoPgrx;
8989
}

nix/overlays/default.nix

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{ self, ... }:
22
{
3-
flake.overlays.default = final: prev: {
3+
flake.overlays.default = final: _prev: {
44
# NOTE: add any needed overlays here. in theory we could
55
# pull them from the overlays/ directory automatically, but we don't
66
# want to have an arbitrary order, since it might matter. being
@@ -33,7 +33,6 @@
3333
inherit (final) lib;
3434
inherit (final) Security;
3535
inherit (final) pkg-config;
36-
inherit (final) makeRustPlatform;
3736
inherit (final) stdenv;
3837
inherit (final) writeShellScriptBin;
3938
};
@@ -50,15 +49,15 @@
5049
cargo-pgrx = final.cargo-pgrx.cargo-pgrx_0_11_3;
5150
};
5251

53-
buildPgrxExtension_0_12_6 = prev.buildPgrxExtension.override {
52+
buildPgrxExtension_0_12_6 = final.buildPgrxExtension.override {
5453
cargo-pgrx = final.cargo-pgrx.cargo-pgrx_0_12_6;
5554
};
5655

57-
buildPgrxExtension_0_12_9 = prev.buildPgrxExtension.override {
56+
buildPgrxExtension_0_12_9 = final.buildPgrxExtension.override {
5857
cargo-pgrx = final.cargo-pgrx.cargo-pgrx_0_12_9;
5958
};
6059

61-
buildPgrxExtension_0_14_3 = prev.buildPgrxExtension.override {
60+
buildPgrxExtension_0_14_3 = final.buildPgrxExtension.override {
6261
cargo-pgrx = final.cargo-pgrx.cargo-pgrx_0_14_3;
6362
};
6463
};

0 commit comments

Comments
 (0)