From 37c14788d355105f2e54f3303eca64fbe071e912 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 3 Aug 2014 19:44:58 +0100
Subject: [PATCH] Update to 14.04

---
 Makefile               | 19 +++++++++++++------
 README.md              |  2 +-
 Vagrantfile            |  6 +++---
 nixbox32-template.json |  4 ++--
 nixbox64-template.json |  4 ++--
 scripts/postinstall.sh |  2 +-
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 01b22f0..7bfde50 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,24 @@
 
-ISO_URL_32=http://releases.nixos.org/nixos/13.10/nixos-13.10.35723.15586a1/nixos-minimal-13.10.35723.15586a1-i686-linux.iso
-ISO_MD5_32=7b7996150b9d2b239d82f7526db29140
+ISO_URL_32=http://releases.nixos.org/nixos/14.04/nixos-14.04.393.6593a98/nixos-minimal-14.04.393.6593a98-i686-linux.iso
+ISO_MD5_32=dc14e90e601991a69ae23ff8bafdefb2
 GUEST_OS_32=Linux
 
-ISO_URL_64=http://releases.nixos.org/nixos/13.10/nixos-13.10.35723.15586a1/nixos-minimal-13.10.35723.15586a1-x86_64-linux.iso
-ISO_MD5_64=73465988b04cdb611d26503bf968e2de
+ISO_URL_64=http://releases.nixos.org/nixos/14.04/nixos-14.04.393.6593a98/nixos-minimal-14.04.393.6593a98-x86_64-linux.iso
+ISO_MD5_64=13f5f51897ebf491c2b8db5274bafe1d
 GUEST_OS_64=Linux_64
 
 all: nixbox32-template.json nixbox64-template.json
 
-nixbox32-template.json: nixbox-template.json.orig
+nixbox32-virtualbox.box: nixbox32-template.json
+	packer build $<
+
+nixbox64-virtualbox.box: nixbox64-template.json
+	packer build $<
+
+nixbox32-template.json: nixbox-template.json.orig Makefile
 	cat $< | sed -e 's|ISO_URL|$(ISO_URL_32)|g' -e 's|ISO_MD5|$(ISO_MD5_32)|g' -e 's|GUEST_OS|$(GUEST_OS_32)|g' -e 's|NIXBOX|nixbox32|g' > $@
 
-nixbox64-template.json: nixbox-template.json.orig
+nixbox64-template.json: nixbox-template.json.orig Makefile
 	cat $< | sed -e 's|ISO_URL|$(ISO_URL_64)|g' -e 's|ISO_MD5|$(ISO_MD5_64)|g' -e 's|GUEST_OS|$(GUEST_OS_64)|g' -e 's|NIXBOX|nixbox64|g' > $@
 
+.PHONY: all
diff --git a/README.md b/README.md
index abd72f7..cb5c1b4 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Install
 -------
 
 ```
-vagrant init zimbat/nixbox32
+vagrant init zimbatm/nixbox32
 # or
 vagrant init zimbatm/nixbox64
 ```
diff --git a/Vagrantfile b/Vagrantfile
index 53a9f71..61dba82 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,8 +2,8 @@
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|
-  config.vm.box = 'nixos32'
+  config.vm.box = 'nixbox32'
   config.vm.box_url = 'http://zimbatm.s3.amazonaws.com/nixbox/nixbox32-virtualbox.box'
-  #config.vm.box = 'nixos64'
-  #config.vm.box_url = 'http://zimbatm.s3.amazonaws.com/nixbox/nixbox64-virtualbox.box'
+  # config.vm.box = 'nixbox64'
+  # config.vm.box_url = 'http://zimbatm.s3.amazonaws.com/nixbox/nixbox64-virtualbox.box'
 end
diff --git a/nixbox32-template.json b/nixbox32-template.json
index 890b8b6..449afae 100644
--- a/nixbox32-template.json
+++ b/nixbox32-template.json
@@ -22,9 +22,9 @@
       "guest_additions_mode": "disable",
       "guest_os_type": "Linux",
       "http_directory": "http",
-      "iso_checksum": "7b7996150b9d2b239d82f7526db29140",
+      "iso_checksum": "dc14e90e601991a69ae23ff8bafdefb2",
       "iso_checksum_type": "md5",
-      "iso_url": "http://releases.nixos.org/nixos/13.10/nixos-13.10.35723.15586a1/nixos-minimal-13.10.35723.15586a1-i686-linux.iso",
+      "iso_url": "http://releases.nixos.org/nixos/14.04/nixos-14.04.393.6593a98/nixos-minimal-14.04.393.6593a98-i686-linux.iso",
       "shutdown_command": "sudo shutdown -h now",
       "ssh_password": "vagrant",
       "ssh_port": 22,
diff --git a/nixbox64-template.json b/nixbox64-template.json
index 98fd9ad..cc54593 100644
--- a/nixbox64-template.json
+++ b/nixbox64-template.json
@@ -22,9 +22,9 @@
       "guest_additions_mode": "disable",
       "guest_os_type": "Linux_64",
       "http_directory": "http",
-      "iso_checksum": "73465988b04cdb611d26503bf968e2de",
+      "iso_checksum": "13f5f51897ebf491c2b8db5274bafe1d",
       "iso_checksum_type": "md5",
-      "iso_url": "http://releases.nixos.org/nixos/13.10/nixos-13.10.35723.15586a1/nixos-minimal-13.10.35723.15586a1-x86_64-linux.iso",
+      "iso_url": "http://releases.nixos.org/nixos/14.04/nixos-14.04.393.6593a98/nixos-minimal-14.04.393.6593a98-x86_64-linux.iso",
       "shutdown_command": "sudo shutdown -h now",
       "ssh_password": "vagrant",
       "ssh_port": 22,
diff --git a/scripts/postinstall.sh b/scripts/postinstall.sh
index 7942f9a..a4b11bd 100755
--- a/scripts/postinstall.sh
+++ b/scripts/postinstall.sh
@@ -2,7 +2,7 @@
 
 # Make sure we are totally up to date
 
-nix-channel --add http://nixos.org/channels/nixos-13.10 nixos
+nix-channel --add http://nixos.org/channels/nixos-14.04 nixos
 nixos-rebuild switch --upgrade
 
 # Cleanup any previous generations and delete old packages that can be