Upgrade mysql and postgresql

4 files changed, 49 insertions, 36 deletions

diff --git a/nixops/modules/buildbot/default.nix b/nixops/modules/buildbot/default.nix
index 9b661f1..3962e65 100644
--- a/nixops/modules/buildbot/default.nix
+++ b/nixops/modules/buildbot/default.nix
@@ -1,21 +1,23 @@
 { lib, pkgs, pkgsNext, config, myconfig, mylibs, ... }:
 let
+  pkgs = pkgsNext.appendOverlays config.nixpkgs.overlays;
+
   varDir = "/var/lib/buildbot";
   buildslist_src = mylibs.fetchedGitPrivate ./buildslist.json;
-  buildslist_yarn = pkgsNext.yarn2nix.mkYarnModules {
+  buildslist_yarn = pkgs.yarn2nix.mkYarnModules {
     name = "buildslist-yarn-modules";
     packageJSON = "${buildslist_src.src}/package.json";
     yarnLock = "${buildslist_src.src}/yarn.lock";
   };
-  buildslist_bower = pkgsNext.buildBowerComponents {
+  buildslist_bower = pkgs.buildBowerComponents {
     name = "buildslist";
     generated = ./bower.nix;
     src = "${buildslist_src.src}/guanlecoja/";
   };
 
-  buildslist = pkgsNext.python3Packages.buildPythonPackage rec {
+  buildslist = pkgs.python3Packages.buildPythonPackage rec {
     pname = "buildbot-buildslist";
-    inherit (pkgsNext.buildbot-pkg) version;
+    inherit (pkgs.buildbot-pkg) version;
 
     preConfigure = ''
       export HOME=$PWD
@@ -24,26 +26,26 @@ let
       cp -a ${buildslist_bower}/bower_components ./libs
       chmod -R u+w libs
       '';
-    propagatedBuildInputs = with pkgsNext.python3Packages; [
+    propagatedBuildInputs = with pkgs.python3Packages; [
       (klein.overridePythonAttrs(old: { checkPhase = ""; }))
       buildbot-pkg
     ];
-    nativeBuildInputs = with pkgsNext; [ yarn nodejs ];
+    nativeBuildInputs = with pkgs; [ yarn nodejs ];
     buildInputs = [ buildslist_yarn buildslist_bower ];
 
     doCheck = false;
     src = buildslist_src.src;
   };
-  buildbot_common = pkgsNext.python3Packages.buildPythonPackage rec {
+  buildbot_common = pkgs.python3Packages.buildPythonPackage rec {
     name = "buildbot_common";
     src = ./common;
     format = "other";
     installPhase = ''
-      mkdir -p $out/${pkgsNext.python3.pythonForBuild.sitePackages}
-      cp -a $src $out/${pkgsNext.python3.pythonForBuild.sitePackages}/buildbot_common
+      mkdir -p $out/${pkgs.python3.pythonForBuild.sitePackages}
+      cp -a $src $out/${pkgs.python3.pythonForBuild.sitePackages}/buildbot_common
       '';
   };
-  buildbot = pkgsNext.python3Packages.buildbot-full.withPlugins ([ buildslist ]);
+  buildbot = pkgs.python3Packages.buildbot-full.withPlugins ([ buildslist ]);
 in
 {
   options = {
@@ -90,7 +92,7 @@ in
     system.activationScripts = lib.attrsets.mapAttrs' (k: project: lib.attrsets.nameValuePair "buildbot-${project.name}" {
       deps = [ "users" "wrappers" ];
       text = let
-        master-cfg = "${buildbot_common}/${pkgsNext.python3.pythonForBuild.sitePackages}/buildbot_common/master.cfg";
+        master-cfg = "${buildbot_common}/${pkgs.python3.pythonForBuild.sitePackages}/buildbot_common/master.cfg";
         buildbot_key = pkgs.writeText "buildbot_key" (builtins.readFile "${myconfig.privateFiles}/buildbot_ssh_key");
         tac_file = pkgs.writeText "buildbot.tac" ''
             import os
@@ -151,24 +153,24 @@ in
       description = "Buildbot Continuous Integration Server ${project.name}.";
       after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
-      path = project.packages pkgs ++ (project.pythonPackages buildbot.pythonModule pkgsNext);
+      path = project.packages pkgs ++ (project.pythonPackages buildbot.pythonModule pkgs);
       environment = let
         project_env = lib.attrsets.mapAttrs' (k: v: lib.attrsets.nameValuePair "BUILDBOT_${k}" v) project.environment;
-        buildbot_config = pkgsNext.python3Packages.buildPythonPackage (rec {
+        buildbot_config = pkgs.python3Packages.buildPythonPackage (rec {
           name = "buildbot_config-${project.name}";
           src = ./projects + "/${project.name}";
           format = "other";
           installPhase = ''
-            mkdir -p $out/${pkgsNext.python3.pythonForBuild.sitePackages}
-            cp -a $src $out/${pkgsNext.python3.pythonForBuild.sitePackages}/buildbot_config
+            mkdir -p $out/${pkgs.python3.pythonForBuild.sitePackages}
+            cp -a $src $out/${pkgs.python3.pythonForBuild.sitePackages}/buildbot_config
             '';
         });
         HOME = "${varDir}/${project.name}";
-        PYTHONPATH = "${buildbot.pythonModule.withPackages (self: project.pythonPackages self pkgsNext ++ [
-          pkgsNext.python3Packages.treq pkgsNext.python3Packages.ldap3 buildbot
-          pkgsNext.python3Packages.buildbot-worker
+        PYTHONPATH = "${buildbot.pythonModule.withPackages (self: project.pythonPackages self pkgs ++ [
+          pkgs.python3Packages.treq pkgs.python3Packages.ldap3 buildbot
+          pkgs.python3Packages.buildbot-worker
           buildbot_common buildbot_config
-        ])}/${buildbot.pythonModule.sitePackages}${if project.pythonPathHome then ":${varDir}/${project.name}/.local/${pkgsNext.python3.pythonForBuild.sitePackages}" else ""}";
+        ])}/${buildbot.pythonModule.sitePackages}${if project.pythonPathHome then ":${varDir}/${project.name}/.local/${pkgs.python3.pythonForBuild.sitePackages}" else ""}";
       in project_env // { inherit PYTHONPATH HOME; };
 
       serviceConfig = {
diff --git a/nixops/modules/databases/mysql.nix b/nixops/modules/databases/mysql.nix
index 635f212..39d25d3 100644
--- a/nixops/modules/databases/mysql.nix
+++ b/nixops/modules/databases/mysql.nix
@@ -1,5 +1,6 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, pkgsNext, config, myconfig, mylibs, ... }:
 let
+    pkgs = pkgsNext.appendOverlays config.nixpkgs.overlays;
     cfg = config.services.myDatabases;
 in {
   options.services.myDatabases = {
diff --git a/nixops/modules/databases/postgresql.nix b/nixops/modules/databases/postgresql.nix
index f839d63..7046b45 100644
--- a/nixops/modules/databases/postgresql.nix
+++ b/nixops/modules/databases/postgresql.nix
@@ -1,5 +1,6 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, pkgsNext, config, myconfig, mylibs, ... }:
 let
+    pkgs = pkgsNext.appendOverlays config.nixpkgs.overlays;
     cfg = config.services.myDatabases;
 in {
   options.services.myDatabases = {
@@ -15,20 +16,29 @@ in {
 
   config = lib.mkIf cfg.enable {
     nixpkgs.overlays = [ (self: super: rec {
-      postgresql = postgresql111;
-      postgresql111 = super.postgresql100.overrideAttrs(old: rec {
-        passthru = old.passthru // { psqlSchema = "11.0"; };
-        name = "postgresql-11.1";
-        src = self.fetchurl {
-          url = "mirror://postgresql/source/v11.1/${name}.tar.bz2";
-          sha256 = "026v0sicsh7avzi45waf8shcbhivyxmi7qgn9fd1x0vl520mx0ch";
-        };
-        configureFlags = old.configureFlags ++ [ "--with-pam" ];
-        buildInputs = (old.buildInputs or []) ++ [ self.pam ];
-        patches = old.patches ++ [
-          ./postgresql_run_socket_path.patch
-        ];
-      });
+      postgresql = postgresql_11;
+      postgresql_11 = if builtins.hasAttr "postgresql_11" super
+        then super.postgresql_11.overrideAttrs(old: 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
+          ];
+        })
+        else super.postgresql100.overrideAttrs(old: rec {
+          passthru = old.passthru // { psqlSchema = "11.0"; };
+          name = "postgresql-11.1";
+          src = self.fetchurl {
+            url = "mirror://postgresql/source/v11.1/${name}.tar.bz2";
+            sha256 = "026v0sicsh7avzi45waf8shcbhivyxmi7qgn9fd1x0vl520mx0ch";
+          };
+          configureFlags = old.configureFlags ++ [ "--with-pam" ];
+          buildInputs = (old.buildInputs or []) ++ [ self.pam ];
+          patches = old.patches ++ [
+            ./postgresql_run_socket_path.patch
+          ];
+        });
     }) ];
 
     networking.firewall.allowedTCPPorts = [ 5432 ];
diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap
index f61bdf4..4cf714c 100755
--- a/nixops/scripts/nixops_wrap
+++ b/nixops/scripts/nixops_wrap
@@ -28,7 +28,7 @@ for file in $files; do
 done
 nixops set-args --argstr privateFiles "$TEMP"
 
-nixpkgsNext="https://releases.nixos.org/nixos/19.03/nixos-19.03beta171477.5847485e3ec/nixexprs.tar.xz"
+nixpkgsNext="https://releases.nixos.org/nixos/19.03/nixos-19.03beta171832.ff9c3f0f26d/nixexprs.tar.xz"
 nixpkgs="https://releases.nixos.org/nixos/18.09/nixos-18.09.1834.9d608a6f592/nixexprs.tar.xz"
 export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$nixpkgs:nixpkgsNext=$nixpkgsNext"
 nixops "$@"