Skip to content

Commit 51fcc9d

Browse files
mysql-shell{,_8,-innovation}: format with nixfmt (#358604)
2 parents 6dfdf67 + 3e8d408 commit 51fcc9d

File tree

2 files changed

+146
-112
lines changed

2 files changed

+146
-112
lines changed

pkgs/development/tools/mysql-shell/8.nix

Lines changed: 73 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,42 @@
1-
{ lib
2-
, stdenv
3-
, pkg-config
4-
, cmake
5-
, fetchurl
6-
, git
7-
, cctools
8-
, darwin
9-
, makeWrapper
10-
, bison
11-
, openssl
12-
, protobuf
13-
, curl
14-
, zlib
15-
, libssh
16-
, zstd
17-
, lz4
18-
, readline
19-
, libtirpc
20-
, rpcsvc-proto
21-
, libedit
22-
, libevent
23-
, icu
24-
, re2
25-
, ncurses
26-
, libfido2
27-
, python3
28-
, cyrus_sasl
29-
, openldap
30-
, antlr
1+
{
2+
lib,
3+
stdenv,
4+
pkg-config,
5+
cmake,
6+
fetchurl,
7+
git,
8+
cctools,
9+
darwin,
10+
makeWrapper,
11+
bison,
12+
openssl,
13+
protobuf,
14+
curl,
15+
zlib,
16+
libssh,
17+
zstd,
18+
lz4,
19+
readline,
20+
libtirpc,
21+
rpcsvc-proto,
22+
libedit,
23+
libevent,
24+
icu,
25+
re2,
26+
ncurses,
27+
libfido2,
28+
python3,
29+
cyrus_sasl,
30+
openldap,
31+
antlr,
3132
}:
3233

3334
let
34-
pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ];
35+
pythonDeps = with python3.pkgs; [
36+
certifi
37+
paramiko
38+
pyyaml
39+
];
3540

3641
mysqlShellVersion = "8.4.3";
3742
mysqlServerVersion = "8.4.3";
@@ -70,32 +75,44 @@ stdenv.mkDerivation (finalAttrs: {
7075
substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool
7176
'';
7277

73-
nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]
78+
nativeBuildInputs =
79+
[
80+
pkg-config
81+
cmake
82+
git
83+
bison
84+
makeWrapper
85+
]
7486
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]
75-
++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.DarwinTools ];
76-
77-
buildInputs = [
78-
curl
79-
libedit
80-
libssh
81-
lz4
82-
openssl
83-
protobuf
84-
readline
85-
zlib
86-
zstd
87-
libevent
88-
icu
89-
re2
90-
ncurses
91-
libfido2
92-
cyrus_sasl
93-
openldap
94-
python3
95-
antlr.runtime.cpp
96-
] ++ pythonDeps
97-
++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]
98-
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];
87+
++ lib.optionals stdenv.hostPlatform.isDarwin [
88+
cctools
89+
darwin.DarwinTools
90+
];
91+
92+
buildInputs =
93+
[
94+
curl
95+
libedit
96+
libssh
97+
lz4
98+
openssl
99+
protobuf
100+
readline
101+
zlib
102+
zstd
103+
libevent
104+
icu
105+
re2
106+
ncurses
107+
libfido2
108+
cyrus_sasl
109+
openldap
110+
python3
111+
antlr.runtime.cpp
112+
]
113+
++ pythonDeps
114+
++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]
115+
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];
99116

100117
preConfigure = ''
101118
# Build MySQL

pkgs/development/tools/mysql-shell/innovation.nix

Lines changed: 73 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,42 @@
1-
{ lib
2-
, stdenv
3-
, pkg-config
4-
, cmake
5-
, fetchurl
6-
, git
7-
, cctools
8-
, darwin
9-
, makeWrapper
10-
, bison
11-
, openssl
12-
, protobuf
13-
, curl
14-
, zlib
15-
, libssh
16-
, zstd
17-
, lz4
18-
, readline
19-
, libtirpc
20-
, rpcsvc-proto
21-
, libedit
22-
, libevent
23-
, icu
24-
, re2
25-
, ncurses
26-
, libfido2
27-
, python3
28-
, cyrus_sasl
29-
, openldap
30-
, antlr
1+
{
2+
lib,
3+
stdenv,
4+
pkg-config,
5+
cmake,
6+
fetchurl,
7+
git,
8+
cctools,
9+
darwin,
10+
makeWrapper,
11+
bison,
12+
openssl,
13+
protobuf,
14+
curl,
15+
zlib,
16+
libssh,
17+
zstd,
18+
lz4,
19+
readline,
20+
libtirpc,
21+
rpcsvc-proto,
22+
libedit,
23+
libevent,
24+
icu,
25+
re2,
26+
ncurses,
27+
libfido2,
28+
python3,
29+
cyrus_sasl,
30+
openldap,
31+
antlr,
3132
}:
3233

3334
let
34-
pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ];
35+
pythonDeps = with python3.pkgs; [
36+
certifi
37+
paramiko
38+
pyyaml
39+
];
3540

3641
mysqlShellVersion = "9.1.0";
3742
mysqlServerVersion = "9.1.0";
@@ -70,32 +75,44 @@ stdenv.mkDerivation (finalAttrs: {
7075
substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool
7176
'';
7277

73-
nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]
78+
nativeBuildInputs =
79+
[
80+
pkg-config
81+
cmake
82+
git
83+
bison
84+
makeWrapper
85+
]
7486
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]
75-
++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.DarwinTools ];
76-
77-
buildInputs = [
78-
curl
79-
libedit
80-
libssh
81-
lz4
82-
openssl
83-
protobuf
84-
readline
85-
zlib
86-
zstd
87-
libevent
88-
icu
89-
re2
90-
ncurses
91-
libfido2
92-
cyrus_sasl
93-
openldap
94-
python3
95-
antlr.runtime.cpp
96-
] ++ pythonDeps
97-
++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]
98-
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];
87+
++ lib.optionals stdenv.hostPlatform.isDarwin [
88+
cctools
89+
darwin.DarwinTools
90+
];
91+
92+
buildInputs =
93+
[
94+
curl
95+
libedit
96+
libssh
97+
lz4
98+
openssl
99+
protobuf
100+
readline
101+
zlib
102+
zstd
103+
libevent
104+
icu
105+
re2
106+
ncurses
107+
libfido2
108+
cyrus_sasl
109+
openldap
110+
python3
111+
antlr.runtime.cpp
112+
]
113+
++ pythonDeps
114+
++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]
115+
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];
99116

100117
preConfigure = ''
101118
# Build MySQL

0 commit comments

Comments
 (0)