public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

postgresql*: use underscores in version numbers

Browse Source
This commit is contained in:
Alyssa Ross
2018-10-23 17:22:14 +01:00
parent 94360c11e9
commit c6c7d55790
11 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/postgis/default.nix
View File

@@ -16,7 +16,7 @@
### NixOS - usage:
==================
services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }) ];
services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql_9_5; }) ];
### important Postgis implementation details:

10
pkgs/servers/sql/postgresql/default.nix
View File

@@ -99,31 +99,31 @@ let
in {
postgresql93 = common {
postgresql_9_3 = common {
version = "9.3.24";
psqlSchema = "9.3";
sha256 = "1a8dnv16n2rxnbwhqw7c0kjpj3xqvkpwk50kvimj4d917cxaf542";
};
postgresql94 = common {
postgresql_9_4 = common {
version = "9.4.19";
psqlSchema = "9.4";
sha256 = "12qn9h47rkn4k41gdbxkkvg0pff43k1113jmhc83f19adc1nnxq3";
};
postgresql95 = common {
postgresql_9_5 = common {
version = "9.5.14";
psqlSchema = "9.5";
sha256 = "0k8s62h6qd9p3xlx315j5irniskqsnx1nz4ir5r1yhqp07mdab1y";
};
postgresql96 = common {
postgresql_9_6 = common {
version = "9.6.10";
psqlSchema = "9.6";
sha256 = "09l4zqs74fqnazdsyln9x657mq3wsbgng9wpvq71yh26cv2sq5c6";
};
postgresql10 = common {
postgresql_10 = common {
version = "10.5";
psqlSchema = "10.0";
sha256 = "04a07jkvc5s6zgh6jr78149kcjmsxclizsqabjw44ld4j5n633kc";

6
pkgs/top-level/aliases.nix
View File

@@ -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

16
pkgs/top-level/all-packages.nix
View File

@@ -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 { };