Skip to content

Commit 6323605

Browse files
committed
feat(wrappers): add versions 0.1.12 and 0.1.14
1 parent f267e79 commit 6323605

File tree

5 files changed

+8676
-11
lines changed

5 files changed

+8676
-11
lines changed

nix/cargo-pgrx/versions.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@
1515
}
1616
}
1717
},
18+
"0.8.3": {
19+
"hash": "sha256-1SdGPhyT/m65De3QTpEYAGvzbB6eLH1yUZ8XoN9LaVc=",
20+
"rust": {
21+
"1.70.0": {
22+
"cargoHash": "sha256-uFSv2mwn0dmIo6AG5Wz3THOwdE9B2PQQF10kiG/3qLU="
23+
}
24+
}
25+
},
1826
"0.9.5": {
1927
"hash": "sha256-GpXQUOBuojAqPXyRR+k8AVW2XzBbn6V0+2dhP4w4Vs8=",
2028
"rust": {

nix/ext/versions.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,22 @@
530530
}
531531
},
532532
"wrappers": {
533+
"0.1.12": {
534+
"postgresql": [
535+
"15"
536+
],
537+
"hash": "sha256-TScNbX+PBWUYgrBEnFXOaeXXfiOIa488H1oyIAw6v7I=",
538+
"pgrx": "0.8.3",
539+
"rust": "1.70.0"
540+
},
541+
"0.1.14": {
542+
"postgresql": [
543+
"15"
544+
],
545+
"hash": "sha256-w6rijRFUlWmwv4XE0G99ip2GkBF4nGTaX94kQvNRmJs=",
546+
"pgrx": "0.8.3",
547+
"rust": "1.70.0"
548+
},
533549
"0.1.15": {
534550
"postgresql": [
535551
"15"

nix/ext/wrappers/default.nix

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,16 @@ let
3737
cargo
3838
git
3939
];
40-
buildInputs = [
41-
openssl
42-
postgresql
43-
]
44-
++ lib.optionals stdenv.isDarwin [
45-
darwin.apple_sdk.frameworks.CoreFoundation
46-
darwin.apple_sdk.frameworks.Security
47-
darwin.apple_sdk.frameworks.SystemConfiguration
48-
];
40+
buildInputs =
41+
[
42+
openssl
43+
postgresql
44+
]
45+
++ lib.optionals stdenv.isDarwin [
46+
darwin.apple_sdk.frameworks.CoreFoundation
47+
darwin.apple_sdk.frameworks.Security
48+
darwin.apple_sdk.frameworks.SystemConfiguration
49+
];
4950

5051
NIX_LDFLAGS = "-L${postgresql}/lib -lpq";
5152

@@ -249,11 +250,33 @@ let
249250
cp ${./v0.1.15/Cargo.lock} ./Cargo.lock
250251
'';
251252
}
253+
// lib.optionalAttrs (version == "0.1.14") {
254+
cargoLock = {
255+
lockFile = ./v0.1.14/Cargo.lock;
256+
outputHashes = {
257+
"clickhouse-rs-1.0.0-alpha.1" = "sha256-0zmoUo/GLyCKDLkpBsnLAyGs1xz6cubJhn+eVqMEMaw=";
258+
};
259+
};
260+
261+
postPatch = ''
262+
cp ${./v0.1.14/Cargo.lock} ./Cargo.lock
263+
'';
264+
}
265+
// lib.optionalAttrs (version == "0.1.12") {
266+
cargoLock = {
267+
lockFile = ./v0.1.12/Cargo.lock;
268+
outputHashes = {
269+
"clickhouse-rs-1.0.0-alpha.1" = "sha256-0zmoUo/GLyCKDLkpBsnLAyGs1xz6cubJhn+eVqMEMaw=";
270+
};
271+
};
272+
273+
postPatch = ''
274+
cp ${./v0.1.12/Cargo.lock} ./Cargo.lock
275+
'';
276+
}
252277
);
253278
# All versions that were previously packaged (historical list)
254279
allPreviouslyPackagedVersions = [
255-
"0.1.14"
256-
"0.1.12"
257280
"0.1.11"
258281
"0.1.10"
259282
"0.1.9"

0 commit comments

Comments
 (0)