Merge remote-tracking branch 'prism/lassulus'

5 files changed, 5 insertions, 5 deletions

diff --git a/krebs/3modules/go.nix b/krebs/3modules/go.nix
index a86f444dc..218ac9221 100644
--- a/krebs/3modules/go.nix
+++ b/krebs/3modules/go.nix
@@ -44,7 +44,7 @@ let
       wantedBy = [ "multi-user.target" ];
 
       path = with pkgs; [
-        go
+        go-shortener
       ];
 
       environment = {
@@ -57,7 +57,7 @@ let
       serviceConfig = {
         User = "go";
         Restart = "always";
-        ExecStart = "${pkgs.go}/bin/go";
+        ExecStart = "${pkgs.go-shortener}/bin/go";
       };
     };
   };
diff --git a/krebs/5pkgs/go/default.nix b/krebs/5pkgs/go-shortener/default.nix
index 2871e5a99..996f7072a 100644
--- a/krebs/5pkgs/go/default.nix
+++ b/krebs/5pkgs/go-shortener/default.nix
@@ -19,7 +19,7 @@ let
   };
 
 in np.buildNodePackage {
-  name = "go";
+  name = "go-shortener";
 
   src = fetchgit {
     url = "http://cgit.lassul.us/go/";
diff --git a/krebs/5pkgs/go/packages.nix b/krebs/5pkgs/go-shortener/packages.nix
index 9acfd7658..9acfd7658 100644
--- a/krebs/5pkgs/go/packages.nix
+++ b/krebs/5pkgs/go-shortener/packages.nix
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index c3d027edc..742d42bf8 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -54,7 +54,7 @@ with import <stockholm/lib>;
         enable = true;
         package = pkgs.postgresql;
       };
-      #virtualisation.docker.enable = true;
+      virtualisation.docker.enable = true;
       #users.users.mainUser.extraGroups = [ "docker" ];
     }
     {
diff --git a/lass/2configs/go.nix b/lass/2configs/go.nix
index 7d694c173..f6ddbe96d 100644
--- a/lass/2configs/go.nix
+++ b/lass/2configs/go.nix
@@ -3,7 +3,7 @@
 with import <stockholm/lib>;
 {
   environment.systemPackages = [
-    pkgs.go
+    pkgs.go-shortener
   ];
   krebs.go = {
     enable = true;