Skip to content

Use the nix path for mysql/mariadb 'basedir'. Fixes #2524 #2525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Mar 11, 2025
Merged

Use the nix path for mysql/mariadb 'basedir'. Fixes #2524 #2525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
b843c20
Use the nix path for 'basedir'. Fixes #2524
jefft Feb 17, 2025
b2b80f1
Optimize Docker Image Size by Cleaning Nix Store (#2486)
artemklevtsov Feb 20, 2025
041109b
all: upgrade to Go 1.24 (#2533)
gcurtis Feb 21, 2025
1366779
Migrate devbox to go.jetify.com (#2536)
loreto Feb 24, 2025
6fd0034
Upgrade dependencies for devbox (#2538)
loreto Feb 25, 2025
f0976cf
[cicd] fix release action (#2540)
mikeland73 Feb 27, 2025
1677c64
[run] Add --all-projects flag (#2543)
mikeland73 Mar 3, 2025
d98494a
[easy][cicd] Fix testscripts (#2545)
mikeland73 Mar 3, 2025
65686d8
Clarify license and terms for contributions, reformat markdown (#2546)
loreto Mar 4, 2025
d8b8da7
Bump rack from 2.2.10 to 2.2.12 in /examples/stacks/rails/blog (#2547)
dependabot[bot] Mar 4, 2025
7b4fddc
Bump drupal/core-recommended from 10.2.3 to 10.2.11 in /examples/stac…
dependabot[bot] Mar 4, 2025
b2c198e
Bump github.com/go-jose/go-jose/v3 from 3.0.3 to 3.0.4 (#2541)
dependabot[bot] Mar 4, 2025
3a6d3ee
Bump django from 4.2.17 to 4.2.18 in /examples/stacks/django (#2513)
dependabot[bot] Mar 4, 2025
415edfe
[flake] fix vendor hash (#2548)
mikeland73 Mar 4, 2025
bf8a232
[deps] Fix a few more dependabot issues (#2552)
mikeland73 Mar 5, 2025
bb292b1
Disable PreRunE check for Nix when passing no-install flag on update …
burritobill Mar 7, 2025
851b5c6
[deps] Bump docs deps (#2551)
mikeland73 Mar 7, 2025
7a30512
Bump django from 4.2.18 to 4.2.20 in /examples/stacks/django (#2553)
dependabot[bot] Mar 7, 2025
9b141df
Merge branch 'main' into fix-2524
Lagoja Mar 11, 2025
fe91797
tidy lockfile
Lagoja Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions plugins/mariadb/flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@
postBuild = ''

wrapProgram $out/bin/mysqld \
--add-flags '--datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';
--add-flags '--basedir=$out --datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';

wrapProgram $out/bin/mariadbd \
--add-flags '--datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';
--add-flags '--basedir=$out --datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';

wrapProgram $out/bin/mysqld_safe \
--add-flags '--datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';
--add-flags '--basedir=$out --datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';

if [-f $out/bin/mariadbd-safe]; then
wrapProgram $out/bin/mariadbd_safe \
--add-flags '--datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';
--add-flags '--basedir=$out --datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';
fi

wrapProgram "$out/bin/mysql_install_db" \
--add-flags '--datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --basedir=''$MYSQL_BASEDIR';
--add-flags '--basedir=$out --datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --basedir=''$MYSQL_BASEDIR';

if [-f $out/bin/mariadb-install-db]; then
wrapProgram "$out/bin/mariadb_install_db" \
--add-flags '--datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --basedir=''$MYSQL_BASEDIR';
--add-flags '--basedir=$out --datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --basedir=''$MYSQL_BASEDIR';
fi
'';
};
Expand Down
4 changes: 2 additions & 2 deletions plugins/mysql/flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
postBuild = ''

wrapProgram $out/bin/mysqld \
--add-flags '--datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';
--add-flags '--basedir=$out --datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';

wrapProgram $out/bin/mysqld_safe \
--add-flags '--datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';
--add-flags '--basedir=$out --datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';
'';
};
in{
Expand Down
Loading