diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 16 |
2 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index eb4f891b45a0..c0d322b89d88 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -225,7 +225,11 @@ mapAliases ({ piwik = matomo; # added 2018-01-16 pltScheme = racket; # just to be sure poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 - postgresql100 = throw "deprecated 2018-10-21: use postgresql10 instead"; + postgresql93 = postgresql_9_3; + postgresql94 = postgresql_9_4; + postgresql95 = postgresql_9_5; + postgresql96 = postgresql_9_6; + postgresql100 = throw "deprecated 2018-10-21: use postgresql_10 instead"; procps-ng = procps; # added 2018-06-08 prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27 pulseaudioLight = pulseaudio; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 502f7907b1a7..a282be8e614a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13595,22 +13595,22 @@ with pkgs; pgbouncer = callPackage ../servers/sql/pgbouncer { }; - pgpool93 = pgpool.override { postgresql = postgresql93; }; - pgpool94 = pgpool.override { postgresql = postgresql94; }; + pgpool93 = pgpool.override { postgresql = postgresql_9_3; }; + pgpool94 = pgpool.override { postgresql = postgresql_9_4; }; pgpool = callPackage ../servers/sql/pgpool { pam = if stdenv.isLinux then pam else null; libmemcached = null; # Detection is broken upstream }; - postgresql = postgresql96; + postgresql = postgresql_9_6; inherit (callPackages ../servers/sql/postgresql { }) - postgresql93 - postgresql94 - postgresql95 - postgresql96 - postgresql10; + postgresql_9_3 + postgresql_9_4 + postgresql_9_5 + postgresql_9_6 + postgresql_10; postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; |