diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-02-22 16:49:56 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-22 16:49:56 +0000 |
commit | d328ba753ef3d2aa567ff0dfcdb19cecb97cd81c (patch) | |
tree | 95b147a64b163aebb4c80429a7199af00174bc72 /nixos | |
parent | 383da0ff9e681bfbee9d7ccf30dd0f955dcb97c6 (diff) | |
parent | b2f53c76f83cbe91bb9c765b7a3aaaa50336d653 (diff) | |
download | nixlib-d328ba753ef3d2aa567ff0dfcdb19cecb97cd81c.tar nixlib-d328ba753ef3d2aa567ff0dfcdb19cecb97cd81c.tar.gz nixlib-d328ba753ef3d2aa567ff0dfcdb19cecb97cd81c.tar.bz2 nixlib-d328ba753ef3d2aa567ff0dfcdb19cecb97cd81c.tar.lz nixlib-d328ba753ef3d2aa567ff0dfcdb19cecb97cd81c.tar.xz nixlib-d328ba753ef3d2aa567ff0dfcdb19cecb97cd81c.tar.zst nixlib-d328ba753ef3d2aa567ff0dfcdb19cecb97cd81c.zip |
Merge pull request #35243 from FRidh/postgis
postgis: get rid of composableDerivation
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/databases/postgresql.nix | 2 | ||||
-rw-r--r-- | nixos/tests/postgis.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 9b5e3735239f..0dcbfe2e47ac 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -122,7 +122,7 @@ in extraPlugins = mkOption { type = types.listOf types.path; default = []; - example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }).v_2_1_4 ]"; + example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }) ]"; description = '' When this list contains elements a new store path is created. PostgreSQL and the elements are symlinked into it. Then pg_config, diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index f6ce3fe38ed3..7fe905eb4254 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : { services.postgresql = let mypg = pkgs.postgresql100; in { enable = true; package = mypg; - extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }).v_2_4_0 ]; + extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }) ]; }; }; }; |