summary refs log tree commit diff
diff options
context:
space:
mode:
authorDanylo Hlynskyi <abcz2.uprola@gmail.com>2019-02-03 13:03:53 +0200
committerGitHub <noreply@github.com>2019-02-03 13:03:53 +0200
commitbd0bb9e4976eb69425ca8effc260bfe1bd47a7fc (patch)
tree704b874e06c0e319096f03bc8636da4318de80e9
parent448b3c8e8c14eda85f73ec73bb12bf07cb0ac9b6 (diff)
downloadnixpkgs-bd0bb9e4976eb69425ca8effc260bfe1bd47a7fc.tar
nixpkgs-bd0bb9e4976eb69425ca8effc260bfe1bd47a7fc.tar.gz
nixpkgs-bd0bb9e4976eb69425ca8effc260bfe1bd47a7fc.tar.bz2
nixpkgs-bd0bb9e4976eb69425ca8effc260bfe1bd47a7fc.tar.lz
nixpkgs-bd0bb9e4976eb69425ca8effc260bfe1bd47a7fc.tar.xz
nixpkgs-bd0bb9e4976eb69425ca8effc260bfe1bd47a7fc.tar.zst
nixpkgs-bd0bb9e4976eb69425ca8effc260bfe1bd47a7fc.zip
postgresql test: fix (#55106)
Commit https://github.com/NixOS/nixpkgs/pull/55097 didn't modify all usages of postgresql/default.nix.

Also, replaced "random" pg with pg11. Random pg was always pg10.
-rw-r--r--nixos/tests/postgresql.nix15
1 files changed, 5 insertions, 10 deletions
diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix
index 9e1f4f235af..cf1de2f6acb 100644
--- a/nixos/tests/postgresql.nix
+++ b/nixos/tests/postgresql.nix
@@ -7,7 +7,7 @@ with import ../lib/testing.nix { inherit system pkgs; };
 with pkgs.lib;
 
 let
-  postgresql-versions = import ../../pkgs/servers/sql/postgresql pkgs pkgs;
+  postgresql-versions = import ../../pkgs/servers/sql/postgresql pkgs;
   test-sql = pkgs.writeText "postgresql-test" ''
     CREATE EXTENSION pgcrypto; -- just to check if lib loading works
     CREATE TABLE sth (
@@ -67,12 +67,7 @@ let
 
   };
 in
-  (mapAttrs' (name: package: { inherit name; value=make-postgresql-test name package false;}) postgresql-versions) // (
-    # just pick one version for the dump all test
-    let
-      first = head (attrNames postgresql-versions);
-      name = "${first}-backup-all";
-    in {
-      ${name} = make-postgresql-test name postgresql-versions.${first} true;
-    }
-  )
+  (mapAttrs' (name: package: { inherit name; value=make-postgresql-test name package false;}) postgresql-versions) // {
+    postgresql_11-backup-all = make-postgresql-test name postgresql-versions.postgresql_11 true;
+  }
+