summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorDanylo Hlynskyi <abcz2.uprola@gmail.com>2019-01-26 21:15:43 +0200
committerGitHub <noreply@github.com>2019-01-26 21:15:43 +0200
commit4fb8bc8238aa0366d78bae6095676ef7e08c17b2 (patch)
tree47b20a1e7a6186479bbed3dfc79505817fed5cd7 /nixos
parent18f23748dc6d8be05520e9259e679aa71b57a9c7 (diff)
downloadnixpkgs-4fb8bc8238aa0366d78bae6095676ef7e08c17b2.tar
nixpkgs-4fb8bc8238aa0366d78bae6095676ef7e08c17b2.tar.gz
nixpkgs-4fb8bc8238aa0366d78bae6095676ef7e08c17b2.tar.bz2
nixpkgs-4fb8bc8238aa0366d78bae6095676ef7e08c17b2.tar.lz
nixpkgs-4fb8bc8238aa0366d78bae6095676ef7e08c17b2.tar.xz
nixpkgs-4fb8bc8238aa0366d78bae6095676ef7e08c17b2.tar.zst
nixpkgs-4fb8bc8238aa0366d78bae6095676ef7e08c17b2.zip
postgresql: cleanup postgis (#54396)
postgis: cleanup

Another part of https://github.com/NixOS/nixpkgs/pull/38698, though I did cleanup even more.
Moving docs to separate output should save another 30MB.

I did pin poppler to 0.61 just to be sure GDAL doesn't break again next
time poppler changes internal APIs.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/postgis.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix
index 49be0672a8e..294eb50b5fe 100644
--- a/nixos/tests/postgis.nix
+++ b/nixos/tests/postgis.nix
@@ -12,7 +12,9 @@ import ./make-test.nix ({ pkgs, ...} : {
         services.postgresql = let mypg = pkgs.postgresql_11; in {
             enable = true;
             package = mypg;
-            extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }) ];
+            extraPlugins = with mypg.pkgs; [
+              postgis
+            ];
         };
       };
   };
@@ -22,5 +24,6 @@ import ./make-test.nix ({ pkgs, ...} : {
     $master->waitForUnit("postgresql");
     $master->sleep(10); # Hopefully this is long enough!!
     $master->succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis;'");
+    $master->succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis_topology;'");
   '';
 })