Skip to content

Commit 27123ff

Browse files
yvan-srakayvan-sraka
committed
feat(wrappers): add versions 0.1.5, 0.1.6, 0.1.7, 0.1.8, 0.1.9, 0.1.10 and 0.1.11
1 parent 32747fe commit 27123ff

File tree

11 files changed

+26426
-13
lines changed

11 files changed

+26426
-13
lines changed

‎nix/cargo-pgrx/versions.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"0.6.1": {
33
"hash": "sha256-O4eHVbJBudybsPab+zr2eXnfheREMqLAHAKm2GDbfrs=",
44
"rust": {
5-
"1.82.0": {
5+
"1.70.0": {
66
"cargoHash": "sha256-MucGrA3qXgJOcT2LMNmoNOhQi8QA3LuqgZEHKycLCCo="
77
}
88
}
99
},
1010
"0.7.1": {
1111
"hash": "sha256-t/gdlrBeP6KFkBFJiZUa8KKVJVYMf6753vQGKJdytss=",
1212
"rust": {
13-
"1.82.0": {
13+
"1.70.0": {
1414
"cargoHash": "sha256-muce9wT4LAJmfNLWWEShARnpZgglXe/KrfxlitmGgXk="
1515
}
1616
}

‎nix/ext/versions.json‎

Lines changed: 59 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,23 +124,23 @@
124124
],
125125
"hash": "sha256-HnEyijEIkKbJFQjWF1sa5h2qqGzq/aW14454zPbo6wc=",
126126
"pgrx": "0.6.1",
127-
"rust": "1.82.0"
127+
"rust": "1.70.0"
128128
},
129129
"1.1.0": {
130130
"postgresql": [
131131
"15"
132132
],
133133
"hash": "sha256-Vdi9qBjg14/SpZ1TuOvKS0gJjkLmviCzoBLnPOds0pw=",
134134
"pgrx": "0.6.1",
135-
"rust": "1.82.0"
135+
"rust": "1.70.0"
136136
},
137137
"1.2.0": {
138138
"postgresql": [
139139
"15"
140140
],
141141
"hash": "sha256-QnNwKasSvC7o5pHDC/NlqJPvWirKwMpwUmfsLJXDTsg=",
142142
"pgrx": "0.7.1",
143-
"rust": "1.82.0"
143+
"rust": "1.70.0"
144144
},
145145
"1.2.2": {
146146
"postgresql": [
@@ -360,7 +360,6 @@
360360
"hash": "sha256-QC77AnPGpPQGEWi6JtJdiNsB2su5+aV2pKg5ImR2B0k="
361361
}
362362
},
363-
364363
"pgsodium": {
365364
"3.0.4": {
366365
"postgresql": [
@@ -540,6 +539,62 @@
540539
}
541540
},
542541
"wrappers": {
542+
"0.1.5": {
543+
"postgresql": [
544+
"15"
545+
],
546+
"hash": "sha256-i6hINjzlyu7lVoAkgBEDhRn1CTrBVI0Zgz33uFyRtjE=",
547+
"pgrx": "0.6.1",
548+
"rust": "1.70.0"
549+
},
550+
"0.1.6": {
551+
"postgresql": [
552+
"15"
553+
],
554+
"hash": "sha256-cYl6pDXV9lFLLhftSw3cYFff2shN+pZpTxWDSq5+P8E=",
555+
"pgrx": "0.6.1",
556+
"rust": "1.70.0"
557+
},
558+
"0.1.7": {
559+
"postgresql": [
560+
"15"
561+
],
562+
"hash": "sha256-aGq46W12XTxGH1KKxk2re0ul+9h0n/OIrFLsylS+Y3U=",
563+
"pgrx": "0.6.1",
564+
"rust": "1.70.0"
565+
},
566+
"0.1.8": {
567+
"postgresql": [
568+
"15"
569+
],
570+
"hash": "sha256-9h5T10mD4W7hEDdbtxkyxiY/pACX1Io33UGetGOlCZA=",
571+
"pgrx": "0.6.1",
572+
"rust": "1.70.0"
573+
},
574+
"0.1.9": {
575+
"postgresql": [
576+
"15"
577+
],
578+
"hash": "sha256-VZxbvPXwOGMbyLHMXFwAMbtzdapDA73qN+2obUdLR5Q=",
579+
"pgrx": "0.6.1",
580+
"rust": "1.70.0"
581+
},
582+
"0.1.10": {
583+
"postgresql": [
584+
"15"
585+
],
586+
"hash": "sha256-472lVh91iqaMNHJk21LUvPIrhm3yIzrvDbNHyUW8aBs=",
587+
"pgrx": "0.6.1",
588+
"rust": "1.70.0"
589+
},
590+
"0.1.11": {
591+
"postgresql": [
592+
"15"
593+
],
594+
"hash": "sha256-3zN8uWeQwVQCQ37+PyLC4wX9oiji6s2L3aIpWYcD28g=",
595+
"pgrx": "0.6.1",
596+
"rust": "1.70.0"
597+
},
543598
"0.1.12": {
544599
"postgresql": [
545600
"15"

‎nix/ext/wrappers/default.nix‎

Lines changed: 89 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ let
6161
CARGO_BUILD_JOBS = "2";
6262
CARGO = "${cargo}/bin/cargo";
6363

64+
pgrxBinaryName = if builtins.compareVersions "0.7.4" pgrxVersion >= 0 then "pgx" else "pgrx";
65+
6466
cargoLock = {
6567
lockFile = "${src}/Cargo.lock";
6668
outputHashes =
@@ -274,16 +276,96 @@ let
274276
cp ${./v0.1.12/Cargo.lock} ./Cargo.lock
275277
'';
276278
}
279+
// lib.optionalAttrs (version == "0.1.11") {
280+
cargoLock = {
281+
lockFile = ./v0.1.11/Cargo.lock;
282+
outputHashes = {
283+
"clickhouse-rs-1.0.0-alpha.1" = "sha256-EDMgIpDdkyW3ZG+8LSC4pis8DbHnPIabHRxuc23DPJU=";
284+
};
285+
};
286+
287+
postPatch = ''
288+
cp ${./v0.1.11/Cargo.lock} ./Cargo.lock
289+
'';
290+
}
291+
// lib.optionalAttrs (version == "0.1.10") {
292+
cargoLock = {
293+
lockFile = ./v0.1.10/Cargo.lock;
294+
outputHashes = {
295+
"clickhouse-rs-1.0.0-alpha.1" = "sha256-EDMgIpDdkyW3ZG+8LSC4pis8DbHnPIabHRxuc23DPJU=";
296+
};
297+
};
298+
299+
patches = [ ./v0.1.10/0001-bump-aws-config-to-0.55.3.patch ];
300+
postPatch = ''
301+
cp ${./v0.1.10/Cargo.lock} ./Cargo.lock
302+
'';
303+
}
304+
// lib.optionalAttrs (version == "0.1.9") {
305+
cargoLock = {
306+
lockFile = ./v0.1.9/Cargo.lock;
307+
outputHashes = {
308+
"clickhouse-rs-1.0.0-alpha.1" = "sha256-EDMgIpDdkyW3ZG+8LSC4pis8DbHnPIabHRxuc23DPJU=";
309+
};
310+
};
311+
312+
postPatch = ''
313+
cp ${./v0.1.9/Cargo.lock} ./Cargo.lock
314+
'';
315+
}
316+
// lib.optionalAttrs (version == "0.1.8") {
317+
cargoLock = {
318+
lockFile = ./v0.1.8/Cargo.lock;
319+
outputHashes = {
320+
"clickhouse-rs-1.0.0-alpha.1" = "sha256-EDMgIpDdkyW3ZG+8LSC4pis8DbHnPIabHRxuc23DPJU=";
321+
};
322+
};
323+
324+
postPatch = ''
325+
cp ${./v0.1.8/Cargo.lock} ./Cargo.lock
326+
'';
327+
}
328+
// lib.optionalAttrs (version == "0.1.7") {
329+
cargoLock = {
330+
lockFile = ./v0.1.7/Cargo.lock;
331+
outputHashes = {
332+
"clickhouse-rs-1.0.0-alpha.1" = "sha256-EDMgIpDdkyW3ZG+8LSC4pis8DbHnPIabHRxuc23DPJU=";
333+
};
334+
};
335+
336+
postPatch = ''
337+
cp ${./v0.1.7/Cargo.lock} ./Cargo.lock
338+
'';
339+
}
340+
// lib.optionalAttrs (version == "0.1.6") {
341+
cargoLock = {
342+
lockFile = ./v0.1.6/Cargo.lock;
343+
outputHashes = {
344+
"clickhouse-rs-1.0.0-alpha.1" = "sha256-EDMgIpDdkyW3ZG+8LSC4pis8DbHnPIabHRxuc23DPJU=";
345+
};
346+
};
347+
348+
postPatch = ''
349+
cp ${./v0.1.6/Cargo.lock} ./Cargo.lock
350+
'';
351+
}
352+
// lib.optionalAttrs (version == "0.1.5") {
353+
cargoLock = {
354+
lockFile = ./v0.1.5/Cargo.lock;
355+
outputHashes = {
356+
"clickhouse-rs-1.0.0-alpha.1" = "sha256-EDMgIpDdkyW3ZG+8LSC4pis8DbHnPIabHRxuc23DPJU=";
357+
};
358+
};
359+
360+
postPatch = ''
361+
cp ${./v0.1.5/Cargo.lock} ./Cargo.lock
362+
'';
363+
}
277364
);
278365
# All versions that were previously packaged (historical list)
279366
allPreviouslyPackagedVersions = [
280-
"0.1.11"
281-
"0.1.10"
282-
"0.1.9"
283-
"0.1.8"
284-
"0.1.7"
285-
"0.1.6"
286-
"0.1.5"
367+
# can't build the oldest versions listed below because
368+
# https://github.com/burmecia/gcp-bigquery-client no longer exists...
287369
"0.1.4"
288370
"0.1.1"
289371
"0.1.0"

0 commit comments

Comments
 (0)