From 3e8d408a5e789f3feefc6424026bc5eb70f71892 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 24 Nov 2024 10:45:01 +0800 Subject: [PATCH] mysql-shell{,_8,-innovation}: format with nixfmt --- pkgs/development/tools/mysql-shell/8.nix | 127 ++++++++++-------- .../tools/mysql-shell/innovation.nix | 127 ++++++++++-------- 2 files changed, 144 insertions(+), 110 deletions(-) diff --git a/pkgs/development/tools/mysql-shell/8.nix b/pkgs/development/tools/mysql-shell/8.nix index 79f8f638c08c..702c88de4db1 100644 --- a/pkgs/development/tools/mysql-shell/8.nix +++ b/pkgs/development/tools/mysql-shell/8.nix @@ -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 diff --git a/pkgs/development/tools/mysql-shell/innovation.nix b/pkgs/development/tools/mysql-shell/innovation.nix index 573245955006..75bd98d9681a 100644 --- a/pkgs/development/tools/mysql-shell/innovation.nix +++ b/pkgs/development/tools/mysql-shell/innovation.nix @@ -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