Upgrade to latest nixpkgs

2 files changed, 10 insertions, 26 deletions

diff --git a/nixops/modules/databases/mysql.nix b/nixops/modules/databases/mysql.nix
index 39d25d3..635f212 100644
--- a/nixops/modules/databases/mysql.nix
+++ b/nixops/modules/databases/mysql.nix
@@ -1,6 +1,5 @@
-{ lib, pkgs, pkgsNext, config, myconfig, mylibs, ... }:
+{ lib, pkgs, 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 7046b45..673ced8 100644
--- a/nixops/modules/databases/postgresql.nix
+++ b/nixops/modules/databases/postgresql.nix
@@ -1,6 +1,5 @@
-{ lib, pkgs, pkgsNext, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig, mylibs, ... }:
 let
-    pkgs = pkgsNext.appendOverlays config.nixpkgs.overlays;
     cfg = config.services.myDatabases;
 in {
   options.services.myDatabases = {
@@ -17,28 +16,14 @@ in {
   config = lib.mkIf cfg.enable {
     nixpkgs.overlays = [ (self: super: rec {
       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
-          ];
-        });
+      postgresql_11 = 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
+        ];
+      });
     }) ];
 
     networking.firewall.allowedTCPPorts = [ 5432 ];