From 91493dc0e93b89a24617738ca466e12957143eb0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Fri, 4 Jan 2019 09:40:30 +0100 Subject: [PATCH] Override database packages globally --- virtual/eldiron.nix | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix index 49d4264..30face7 100644 --- a/virtual/eldiron.nix +++ b/virtual/eldiron.nix @@ -9,6 +9,25 @@ mylibs = import ../libs.nix; in { + # FIXME: they are not overriden in packages.nix + # (see nix-store -q --tree /nix/var/nix/profiles/system) + nixpkgs.config.packageOverrides = oldpkgs: rec { + postgresql = postgresql111; + postgresql111 = oldpkgs.postgresql100.overrideAttrs(old: rec { + passthru = old.passthru // { psqlSchema = "11.0"; }; + name = "postgresql-11.1"; + src = pkgs.fetchurl { + url = "mirror://postgresql/source/v11.1/${name}.tar.bz2"; + sha256 = "026v0sicsh7avzi45waf8shcbhivyxmi7qgn9fd1x0vl520mx0ch"; + }; + }); + mariadb = mariadbPAM; + mariadbPAM = oldpkgs.mariadb.overrideAttrs(old: rec { + cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ]; + buildInputs = old.buildInputs ++ [ pkgs.pam ]; + }); + }; + networking = { firewall = { enable = true; @@ -388,10 +407,7 @@ # FIXME: ssl services.mysql = rec { enable = true; - package = pkgs.mariadb.overrideAttrs(old: rec { - cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ]; - buildInputs = old.buildInputs ++ [ pkgs.pam ]; - }); + package = pkgs.mariadb; }; # FIXME: initial sync @@ -399,14 +415,7 @@ # FIXME: ssl services.postgresql = rec { enable = true; - package = pkgs.postgresql100.overrideAttrs(old: rec { - passthru = old.passthru // { psqlSchema = "11.0"; }; - name = "postgresql-11.1"; - src = pkgs.fetchurl { - url = "mirror://postgresql/source/v11.1/${name}.tar.bz2"; - sha256 = "026v0sicsh7avzi45waf8shcbhivyxmi7qgn9fd1x0vl520mx0ch"; - }; - }); + package = pkgs.postgresql; enableTCPIP = true; extraConfig = '' max_connections = 100 -- 2.41.0