From 72300eb8116c960935a462564d96db6fac355bca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 25 Mar 2020 11:57:48 +0100 Subject: Upgrade nixos --- overlays/databases/mysql/default.nix | 6 ++++++ overlays/databases/postgresql/default.nix | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'overlays/databases') diff --git a/overlays/databases/mysql/default.nix b/overlays/databases/mysql/default.nix index 5e402841..797332bb 100644 --- a/overlays/databases/mysql/default.nix +++ b/overlays/databases/mysql/default.nix @@ -3,6 +3,12 @@ self: super: rec { mariadbPAM = super.mariadb.overrideAttrs(old: { cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ]; buildInputs = old.buildInputs ++ [ self.pam ]; + postInstall = old.postInstall + '' + # FIXME: hack because mariadb cannot find dialog.so + # fixed in 20.03: https://github.com/NixOS/nixpkgs/pull/80768 + ln -s /nix $out/nix + cp "$dev"/lib/mysql/plugin/{caching_sha2_password.so,dialog.so,mysql_clear_password.so,sha256_password.so} "$out"/lib/mysql/plugin + ''; }) // (with super.mariadb; { inherit client; servier = super.mariadb; diff --git a/overlays/databases/postgresql/default.nix b/overlays/databases/postgresql/default.nix index 8d1405e3..ae589877 100644 --- a/overlays/databases/postgresql/default.nix +++ b/overlays/databases/postgresql/default.nix @@ -4,8 +4,5 @@ self: super: rec { passthru = old.passthru // { psqlSchema = "11.0"; }; configureFlags = old.configureFlags ++ [ "--with-pam" ]; buildInputs = (old.buildInputs or []) ++ [ self.pam ]; - patches = old.patches ++ [ - ./postgresql_run_socket_path.patch - ]; }); } -- cgit v1.2.3