Skip to content

Commit 427aeb1

Browse files
jfrochesamrose
jfroche
authored and
samrose
committed
chore: update fmt
1 parent fd01f32 commit 427aeb1

File tree

11 files changed

+237
-242
lines changed

11 files changed

+237
-242
lines changed

‎nix/ext/gdal.nix‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,14 @@ stdenv.mkDerivation rec {
4747
zlib
4848
];
4949

50-
cmakeFlags =
51-
[
52-
"-DGDAL_USE_INTERNAL_LIBS=OFF"
53-
"-DGEOTIFF_INCLUDE_DIR=${lib.getDev libgeotiff}/include"
54-
"-DGEOTIFF_LIBRARY_RELEASE=${lib.getLib libgeotiff}/lib/libgeotiff${stdenv.hostPlatform.extensions.sharedLibrary}"
55-
"-DBUILD_PYTHON_BINDINGS=OFF"
56-
]
57-
++ lib.optionals (!stdenv.isDarwin) [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]
58-
++ lib.optionals stdenv.isDarwin [ "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" ];
50+
cmakeFlags = [
51+
"-DGDAL_USE_INTERNAL_LIBS=OFF"
52+
"-DGEOTIFF_INCLUDE_DIR=${lib.getDev libgeotiff}/include"
53+
"-DGEOTIFF_LIBRARY_RELEASE=${lib.getLib libgeotiff}/lib/libgeotiff${stdenv.hostPlatform.extensions.sharedLibrary}"
54+
"-DBUILD_PYTHON_BINDINGS=OFF"
55+
]
56+
++ lib.optionals (!stdenv.isDarwin) [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]
57+
++ lib.optionals stdenv.isDarwin [ "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" ];
5958

6059
enableParallelBuilding = true;
6160

‎nix/ext/pgroonga.nix‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ stdenv.mkDerivation rec {
2828
msgpack-c
2929
supabase-groonga
3030
mecab
31-
] ++ lib.optionals stdenv.isDarwin [ xxHash ];
31+
]
32+
++ lib.optionals stdenv.isDarwin [ xxHash ];
3233

3334
propagatedBuildInputs = [ supabase-groonga ];
3435
configureFlags = [

‎nix/ext/pgrouting.nix‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,14 @@ stdenv.mkDerivation rec {
3333
stdenv.isDarwin && lib.versionAtLeast postgresql.version "16"
3434
) "-Wno-error=int-conversion -Wno-error=incompatible-pointer-types";
3535

36-
cmakeFlags =
37-
[ "-DPOSTGRESQL_VERSION=${postgresql.version}" ]
38-
++ lib.optionals (stdenv.isDarwin && lib.versionAtLeast postgresql.version "16") [
39-
"-DCMAKE_MACOSX_RPATH=ON"
40-
"-DCMAKE_SHARED_MODULE_SUFFIX=.dylib"
41-
"-DCMAKE_SHARED_LIBRARY_SUFFIX=.dylib"
42-
];
36+
cmakeFlags = [
37+
"-DPOSTGRESQL_VERSION=${postgresql.version}"
38+
]
39+
++ lib.optionals (stdenv.isDarwin && lib.versionAtLeast postgresql.version "16") [
40+
"-DCMAKE_MACOSX_RPATH=ON"
41+
"-DCMAKE_SHARED_MODULE_SUFFIX=.dylib"
42+
"-DCMAKE_SHARED_LIBRARY_SUFFIX=.dylib"
43+
];
4344

4445
preConfigure = lib.optionalString (stdenv.isDarwin && lib.versionAtLeast postgresql.version "16") ''
4546
export DLSUFFIX=.dylib

‎nix/ext/plv8.nix‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -37,38 +37,37 @@ stdenv.mkDerivation (finalAttrs: {
3737
./0001-build-Allow-using-V8-from-system.patch
3838
];
3939

40-
nativeBuildInputs =
41-
[ perl ]
42-
++ lib.optionals stdenv.isDarwin [
43-
clang
44-
xcbuild
45-
];
40+
nativeBuildInputs = [
41+
perl
42+
]
43+
++ lib.optionals stdenv.isDarwin [
44+
clang
45+
xcbuild
46+
];
4647

47-
buildInputs =
48-
[
49-
v8
50-
postgresql
51-
]
52-
++ lib.optionals stdenv.isDarwin [
53-
darwin.apple_sdk.frameworks.CoreFoundation
54-
darwin.apple_sdk.frameworks.Kerberos
55-
];
48+
buildInputs = [
49+
v8
50+
postgresql
51+
]
52+
++ lib.optionals stdenv.isDarwin [
53+
darwin.apple_sdk.frameworks.CoreFoundation
54+
darwin.apple_sdk.frameworks.Kerberos
55+
];
5656

5757
buildFlags = [ "all" ];
5858

59-
makeFlags =
60-
[
61-
# Nixpkgs build a v8 monolith instead of separate v8_libplatform.
62-
"USE_SYSTEM_V8=1"
63-
"V8_OUTDIR=${v8}/lib"
64-
"PG_CONFIG=${postgresql}/bin/pg_config"
65-
]
66-
++ lib.optionals stdenv.isDarwin [
67-
"CC=${clang}/bin/clang"
68-
"CXX=${clang}/bin/clang++"
69-
"SHLIB_LINK=-L${v8}/lib -lv8_monolith -Wl,-rpath,${v8}/lib"
70-
]
71-
++ lib.optionals (!stdenv.isDarwin) [ "SHLIB_LINK=-lv8" ];
59+
makeFlags = [
60+
# Nixpkgs build a v8 monolith instead of separate v8_libplatform.
61+
"USE_SYSTEM_V8=1"
62+
"V8_OUTDIR=${v8}/lib"
63+
"PG_CONFIG=${postgresql}/bin/pg_config"
64+
]
65+
++ lib.optionals stdenv.isDarwin [
66+
"CC=${clang}/bin/clang"
67+
"CXX=${clang}/bin/clang++"
68+
"SHLIB_LINK=-L${v8}/lib -lv8_monolith -Wl,-rpath,${v8}/lib"
69+
]
70+
++ lib.optionals (!stdenv.isDarwin) [ "SHLIB_LINK=-lv8" ];
7271

7372
NIX_LDFLAGS = (
7473
lib.optionals stdenv.isDarwin [

‎nix/ext/postgis.nix‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ stdenv.mkDerivation rec {
4545
protobufc
4646
pcre2.dev
4747
sfcgal
48-
] ++ lib.optional stdenv.isDarwin libiconv;
48+
]
49+
++ lib.optional stdenv.isDarwin libiconv;
4950
nativeBuildInputs = [
5051
perl
5152
pkg-config

‎nix/ext/timescaledb-2.9.1.nix‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
3131
"-DREGRESS_CHECKS=OFF"
3232
"-DTAP_CHECKS=OFF"
3333
"-DAPACHE_ONLY=1"
34-
] ++ lib.optionals stdenv.isDarwin [ "-DLINTER=OFF" ];
34+
]
35+
++ lib.optionals stdenv.isDarwin [ "-DLINTER=OFF" ];
3536

3637
# Fix the install phase which tries to install into the pgsql extension dir,
3738
# and cannot be manually overridden. This is rather fragile but works OK.

‎nix/ext/timescaledb.nix‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
3131
"-DREGRESS_CHECKS=OFF"
3232
"-DTAP_CHECKS=OFF"
3333
"-DAPACHE_ONLY=1"
34-
] ++ lib.optionals stdenv.isDarwin [ "-DLINTER=OFF" ];
34+
]
35+
++ lib.optionals stdenv.isDarwin [ "-DLINTER=OFF" ];
3536

3637
# Fix the install phase which tries to install into the pgsql extension dir,
3738
# and cannot be manually overridden. This is rather fragile but works OK.

‎nix/ext/wrappers/default.nix‎

Lines changed: 9 additions & 10 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

‎nix/packages/groonga/default.nix‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,20 @@ stdenv.mkDerivation (finalAttrs: {
3939
pkg-config
4040
makeWrapper
4141
];
42-
buildInputs =
43-
[
44-
rapidjson
45-
xxHash
46-
zstd
47-
mecab
48-
kytea
49-
msgpack-c
50-
]
51-
++ lib.optionals lz4Support [ lz4 ]
52-
++ lib.optional zlibSupport [ zlib ]
53-
++ lib.optionals suggestSupport [
54-
zeromq
55-
libevent
56-
];
42+
buildInputs = [
43+
rapidjson
44+
xxHash
45+
zstd
46+
mecab
47+
kytea
48+
msgpack-c
49+
]
50+
++ lib.optionals lz4Support [ lz4 ]
51+
++ lib.optional zlibSupport [ zlib ]
52+
++ lib.optionals suggestSupport [
53+
zeromq
54+
libevent
55+
];
5756
cmakeFlags = [
5857
"-DWITH_MECAB=ON"
5958
"-DMECAB_DICDIR=${mecab-naist-jdic}/lib/mecab/dic/naist-jdic"

‎nix/packages/lib.nix‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@
9595
PGBOUNCER_AUTH_SCHEMA_SQL = "${paths.pgbouncerAuthSchemaSql}";
9696
STAT_EXTENSION_SQL = "${paths.statExtensionSql}";
9797
CURRENT_SYSTEM = "${system}";
98-
} // extraSubstitutions; # Merge in any extra substitutions
98+
}
99+
// extraSubstitutions; # Merge in any extra substitutions
99100
in
100101
pkgs.runCommand name
101102
{

0 commit comments

Comments
 (0)