diff options
| author | KJ Ørbekk <kj@orbekk.com> | 2017-06-12 10:56:00 -0400 |
|---|---|---|
| committer | KJ Ørbekk <kj@orbekk.com> | 2017-06-12 10:56:00 -0400 |
| commit | c25368d715aa3edd9e40633c9561e55f5fa07ea2 (patch) | |
| tree | 443c4322d5ede5d450d32041d46a679d0e6529e6 | |
| parent | 8329439ba0f65eb77dc6797cdee3afd0a46966a4 (diff) | |
Pin synapse to nixos-stable. Use state version for postgresql
| -rw-r--r-- | config/common.nix | 6 | ||||
| -rw-r--r-- | config/orbekk-pkgs.nix | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/config/common.nix b/config/common.nix index 15b49d6..758664f 100644 --- a/config/common.nix +++ b/config/common.nix @@ -23,7 +23,12 @@ ]; time.timeZone = "America/New_York"; + system.stateVersion = "17.04"; services = { + postgresql = { + dataDir = "/var/db/postgresql"; + package = pkgs.postgresql95; + }; openssh.passwordAuthentication = false; }; @@ -34,6 +39,7 @@ gc.automatic = lib.mkDefault true; nixPath = lib.mkBefore [ "orbekk=https://hydra.orbekk.com/project/orbekk-projects/channel/latest/nixexprs.tar.bz2" + "nixpkgs-stable=https://nixos.org/channels/nixos-17.03/nixexprs.tar.xz" "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs" "nixos-config=/etc/nixos/configuration.nix" "/nix/var/nix/profiles/per-user/root/channels" diff --git a/config/orbekk-pkgs.nix b/config/orbekk-pkgs.nix index 7deed49..ce29f59 100644 --- a/config/orbekk-pkgs.nix +++ b/config/orbekk-pkgs.nix @@ -3,8 +3,11 @@ { config, lib, pkgs, ... }: let orbekkPkgs = import <orbekk> {}; + stablePkgs = import <nixpkgs-stable> {}; in { nixpkgs.config.packageOverrides = pkgs: { + # Broken in nixos-unstable + matrix-synapse = stablePkgs.matrix-synapse; } // orbekkPkgs; } |