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.
This commit is contained in:
parent
f4bf3518f6
commit
0642f7044d
6 changed files with 10 additions and 10 deletions
|
@ -43,7 +43,7 @@ rec {
|
|||
nixery-bin = writeShellScriptBin "nixery" ''
|
||||
export WEB_DIR="${nixery-book}"
|
||||
export PATH="${nixery-build-image}/bin:$PATH"
|
||||
exec ${nixery-server}/bin/nixery
|
||||
exec ${nixery-server}/bin/server
|
||||
'';
|
||||
|
||||
# Container image containing Nixery and Nix itself. This image can
|
||||
|
|
|
@ -13,7 +13,7 @@ import (
|
|||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/google/nixery/layers"
|
||||
"github.com/google/nixery/server/layers"
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
|
|
@ -22,7 +22,7 @@ import (
|
|||
"os"
|
||||
"sync"
|
||||
|
||||
"github.com/google/nixery/manifest"
|
||||
"github.com/google/nixery/server/manifest"
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in a new issue