fix(server): Amend package path for Go tooling compatibility

With these changes it is possible to keep Nixery in $GOPATH and build
the server in there, while still having things work correctly via Nix.

5 files changed, 9 insertions, 9 deletions

diff --git a/tools/nixery/server/builder/archive.go b/tools/nixery/server/builder/archive.go
index 6d5033f13182..6a2bd8e4b0f0 100644
--- a/tools/nixery/server/builder/archive.go
+++ b/tools/nixery/server/builder/archive.go
@@ -13,7 +13,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/google/nixery/layers"
+	"github.com/google/nixery/server/layers"
 	log "github.com/sirupsen/logrus"
 )
 
diff --git a/tools/nixery/server/builder/builder.go b/tools/nixery/server/builder/builder.go
index 3f085c565554..b675da0f7763 100644
--- a/tools/nixery/server/builder/builder.go
+++ b/tools/nixery/server/builder/builder.go
@@ -34,9 +34,9 @@ import (
 	"strings"
 
 	"cloud.google.com/go/storage"
-	"github.com/google/nixery/config"
-	"github.com/google/nixery/layers"
-	"github.com/google/nixery/manifest"
+	"github.com/google/nixery/server/config"
+	"github.com/google/nixery/server/layers"
+	"github.com/google/nixery/server/manifest"
 	log "github.com/sirupsen/logrus"
 	"golang.org/x/oauth2/google"
 )
diff --git a/tools/nixery/server/builder/cache.go b/tools/nixery/server/builder/cache.go
index 4a060ba5ea17..5b6bf078b228 100644
--- a/tools/nixery/server/builder/cache.go
+++ b/tools/nixery/server/builder/cache.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"sync"
 
-	"github.com/google/nixery/manifest"
+	"github.com/google/nixery/server/manifest"
 	log "github.com/sirupsen/logrus"
 )
 
diff --git a/tools/nixery/server/default.nix b/tools/nixery/server/default.nix
index 9df52721857c..573447a6c3df 100644
--- a/tools/nixery/server/default.nix
+++ b/tools/nixery/server/default.nix
@@ -19,7 +19,7 @@ buildGoPackage {
   goDeps = ./go-deps.nix;
   src = ./.;
 
-  goPackagePath = "github.com/google/nixery";
+  goPackagePath = "github.com/google/nixery/server";
 
   # Enable checks and configure check-phase to include vet:
   doCheck = true;
diff --git a/tools/nixery/server/main.go b/tools/nixery/server/main.go
index bad4c190c680..878e59ff6d50 100644
--- a/tools/nixery/server/main.go
+++ b/tools/nixery/server/main.go
@@ -35,9 +35,9 @@ import (
 	"time"
 
 	"cloud.google.com/go/storage"
-	"github.com/google/nixery/builder"
-	"github.com/google/nixery/config"
-	"github.com/google/nixery/layers"
+	"github.com/google/nixery/server/builder"
+	"github.com/google/nixery/server/config"
+	"github.com/google/nixery/server/layers"
 	log "github.com/sirupsen/logrus"
 )