Compare commits

...

3 Commits

Author SHA1 Message Date
8a110ba5f9
Upgrade MySQL version to 8.0 2020-11-30 20:45:42 +01:00
fccb4b7d2b
Shutdown mysql when exiting the environment 2020-11-30 20:13:31 +01:00
6d4cc27acb
Revert "Add C/C++ environment"
This reverts commit f5231a33955e62adecd8ed2e43ab7b1ee7c5c600.
2020-11-29 19:02:58 +01:00
2 changed files with 13 additions and 13 deletions

5
env/cpp.nix vendored
View File

@ -1,5 +0,0 @@
{ pkgs ? import <nixpkgs> { } }:
with pkgs;
mkShell { buildInputs = [ ccls cmake ]; }

21
env/mysql.nix vendored
View File

@ -2,19 +2,24 @@
with pkgs; with pkgs;
mkShell { let
buildInputs = [ mysql57 ]; sql_file = "database/db.sql";
data_dir = "$(pwd)/.mysql";
socket = "${data_dir}/mysql.sock";
in mkShell {
buildInputs = [ mysql80 ];
shellHook = '' shellHook = ''
pkill mysql trap "kill 0" EXIT
rm -rf .mysql && mkdir .mysql [ -d ${data_dir} ] || mkdir ${data_dir}
mysqld --datadir="$(pwd)/.mysql" --socket="$(pwd)/.mysql/mysql.sock" --initialize-insecure mysqld --datadir="${data_dir}" --socket="${socket}" --initialize-insecure
mysqld --datadir="$(pwd)/.mysql" --socket="$(pwd)/.mysql/mysql.sock" --skip-networking & mysqld --datadir="${data_dir}" --socket="${socket}" --skip-networking --skip-mysqlx &
sleep 1 sleep 1
mysql --socket="$(pwd)/.mysql/mysql.sock" -u root < $(pwd)/database/db.sql mysql --socket="${socket}" -u root < ${sql_file}
alias mysql='mysql --socket="$(pwd)/.mysql/mysql.sock" -u root' alias mysql='mysql --socket="${socket}" -u root'
''; '';
} }