File tree Expand file tree Collapse file tree 4 files changed +5
-19
lines changed Expand file tree Collapse file tree 4 files changed +5
-19
lines changed Original file line number Diff line number Diff line change 6
6
rust-bin ,
7
7
} :
8
8
let
9
- inherit
10
- (
11
- ( callPackage ./default.nix {
12
- inherit rustVersion ;
13
- } )
14
- )
15
- mkCargoPgrx
16
- ;
9
+ inherit ( ( callPackage ./default.nix { inherit rustVersion ; } ) ) mkCargoPgrx ;
17
10
18
11
rustPlatform = makeRustPlatform {
19
12
cargo = rust-bin . stable . ${ rustVersion } . default ;
Original file line number Diff line number Diff line change 22
22
let
23
23
# Create a testing harness for a PostgreSQL package. This is used for
24
24
# 'nix flake check', and works with any PostgreSQL package you hand it.
25
+ # deadnix: skip
25
26
makeCheckHarness =
26
27
pgpkg :
27
28
let
Original file line number Diff line number Diff line change @@ -101,7 +101,6 @@ self.inputs.nixpkgs.lib.nixos.runTest {
101
101
requires = [ "postgresql-migrate.service" ] ;
102
102
} ;
103
103
} ;
104
-
105
104
} ;
106
105
testScript =
107
106
{ nodes , ... } :
Original file line number Diff line number Diff line change 66
66
lockFile = "${ src } /Cargo.lock" ;
67
67
outputHashes =
68
68
if builtins . compareVersions "0.4.2" version >= 0 then
69
- {
70
- "clickhouse-rs-1.0.0-alpha.1" = "sha256-0zmoUo/GLyCKDLkpBsnLAyGs1xz6cubJhn+eVqMEMaw=" ;
71
- }
69
+ { "clickhouse-rs-1.0.0-alpha.1" = "sha256-0zmoUo/GLyCKDLkpBsnLAyGs1xz6cubJhn+eVqMEMaw=" ; }
72
70
else if builtins . compareVersions "0.5.0" version >= 0 then
73
- {
74
- "clickhouse-rs-1.1.0-alpha.1" = "sha256-G+v4lNP5eK2U45D1fL90Dq24pUSlpIysNCxuZ17eac0=" ;
75
- }
71
+ { "clickhouse-rs-1.1.0-alpha.1" = "sha256-G+v4lNP5eK2U45D1fL90Dq24pUSlpIysNCxuZ17eac0=" ; }
76
72
else if builtins . compareVersions "0.5.2" version == 0 then
77
73
{
78
74
"clickhouse-rs-1.1.0-alpha.1" = "sha256-nKiGzdsAgJej8NgyVOqHaD1sZLrNF1RPfEhu2pRwZ6o=" ;
159
155
} ;
160
156
}
161
157
// lib . optionalAttrs ( version == "0.3.0" ) {
162
- patches = [
163
- ./0001-bump-pgrx-to-0.11.3.patch
164
- ] ;
158
+ patches = [ ./0001-bump-pgrx-to-0.11.3.patch ] ;
165
159
166
160
cargoLock = {
167
161
lockFile = ./Cargo.lock-0.3.0 ;
181
175
packages = builtins . attrValues (
182
176
lib . mapAttrs ( name : value : build name value . hash value . rust value . pgrx ) supportedVersions
183
177
) ;
184
-
185
178
in
186
179
buildEnv {
187
180
name = pname ;
You can’t perform that action at this time.
0 commit comments