about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2018-10-18 14:52:29 +0100
committerAlyssa Ross <hi@alyssa.is>2018-10-30 14:33:35 +0000
commit91c746cacc3db360f960132ffda7fe1351a3b33d (patch)
tree501a8d031ac5d737e412dc9e725c98f15a02d3b9
parentc6c7d55790b603db68ee43a55c20e503281eeda4 (diff)
downloadnixlib-91c746cacc3db360f960132ffda7fe1351a3b33d.tar
nixlib-91c746cacc3db360f960132ffda7fe1351a3b33d.tar.gz
nixlib-91c746cacc3db360f960132ffda7fe1351a3b33d.tar.bz2
nixlib-91c746cacc3db360f960132ffda7fe1351a3b33d.tar.lz
nixlib-91c746cacc3db360f960132ffda7fe1351a3b33d.tar.xz
nixlib-91c746cacc3db360f960132ffda7fe1351a3b33d.tar.zst
nixlib-91c746cacc3db360f960132ffda7fe1351a3b33d.zip
postgresql_11: init at 11.0
-rw-r--r--nixos/tests/postgis.nix2
-rw-r--r--pkgs/servers/sql/postgresql/default.nix6
-rw-r--r--pkgs/top-level/all-packages.nix3
3 files changed, 9 insertions, 2 deletions
diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix
index 2a9b477bf237..49be0672a8e5 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.postgresql_10; in {
+        services.postgresql = let mypg = pkgs.postgresql_11; 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 423583bfe87e..b81b4340d767 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -129,4 +129,10 @@ in {
     sha256 = "04a07jkvc5s6zgh6jr78149kcjmsxclizsqabjw44ld4j5n633kc";
   };
 
+  postgresql_11 = common {
+    version = "11.0";
+    psqlSchema = "11.0";
+    sha256 = "0szk9ssfych1wlpyqxz3z6dllg1l6m5labpii8c2r463s01vm6xz";
+  };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a282be8e614a..e2593b6394bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13610,7 +13610,8 @@ with pkgs;
     postgresql_9_4
     postgresql_9_5
     postgresql_9_6
-    postgresql_10;
+    postgresql_10
+    postgresql_11;
 
   postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };