diff --git a/nixos/configuration.nix b/nixos/configuration.nix index f566c34..2415568 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -23,17 +23,6 @@ # Enable DBus services.dbus.enable = true; - # Enable postgres - services.postgresql = { - enable = true; - package = pkgs.postgresql93; - enableTCPIP = true; - authentication = pkgs.lib.mkForce '' - local all all trust - host all all 127.0.0.1/32 trust - ''; - initialScript = "/etc/nixos/init.psql"; - }; # Default packages environment.systemPackages = with pkgs; [ diff --git a/nixos/init.psql b/nixos/init.psql deleted file mode 100644 index cafefa9..0000000 --- a/nixos/init.psql +++ /dev/null @@ -1,2 +0,0 @@ - -CREATE ROLE vagrant WITH CREATEDB LOGIN; \ No newline at end of file diff --git a/scripts/postinstall.sh b/scripts/postinstall.sh index 289aa7d..efd0d4f 100755 --- a/scripts/postinstall.sh +++ b/scripts/postinstall.sh @@ -2,6 +2,10 @@ set -e +# Switch to unstable channel +nix-channel --remove nixos +nix-channel --add http://nixos.org/channels/nixos-unstable nixos + # Update and initialize our new configuration nixos-rebuild switch --upgrade diff --git a/template.json b/template.json index 110b376..05d2fd6 100644 --- a/template.json +++ b/template.json @@ -51,7 +51,7 @@ "post-processors": [ { "type": "vagrant", - "output": "cycle-13.10-x86_64-{{.Provider}}.box" + "output": "cycle-14.02-x86_64-{{.Provider}}.box" } ] }