diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-20 22:17:16 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-20 22:17:16 +0100 |
commit | b2f53c76f83cbe91bb9c765b7a3aaaa50336d653 (patch) | |
tree | 1fcdae604d359f3a2bb22446166ce73857a05893 /nixos | |
parent | 3d0b2f1e6372cca1728de2f51ee96b27ec841919 (diff) | |
download | nixpkgs-b2f53c76f83cbe91bb9c765b7a3aaaa50336d653.tar nixpkgs-b2f53c76f83cbe91bb9c765b7a3aaaa50336d653.tar.gz nixpkgs-b2f53c76f83cbe91bb9c765b7a3aaaa50336d653.tar.bz2 nixpkgs-b2f53c76f83cbe91bb9c765b7a3aaaa50336d653.tar.lz nixpkgs-b2f53c76f83cbe91bb9c765b7a3aaaa50336d653.tar.xz nixpkgs-b2f53c76f83cbe91bb9c765b7a3aaaa50336d653.tar.zst nixpkgs-b2f53c76f83cbe91bb9c765b7a3aaaa50336d653.zip |
postgis: get rid of composableDerivation
In this change composableDerivation is removed in favor of stdenv.mkDerivation.
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 9b5e3735239..0dcbfe2e47a 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 f6ce3fe38ed..7fe905eb425 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; }) ]; }; }; }; |