From c6c7d55790b603db68ee43a55c20e503281eeda4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 23 Oct 2018 17:22:14 +0100 Subject: postgresql*: use underscores in version numbers --- .../doc/manual/administration/declarative-containers.xml | 2 +- nixos/doc/manual/configuration/config-file.xml | 2 +- nixos/modules/services/databases/postgresql.nix | 10 +++++----- nixos/modules/services/databases/postgresql.xml | 8 ++++---- nixos/modules/virtualisation/containers.nix | 2 +- nixos/release.nix | 2 +- nixos/tests/postgis.nix | 2 +- pkgs/development/libraries/postgis/default.nix | 2 +- pkgs/servers/sql/postgresql/default.nix | 10 +++++----- pkgs/top-level/aliases.nix | 6 +++++- pkgs/top-level/all-packages.nix | 16 ++++++++-------- 11 files changed, 33 insertions(+), 29 deletions(-) diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml index 2a98fb1262310..d03dbc4d70556 100644 --- a/nixos/doc/manual/administration/declarative-containers.xml +++ b/nixos/doc/manual/administration/declarative-containers.xml @@ -15,7 +15,7 @@ containers.database = { config = { config, pkgs, ... }: { = true; - = pkgs.postgresql96; + = pkgs.postgresql_9_6; }; }; diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml index 2c9d421517386..c77cfe137baa2 100644 --- a/nixos/doc/manual/configuration/config-file.xml +++ b/nixos/doc/manual/configuration/config-file.xml @@ -197,7 +197,7 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; pkgs.emacs ]; - = pkgs.postgresql10; + = pkgs.postgresql_10; The latter option definition changes the default PostgreSQL package used by NixOS’s PostgreSQL service to 10.x. For more information on packages, diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index de2a757196a5d..6edb1503c233a 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -55,7 +55,7 @@ in package = mkOption { type = types.package; - example = literalExample "pkgs.postgresql96"; + example = literalExample "pkgs.postgresql_9_6"; description = '' PostgreSQL package to use. ''; @@ -118,7 +118,7 @@ in extraPlugins = mkOption { type = types.listOf types.path; default = []; - example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }) ]"; + example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql_9_4; }) ]"; description = '' When this list contains elements a new store path is created. PostgreSQL and the elements are symlinked into it. Then pg_config, @@ -167,9 +167,9 @@ in # Note: when changing the default, make it conditional on # ‘system.stateVersion’ to maintain compatibility with existing # systems! - mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql96 - else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql95 - else pkgs.postgresql94); + mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6 + else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql_9_5 + else pkgs.postgresql_9_4); services.postgresql.dataDir = mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}" diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml index f89f0d6531643..14f4d4909bc0c 100644 --- a/nixos/modules/services/databases/postgresql.xml +++ b/nixos/modules/services/databases/postgresql.xml @@ -27,12 +27,12 @@ configuration.nix: = true; - = pkgs.postgresql94; + = pkgs.postgresql_9_4; Note that you are required to specify the desired version of PostgreSQL - (e.g. pkgs.postgresql94). Since upgrading your PostgreSQL - version requires a database dump and reload (see below), NixOS cannot - provide a default value for + (e.g. pkgs.postgresql_9_4). Since upgrading your + PostgreSQL version requires a database dump and reload (see below), NixOS + cannot provide a default value for such as the most recent release of PostgreSQL. diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 8fe59badd335e..572092a2ba945 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -606,7 +606,7 @@ in { config = { config, pkgs, ... }: { services.postgresql.enable = true; - services.postgresql.package = pkgs.postgresql96; + services.postgresql.package = pkgs.postgresql_9_6; system.stateVersion = "17.03"; }; diff --git a/nixos/release.nix b/nixos/release.nix index 46dbe4aa77b27..51505d6aab9d1 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -468,7 +468,7 @@ in rec { { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; services.postgresql.enable = true; - services.postgresql.package = pkgs.postgresql93; + services.postgresql.package = pkgs.postgresql_9_3; environment.systemPackages = [ pkgs.php ]; }); }; diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index 0ff880e7aa527..2a9b477bf2378 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ...} : { { pkgs, ... }: { - services.postgresql = let mypg = pkgs.postgresql10; in { + services.postgresql = let mypg = pkgs.postgresql_10; in { enable = true; package = mypg; extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }) ]; diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index 04fdeea1fa0b3..37cf29c865819 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -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: diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 6ca1724042032..423583bfe87e0 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -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"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index eb4f891b45a04..c0d322b89d883 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 502f7907b1a7d..a282be8e614a0 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 { }; -- cgit 1.4.1