From 5dd24ec9fb07d2b0e4b4212a2245e01748256a41 Mon Sep 17 00:00:00 2001
From: Jonas Pfenniger <zimbatm@zimbatm.com>
Date: Sat, 9 Nov 2013 15:01:41 +0000
Subject: [PATCH] Use NixOS release 13.10 - build is still not working though

---
 nixos32-template.json  | 42 ++++++++++--------------------------------
 scripts/postinstall.sh | 12 ++----------
 2 files changed, 12 insertions(+), 42 deletions(-)

diff --git a/nixos32-template.json b/nixos32-template.json
index 7b0079a..22668d2 100644
--- a/nixos32-template.json
+++ b/nixos32-template.json
@@ -6,7 +6,7 @@
         "<wait><wait><wait><wait><wait><wait><wait><wait><wait><wait><wait><wait><wait><wait><wait><wait>",
         "root<wait>",
         "<enter><wait>",
-        "stop sshd<wait>",
+        "stop sshd",
         "<enter><wait>",
         "fdisk /dev/sda<wait>",
         "<enter><wait>",
@@ -24,55 +24,33 @@
         "<enter><wait>",
         "nixos-option --install<wait>",
         "<enter><wait>",
-        "curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/configuration.nix > /mnt/etc/nixos/configuration.nix \u0026\u0026<wait>",
+        "curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/configuration.nix > /mnt/etc/nixos/configuration.nix &&<wait>",
         "<enter><wait>",
-        "nixos-install \u0026\u0026<wait>",
+        "nixos-install &&<wait>",
         "<enter><wait>",
         "reboot<wait>",
         "<enter><wait>"
       ],
-      "boot_wait": "5s",
-      "disk_size": 20400,
-      "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
-      "guest_os_type": "Linux26",
+      "guest_additions_mode": "disable",
+      "guest_os_type": "Linux",
       "http_directory": "http",
-      "iso_checksum": "b1a78fc1b72ea1a19957cb1422817ab6",
+      "iso_checksum": "d0e0a64fe9a5f3f946e6f9fe0b846e70",
       "iso_checksum_type": "md5",
-      "iso_url": "http://nixos.org/releases/nixos/nixos-13.07pre4871_18de9f6-3c35dae/nixos-minimal-13.07pre4871_18de9f6-3c35dae-i686-linux.iso",
+      "iso_url": "http://nixos.org/releases/nixos/13.10/nixos-13.10.35445.be4e850/nixos-minimal-13.10.35445.be4e850-x86_64-linux.iso",
       "shutdown_command": "sudo shutdown -h now",
       "ssh_password": "vagrant",
       "ssh_port": 22,
       "ssh_username": "vagrant",
       "ssh_wait_timeout": "10000s",
       "type": "virtualbox",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "256"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "1"
-        ]
-      ],
       "virtualbox_version_file": ".vbox_version"
     }
   ],
   "provisioners": [
     {
-      "override": {
-        "virtualbox": {
-          "execute_command": "sudo '{{.Path}}'"
-        }
-      },
-      "scripts": [
-        "scripts/postinstall.sh"
-      ],
-      "type": "shell"
+      "type": "shell",
+      "execute_command": "sudo '{{.Path}}'",
+      "script": "scripts/postinstall.sh"
     }
   ]
 }
diff --git a/scripts/postinstall.sh b/scripts/postinstall.sh
index 57ad04b..7942f9a 100755
--- a/scripts/postinstall.sh
+++ b/scripts/postinstall.sh
@@ -1,17 +1,9 @@
 #!/bin/sh
 
-# Remove VirtualBox Guest Additions ISO that the Veewee put in our
-# home dir
-
-rm -f ~/*.iso
-
-# Install chef & puppet
-
-#su - vagrant -c 'gem install chef puppet --user-install --bindir=$HOME/bin --no-rdoc --no-ri'
-
 # Make sure we are totally up to date
 
-nixos-rebuild --upgrade switch
+nix-channel --add http://nixos.org/channels/nixos-13.10 nixos
+nixos-rebuild switch --upgrade
 
 # Cleanup any previous generations and delete old packages that can be
 # pruned.