diff options
| author | Lancelot SIX <lsix+github@lancelotsix.com> | 2017-10-14 10:13:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-14 10:13:53 +0200 |
| commit | 4ea954477f8ed8995119699bb7472b3295a77c02 (patch) | |
| tree | 69f3c7622b16231cf17a1929dddce7d355009c58 /nixos | |
| parent | c4160a4eb75b3bb3e46c83315b0d0e72ccd71e0d (diff) | |
| parent | 8dcaa5b313165d0acb3860cab97ece62e8421162 (diff) | |
| download | nixlib-4ea954477f8ed8995119699bb7472b3295a77c02.tar nixlib-4ea954477f8ed8995119699bb7472b3295a77c02.tar.gz nixlib-4ea954477f8ed8995119699bb7472b3295a77c02.tar.bz2 nixlib-4ea954477f8ed8995119699bb7472b3295a77c02.tar.lz nixlib-4ea954477f8ed8995119699bb7472b3295a77c02.tar.xz nixlib-4ea954477f8ed8995119699bb7472b3295a77c02.tar.zst nixlib-4ea954477f8ed8995119699bb7472b3295a77c02.zip | |
Merge pull request #30321 from RemiDesgrange/add-postgis-2.4.0
Add postgis 2.4.0
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/release.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/postgis.nix | 10 |
2 files changed, 4 insertions, 7 deletions
diff --git a/nixos/release.nix b/nixos/release.nix index ee706ff986d4..4060e5df4ec1 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -303,6 +303,7 @@ in rec { #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); tests.peerflix = callTest tests/peerflix.nix {}; tests.postgresql = callSubTests tests/postgresql.nix {}; + tests.postgis = callTest tests/postgis.nix {}; #tests.pgjwt = callTest tests/pgjwt.nix {}; tests.printing = callTest tests/printing.nix {}; tests.proxy = callTest tests/proxy.nix {}; diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index 1dba5c363c09..f6ce3fe38ed3 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -9,15 +9,11 @@ import ./make-test.nix ({ pkgs, ...} : { { pkgs, config, ... }: { - services.postgresql = let mypg = pkgs.postgresql95; in { + services.postgresql = let mypg = pkgs.postgresql100; in { enable = true; package = mypg; - extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }).v_2_2_1 ]; - initialScript = pkgs.writeText "postgresql-init.sql" - '' - CREATE ROLE postgres WITH superuser login createdb; - ''; - }; + extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }).v_2_4_0 ]; + }; }; }; |