Skip to content
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: 10.5.8 -> 10.5.10 #122132

Merged
merged 2 commits into from May 9, 2021
Merged

mariadb: 10.5.8 -> 10.5.10 #122132

merged 2 commits into from May 9, 2021

Conversation

ajs124
Copy link
Member

@ajs124 ajs124 commented May 8, 2021

Motivation for this change

Supersedes #113971

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change:
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

- switch from scons to cmake, because scons was deprecated upstream
  and this allows us to simplify the derivation significantly

- add myself as maintainer
@ajs124 ajs124 marked this pull request as ready for review May 8, 2021 00:50
@ajs124
Copy link
Member Author

ajs124 commented May 8, 2021

Maybe this should be put into two PRs

@ajs124 ajs124 merged commit e33448a into NixOS:master May 9, 2021
@ajs124 ajs124 deleted the upd/mariadb branch May 9, 2021 12:38
@Izorkin
Copy link
Contributor

Izorkin commented May 9, 2021

@ajs124 check this small fix:

diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix
index 165b9216240..2b387db66cd 100644
--- a/pkgs/servers/sql/mariadb/galera/default.nix
+++ b/pkgs/servers/sql/mariadb/galera/default.nix
@@ -2,13 +2,7 @@
 , asio, boost, check, openssl, cmake
 }:

-let
-  galeraLibs = buildEnv {
-    name = "galera-lib-inputs-united";
-    paths = [ openssl.out boost check ];
-  };
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "mariadb-galera";
   version = "26.4.8";

@@ -29,7 +23,8 @@ in stdenv.mkDerivation rec {

   postInstall = ''
     # for backwards compatibility
-    ln -s . $out/lib/galera
+    mkdir $out/lib/galera
+    ln -s $out/lib/libgalera_smm.so $out/lib/galera/libgalera_smm.so
   '';

   meta = with lib; {

@ajs124
Copy link
Member Author

ajs124 commented May 9, 2021

Removing the let is definitely fine, but what's the upside to linking the library instead of just linking the folder?
Except for not creating a symlink loop, I guess.

@ajs124 ajs124 mentioned this pull request May 9, 2021
10 tasks
@Izorkin
Copy link
Contributor

Izorkin commented May 9, 2021

Yes, needed remove symlink loop.

l ./result/lib/galera/
того 1,8M
dr-xr-xr-x 2 root root    4 янв  1  1970 .
dr-xr-xr-x 5 root root    5 янв  1  1970 ..
lrwxrwxrwx 1 root root    1 янв  1  1970 galera -> .
-r-xr-xr-x 1 root root 3,0M янв  1  1970 libgalera_smm.so

after patch:

l ./result/lib/galera
итого 1,5K
dr-xr-xr-x 2 root root  3 янв  1  1970 .
dr-xr-xr-x 3 root root  4 янв  1  1970 ..
lrwxrwxrwx 1 root root 19 янв  1  1970 libgalera_smm.so -> ../libgalera_smm.so

@ajs124
Copy link
Member Author

ajs124 commented May 9, 2021

Sure, but it works just as well with the loop, doesn't it? If you want me to remove it, I can.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants