nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-31 18:15:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

mysql-shell{,_8,-innovation}: format with nixfmt (#358604)

Browse Source
This commit is contained in:
Sandro 2024-11-28 20:24:35 +01:00 committed by GitHub
commit 51fcc9d335
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 144 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
pkgs/development/tools/mysql-shell/8.nix
View File

@ -1,37 +1,42 @@
{ lib
, stdenv
, pkg-config
, cmake
, fetchurl
, git
, cctools
, darwin
, makeWrapper
, bison
, openssl
, protobuf
, curl
, zlib
, libssh
, zstd
, lz4
, readline
, libtirpc
, rpcsvc-proto
, libedit
, libevent
, icu
, re2
, ncurses
, libfido2
, python3
, cyrus_sasl
, openldap
, antlr
{
lib,
stdenv,
pkg-config,
cmake,
fetchurl,
git,
cctools,
darwin,
makeWrapper,
bison,
openssl,
protobuf,
curl,
zlib,
libssh,
zstd,
lz4,
readline,
libtirpc,
rpcsvc-proto,
libedit,
libevent,
icu,
re2,
ncurses,
libfido2,
python3,
cyrus_sasl,
openldap,
antlr,
}:
let
pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ];
pythonDeps = with python3.pkgs; [
certifi
paramiko
pyyaml
];
mysqlShellVersion = "8.4.3";
mysqlServerVersion = "8.4.3";
@ -70,32 +75,44 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool
'';
nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]
nativeBuildInputs =
[
pkg-config
cmake
git
bison
makeWrapper
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.DarwinTools ];
++ lib.optionals stdenv.hostPlatform.isDarwin [
cctools
darwin.DarwinTools
];
buildInputs = [
curl
libedit
libssh
lz4
openssl
protobuf
readline
zlib
zstd
libevent
icu
re2
ncurses
libfido2
cyrus_sasl
openldap
python3
antlr.runtime.cpp
] ++ pythonDeps
++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];
buildInputs =
[
curl
libedit
libssh
lz4
openssl
protobuf
readline
zlib
zstd
libevent
icu
re2
ncurses
libfido2
cyrus_sasl
openldap
python3
antlr.runtime.cpp
]
++ pythonDeps
++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];
preConfigure = ''
# Build MySQL

127
pkgs/development/tools/mysql-shell/innovation.nix
View File

@ -1,37 +1,42 @@
{ lib
, stdenv
, pkg-config
, cmake
, fetchurl
, git
, cctools
, darwin
, makeWrapper
, bison
, openssl
, protobuf
, curl
, zlib
, libssh
, zstd
, lz4
, readline
, libtirpc
, rpcsvc-proto
, libedit
, libevent
, icu
, re2
, ncurses
, libfido2
, python3
, cyrus_sasl
, openldap
, antlr
{
lib,
stdenv,
pkg-config,
cmake,
fetchurl,
git,
cctools,
darwin,
makeWrapper,
bison,
openssl,
protobuf,
curl,
zlib,
libssh,
zstd,
lz4,
readline,
libtirpc,
rpcsvc-proto,
libedit,
libevent,
icu,
re2,
ncurses,
libfido2,
python3,
cyrus_sasl,
openldap,
antlr,
}:
let
pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ];
pythonDeps = with python3.pkgs; [
certifi
paramiko
pyyaml
];
mysqlShellVersion = "9.1.0";
mysqlServerVersion = "9.1.0";
@ -70,32 +75,44 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool
'';
nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]
nativeBuildInputs =
[
pkg-config
cmake
git
bison
makeWrapper
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.DarwinTools ];
++ lib.optionals stdenv.hostPlatform.isDarwin [
cctools
darwin.DarwinTools
];
buildInputs = [
curl
libedit
libssh
lz4
openssl
protobuf
readline
zlib
zstd
libevent
icu
re2
ncurses
libfido2
cyrus_sasl
openldap
python3
antlr.runtime.cpp
] ++ pythonDeps
++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];
buildInputs =
[
curl
libedit
libssh
lz4
openssl
protobuf
readline
zlib
zstd
libevent
icu
re2
ncurses
libfido2
cyrus_sasl
openldap
python3
antlr.runtime.cpp
]
++ pythonDeps
++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];
preConfigure = ''
# Build MySQL