mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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:
Vincent Ambo 2019-10-05 14:54:49 +01:00 committed by Vincent Ambo
parent f4bf3518f6
commit 0642f7044d
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/nixery/default.nix
View file

@ -43,7 +43,7 @@ rec {
nixery-bin = writeShellScriptBin "nixery" '' nixery-bin = writeShellScriptBin "nixery" ''
export WEB_DIR="${nixery-book}" export WEB_DIR="${nixery-book}"
export PATH="${nixery-build-image}/bin:$PATH" 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 # Container image containing Nixery and Nix itself. This image can

2
tools/nixery/server/builder/archive.go
View file

@ -13,7 +13,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/google/nixery/layers" "github.com/google/nixery/server/layers"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )

6
tools/nixery/server/builder/builder.go
View file

@ -34,9 +34,9 @@ import (
"strings" "strings"
"cloud.google.com/go/storage" "cloud.google.com/go/storage"
"github.com/google/nixery/config" "github.com/google/nixery/server/config"
"github.com/google/nixery/layers" "github.com/google/nixery/server/layers"
"github.com/google/nixery/manifest" "github.com/google/nixery/server/manifest"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"golang.org/x/oauth2/google" "golang.org/x/oauth2/google"
) )

2
tools/nixery/server/builder/cache.go
View file

@ -22,7 +22,7 @@ import (
"os" "os"
"sync" "sync"
"github.com/google/nixery/manifest" "github.com/google/nixery/server/manifest"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )

2
tools/nixery/server/default.nix
View file

@ -19,7 +19,7 @@ buildGoPackage {
goDeps = ./go-deps.nix; goDeps = ./go-deps.nix;
src = ./.; src = ./.;
goPackagePath = "github.com/google/nixery"; goPackagePath = "github.com/google/nixery/server";
# Enable checks and configure check-phase to include vet: # Enable checks and configure check-phase to include vet:
doCheck = true; doCheck = true;

6
tools/nixery/server/main.go
View file

@ -35,9 +35,9 @@ import (
"time" "time"
"cloud.google.com/go/storage" "cloud.google.com/go/storage"
"github.com/google/nixery/builder" "github.com/google/nixery/server/builder"
"github.com/google/nixery/config" "github.com/google/nixery/server/config"
"github.com/google/nixery/layers" "github.com/google/nixery/server/layers"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )