Skip to content

Commit 5a2b47c

Browse files
committed
feat(wrappers): add versions 0.1.18, 0.1.19 and 0.2.0
1 parent a4dac31 commit 5a2b47c

File tree

6 files changed

+13648
-18
lines changed

6 files changed

+13648
-18
lines changed

nix/ext/versions.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,30 @@
504504
}
505505
},
506506
"wrappers": {
507+
"0.1.18": {
508+
"postgresql": [
509+
"15"
510+
],
511+
"hash": "sha256-E4ql7D/lkb/J3Rr1kMEo37KxbFnqYPCdhuAIpVFLgB8=",
512+
"pgrx": "0.10.2",
513+
"rust": "1.76.0"
514+
},
515+
"0.1.19": {
516+
"postgresql": [
517+
"15"
518+
],
519+
"hash": "sha256-wvsAqDk+1am6mSBCF5uzDArnbBIpLqTylLzF4VZ/p08=",
520+
"pgrx": "0.10.2",
521+
"rust": "1.76.0"
522+
},
523+
"0.2.0": {
524+
"postgresql": [
525+
"15"
526+
],
527+
"hash": "sha256-F+S5uyubL3Tb3RTJ08Zf9gN8oLE/WkCWFA8RcKkDqes=",
528+
"pgrx": "0.11.3",
529+
"rust": "1.76.0"
530+
},
507531
"0.3.0": {
508532
"postgresql": [
509533
"15"

nix/ext/wrappers/default.nix

Lines changed: 47 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,15 @@ let
3737
cargo
3838
git
3939
];
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-
];
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+
];
5049

5150
NIX_LDFLAGS = "-L${postgresql}/lib -lpq";
5251

@@ -161,27 +160,57 @@ let
161160
};
162161
}
163162
// lib.optionalAttrs (version == "0.3.0") {
163+
cargoLock = {
164+
lockFile = ./v0.3.0/Cargo.lock;
165+
outputHashes = {
166+
"clickhouse-rs-1.0.0-alpha.1" = "sha256-0zmoUo/GLyCKDLkpBsnLAyGs1xz6cubJhn+eVqMEMaw=";
167+
};
168+
};
169+
164170
# TODO: there is an inference error on crate `time` caused by an API change in Rust 1.80.0;
165171
# so we should patch `Cargo.toml` with `time >= 0.3.35`, to use a more recent Rust version!
166172
patches = [ ./v0.3.0/0001-bump-pgrx-to-0.11.3.patch ];
173+
}
174+
// lib.optionalAttrs (version == "0.2.0") {
175+
cargoLock = {
176+
lockFile = ./v0.2.0/Cargo.lock;
177+
outputHashes = {
178+
"clickhouse-rs-1.0.0-alpha.1" = "sha256-0zmoUo/GLyCKDLkpBsnLAyGs1xz6cubJhn+eVqMEMaw=";
179+
};
180+
};
167181

182+
patches = [ ./v0.2.0/0001-bump-pgrx-to-0.11.3.patch ];
183+
postPatch = ''
184+
cp ${./v0.2.0/Cargo.lock} ./Cargo.lock
185+
'';
186+
}
187+
// lib.optionalAttrs (version == "0.1.19") {
168188
cargoLock = {
169-
lockFile = ./v0.3.0/Cargo.lock;
189+
lockFile = ./v0.1.19/Cargo.lock;
170190
outputHashes = {
171191
"clickhouse-rs-1.0.0-alpha.1" = "sha256-0zmoUo/GLyCKDLkpBsnLAyGs1xz6cubJhn+eVqMEMaw=";
172192
};
173193
};
194+
195+
postPatch = ''
196+
cp ${./v0.1.19/Cargo.lock} ./Cargo.lock
197+
'';
198+
}
199+
// lib.optionalAttrs (version == "0.1.18") {
200+
cargoLock = {
201+
lockFile = ./v0.1.18/Cargo.lock;
202+
outputHashes = {
203+
"clickhouse-rs-1.0.0-alpha.1" = "sha256-0zmoUo/GLyCKDLkpBsnLAyGs1xz6cubJhn+eVqMEMaw=";
204+
};
205+
};
206+
207+
postPatch = ''
208+
cp ${./v0.1.18/Cargo.lock} ./Cargo.lock
209+
'';
174210
}
175211
);
176212
# All versions that were previously packaged (historical list)
177213
allPreviouslyPackagedVersions = [
178-
"0.4.3"
179-
"0.4.2"
180-
"0.4.1"
181-
"0.3.0"
182-
"0.2.0"
183-
"0.1.19"
184-
"0.1.18"
185214
"0.1.17"
186215
"0.1.16"
187216
"0.1.15"

0 commit comments

Comments
 (0)