Use PostgreSQL 9.5

9.2 is no longer in Nixpkgs.
This commit is contained in:
Eelco Dolstra 2017-09-22 15:18:22 +02:00
parent 2318baaade
commit d9cbf8cf01
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE

View file

@ -24,7 +24,7 @@ let
services.hydra-dev.notificationSender = "admin@hydra.example.org"; services.hydra-dev.notificationSender = "admin@hydra.example.org";
services.postgresql.enable = true; services.postgresql.enable = true;
services.postgresql.package = pkgs.postgresql92; services.postgresql.package = pkgs.postgresql95;
environment.systemPackages = [ pkgs.perlPackages.LWP pkgs.perlPackages.JSON ]; environment.systemPackages = [ pkgs.perlPackages.LWP pkgs.perlPackages.JSON ];
}; };
@ -131,7 +131,7 @@ rec {
gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
guile # optional, for Guile + Guix support guile # optional, for Guile + Guix support
perlDeps perl nix perlDeps perl nix
postgresql92 # for running the tests postgresql95 # for running the tests
]; ];
hydraPath = lib.makeBinPath ( hydraPath = lib.makeBinPath (
@ -243,7 +243,7 @@ rec {
machine = machine =
{ config, pkgs, ... }: { config, pkgs, ... }:
{ services.postgresql.enable = true; { services.postgresql.enable = true;
services.postgresql.package = pkgs.postgresql92; services.postgresql.package = pkgs.postgresql95;
environment.systemPackages = [ hydra pkgs.rubyLibs.fakes3 ]; environment.systemPackages = [ hydra pkgs.rubyLibs.fakes3 ];
virtualisation.memorySize = 2047; virtualisation.memorySize = 2047;
boot.kernelPackages = pkgs.linuxPackages_3_10; boot.kernelPackages = pkgs.linuxPackages_3_10;