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.
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
mariadb: don't move pam files on Darwin #90139
Conversation
@GrahamcOfBorg build mariadb |
pkgs/servers/sql/mariadb/default.nix
Outdated
@@ -201,12 +201,12 @@ server = stdenv.mkDerivation (common // { | |||
chmod +x "$out"/bin/wsrep_sst_common | |||
rm "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest} | |||
rm -r "$out"/data # Don't need testing data | |||
mv "$out"/OFF/suite/plugins/pam/pam_mariadb_mtr.so "$out"/share/pam/lib/security | |||
mv "$out"/OFF/suite/plugins/pam/mariadb_mtr "$out"/share/pam/etc/security | |||
rm -r "$out"/OFF |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The "$out"/OFF
directory is removed here, before the plugins are moved from it.
Please check with this patch:
|
a119d70
to
6ccf1f2
Compare
👍 |
'' + optionalString withStorageMroonga '' | ||
mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql | ||
'' + optionalString (!stdenv.hostPlatform.isDarwin) '' | ||
mv "$out"/OFF/suite/plugins/pam/pam_mariadb_mtr.so "$out"/share/pam/lib/security | ||
mv "$out"/OFF/suite/plugins/pam/mariadb_mtr "$out"/share/pam/etc/security | ||
rm -r "$out"/OFF |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't expect we want to keep "$out"/OFF
on Darwin, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds right to me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It doesn't actually seem to be created on darwin, so the build now fails because we try to remove it:
-- Installing: /nix/store/2f7mg8dm4xh7hk2vvvdadia7gwaa785f-mariadb-server-10.4.13/share/doc/mysql/policy/apparmor/usr.sbin.mysqld.local
-- Installing: /nix/store/2f7mg8dm4xh7hk2vvvdadia7gwaa785f-mariadb-server-10.4.13/share/doc/mysql/policy/selinux
-- Installing: /nix/store/2f7mg8dm4xh7hk2vvvdadia7gwaa785f-mariadb-server-10.4.13/share/doc/mysql/policy/selinux/README
-- Installing: /nix/store/2f7mg8dm4xh7hk2vvvdadia7gwaa785f-mariadb-server-10.4.13/share/doc/mysql/policy/selinux/mariadb-server.te
-- Installing: /nix/store/2f7mg8dm4xh7hk2vvvdadia7gwaa785f-mariadb-server-10.4.13/share/doc/mysql/policy/selinux/mariadb-server.fc
-- Installing: /nix/store/2f7mg8dm4xh7hk2vvvdadia7gwaa785f-mariadb-server-10.4.13/share/doc/mysql/policy/selinux/mariadb.te
-- Installing: /nix/store/2f7mg8dm4xh7hk2vvvdadia7gwaa785f-mariadb-server-10.4.13/lib/pkgconfig/mariadb.pc
-- Installing: /nix/store/2f7mg8dm4xh7hk2vvvdadia7gwaa785f-mariadb-server-10.4.13/share/aclocal/mysql.m4
-- Installing: /nix/store/2f7mg8dm4xh7hk2vvvdadia7gwaa785f-mariadb-server-10.4.13/share/doc/mysql/mysql.server
rm: cannot remove '/nix/store/2f7mg8dm4xh7hk2vvvdadia7gwaa785f-mariadb-server-10.4.13/OFF': No such file or directory
cannot build derivation '/nix/store/zap5nxyb8kkdldla5hi9hyb4hn15f2gj-diesel-cli-1.4.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/7jxmgixk4ax0jm07hvaqsb2r25fbd7sj-env.drv': 2 dependencies couldn't be built
[0 built (1 failed), 202 copied (2112.6 MiB), 572.0 MiB DL]
error: build of '/nix/store/7jxmgixk4ax0jm07hvaqsb2r25fbd7sj-env.drv' failed
https://github.com/NixOS/nixpkgs/pull/90139
2 packages failed to build:
diesel-cli mysql
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, ofborg seems to fail to build Darwin PRs so thanks 👍.
6ccf1f2
to
56bb86f
Compare
Now at least the x86_64 linux have passed, but there's an error for aarch64 Linux though it doesn't seem related... The Darwin build seems to hang now for too long, so let's: @GrahamcOfBorg build mariadb |
56bb86f
to
1f13d65
Compare
The build now succeeds on darwin 👍 |
Thanks! |
Motivation for this change
Fix #90134 ?
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)