aboutsummaryrefslogtreecommitdiff
path: root/virtual
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-01-04 09:40:30 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-01-04 09:40:30 +0100
commit91493dc0e93b89a24617738ca466e12957143eb0 (patch)
tree6900dfd42e48fd172ace064a8a268dc41a25561e /virtual
parent1b81e0797b39423b565b540c26b24ca1e8c861c5 (diff)
downloadNix-91493dc0e93b89a24617738ca466e12957143eb0.tar.gz
Nix-91493dc0e93b89a24617738ca466e12957143eb0.tar.zst
Nix-91493dc0e93b89a24617738ca466e12957143eb0.zip
Override database packages globally
Diffstat (limited to 'virtual')
-rw-r--r--virtual/eldiron.nix33
1 files 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 @@
9 mylibs = import ../libs.nix; 9 mylibs = import ../libs.nix;
10 in 10 in
11 { 11 {
12 # FIXME: they are not overriden in packages.nix
13 # (see nix-store -q --tree /nix/var/nix/profiles/system)
14 nixpkgs.config.packageOverrides = oldpkgs: rec {
15 postgresql = postgresql111;
16 postgresql111 = oldpkgs.postgresql100.overrideAttrs(old: rec {
17 passthru = old.passthru // { psqlSchema = "11.0"; };
18 name = "postgresql-11.1";
19 src = pkgs.fetchurl {
20 url = "mirror://postgresql/source/v11.1/${name}.tar.bz2";
21 sha256 = "026v0sicsh7avzi45waf8shcbhivyxmi7qgn9fd1x0vl520mx0ch";
22 };
23 });
24 mariadb = mariadbPAM;
25 mariadbPAM = oldpkgs.mariadb.overrideAttrs(old: rec {
26 cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ];
27 buildInputs = old.buildInputs ++ [ pkgs.pam ];
28 });
29 };
30
12 networking = { 31 networking = {
13 firewall = { 32 firewall = {
14 enable = true; 33 enable = true;
@@ -388,10 +407,7 @@
388 # FIXME: ssl 407 # FIXME: ssl
389 services.mysql = rec { 408 services.mysql = rec {
390 enable = true; 409 enable = true;
391 package = pkgs.mariadb.overrideAttrs(old: rec { 410 package = pkgs.mariadb;
392 cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ];
393 buildInputs = old.buildInputs ++ [ pkgs.pam ];
394 });
395 }; 411 };
396 412
397 # FIXME: initial sync 413 # FIXME: initial sync
@@ -399,14 +415,7 @@
399 # FIXME: ssl 415 # FIXME: ssl
400 services.postgresql = rec { 416 services.postgresql = rec {
401 enable = true; 417 enable = true;
402 package = pkgs.postgresql100.overrideAttrs(old: rec { 418 package = pkgs.postgresql;
403 passthru = old.passthru // { psqlSchema = "11.0"; };
404 name = "postgresql-11.1";
405 src = pkgs.fetchurl {
406 url = "mirror://postgresql/source/v11.1/${name}.tar.bz2";
407 sha256 = "026v0sicsh7avzi45waf8shcbhivyxmi7qgn9fd1x0vl520mx0ch";
408 };
409 });
410 enableTCPIP = true; 419 enableTCPIP = true;
411 extraConfig = '' 420 extraConfig = ''
412 max_connections = 100 421 max_connections = 100