diff options
| author | Alyssa Ross <hi@alyssa.is> | 2018-10-23 16:09:43 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2018-10-30 12:40:20 +0000 |
| commit | 9594b59f1320aa05200bfbec9a425d22408eb488 (patch) | |
| tree | 6a41a5e42be7f4534ef0ca35e8b61c40b5490e71 | |
| parent | 2380f6a4faa57c6b91fed26c496e1c8ca5d91982 (diff) | |
| download | nixpkgs-9594b59f1320aa05200bfbec9a425d22408eb488.tar nixpkgs-9594b59f1320aa05200bfbec9a425d22408eb488.tar.gz nixpkgs-9594b59f1320aa05200bfbec9a425d22408eb488.tar.bz2 nixpkgs-9594b59f1320aa05200bfbec9a425d22408eb488.tar.lz nixpkgs-9594b59f1320aa05200bfbec9a425d22408eb488.tar.xz nixpkgs-9594b59f1320aa05200bfbec9a425d22408eb488.tar.zst nixpkgs-9594b59f1320aa05200bfbec9a425d22408eb488.zip | |
postgresql10: rename from postgresql100
| -rw-r--r-- | nixos/tests/postgis.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index f8b63c5b6a2..0ff880e7aa5 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.postgresql100; in { + services.postgresql = let mypg = pkgs.postgresql10; in { enable = true; package = mypg; extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }) ]; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index bccd54ca4ba..6ca17240420 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -123,7 +123,7 @@ in { sha256 = "09l4zqs74fqnazdsyln9x657mq3wsbgng9wpvq71yh26cv2sq5c6"; }; - postgresql100 = common { + postgresql10 = common { version = "10.5"; psqlSchema = "10.0"; sha256 = "04a07jkvc5s6zgh6jr78149kcjmsxclizsqabjw44ld4j5n633kc"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8cd54c3a5bd..eb4f891b45a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -225,6 +225,7 @@ 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"; 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 130a3495c6d..502f7907b1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13610,7 +13610,7 @@ with pkgs; postgresql94 postgresql95 postgresql96 - postgresql100; + postgresql10; postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; |