puppet.diff

diff --git a/modules/gui/manifests/init.pp b/modules/gui/manifests/init.pp
--- a/modules/gui/manifests/init.pp
+++ b/modules/gui/manifests/init.pp
@@ -13,7 +13,7 @@ class gui(
     include users::builder
     include gui::appearance
 
-    $nvidia_version = '310.32'
+    $nvidia_version = '361.42'
     $gpu_bus_id = "PCI:01:00:0"
 
     # only use the nvidia drivers and settings if we're using a GPU, and are not
diff --git a/modules/packages/manifests/nvidia_drivers.pp b/modules/packages/manifests/nvidia_drivers.pp
--- a/modules/packages/manifests/nvidia_drivers.pp
+++ b/modules/packages/manifests/nvidia_drivers.pp
@@ -5,13 +5,13 @@
 class packages::nvidia_drivers {
     include needs_reboot
 
-    realize(Packages::Aptrepo['xorg-edgers'])
+    realize(Packages::Aptrepo['graphics-drivers'])
 
-    # The Ubuntu xorg-edgers reqo embeds the version number in the package
+    # The Ubuntu graphics-drivers repo embeds the version number in the package
     # name, so we can easily require "latest"
 
-    $nvidia_version = "310"
-    $nvidia_full_version = "310.32"
+    $nvidia_version = "361"
+    $nvidia_full_version = "361.42"
 
     case $::operatingsystem {
         Ubuntu: {
@@ -23,7 +23,10 @@ class packages::nvidia_drivers {
                     # requires unloading the nouveau drivers, which are
                     # installed by default for the startup frame buffer.. so we
                     # need to reboot.
-                    notify => Exec['reboot_semaphore']
+                    notify => Exec['reboot_semaphore'];
+                ["nvidia-310", "nvidia-settings-310"]:
+                    ensure => absent,
+                    notify => Exec['reboot_semaphore'];
             }
             file {
                 "/etc/init/nvidia-$nvidia_version.conf":
diff --git a/modules/packages/manifests/setup.pp b/modules/packages/manifests/setup.pp
--- a/modules/packages/manifests/setup.pp
+++ b/modules/packages/manifests/setup.pp
@@ -196,8 +196,8 @@ class packages::setup {
                     components   => ["dependencies", "main"];
             }
             @packages::aptrepo {
-                "xorg-edgers":
-                    url_path     => "repos/apt/xorg-edgers",
+                "graphics-drivers":
+                    url_path     => "repos/apt/graphics-drivers",
                     distribution => "${lsbdistcodename}",
                     components   => ["main"];
                 "nginx-development":