Skip to content

call nix.System directly from lock.lockfile #1245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 1, 2023
Merged

call nix.System directly from lock.lockfile #1245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions internal/impl/devbox.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (

"github.com/pkg/errors"
"github.com/samber/lo"
"go.jetpack.io/devbox/internal/boxcli/featureflag"
"go.jetpack.io/devbox/internal/devpkg"
"go.jetpack.io/devbox/internal/impl/generate"
"go.jetpack.io/devbox/internal/shellgen"
Expand Down Expand Up @@ -91,16 +90,7 @@ func Open(opts *devopt.Opts) (*Devbox, error) {
pure: opts.Pure,
}

// TODO savil: this is bad for perf, and so remove before enabling feature.
// this hack is to workaround an import cycle: lock -> nix -> lock
userSystem := ""
if featureflag.RemoveNixpkgs.Enabled() {
userSystem, err = nix.System()
if err != nil {
return nil, err
}
}
lock, err := lock.GetFile(box, searcher.Client(), userSystem)
lock, err := lock.GetFile(box, searcher.Client())
if err != nil {
return nil, err
}
Expand Down
14 changes: 8 additions & 6 deletions internal/lock/lockfile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/samber/lo"
"go.jetpack.io/devbox/internal/boxcli/featureflag"
"go.jetpack.io/devbox/internal/devpkg/devpkgutil"
"go.jetpack.io/devbox/internal/nix"

"go.jetpack.io/devbox/internal/cuecfg"
)
Expand All @@ -28,8 +29,6 @@ type File struct {

// Packages is keyed by "canonicalName@version"
Packages map[string]*Package `json:"packages"`

system string
}

type Package struct {
Expand All @@ -50,15 +49,13 @@ type SystemInfo struct {
ToHash string `json:"to_hash,omitempty"`
}

func GetFile(project devboxProject, resolver resolver, system string) (*File, error) {
func GetFile(project devboxProject, resolver resolver) (*File, error) {
lockFile := &File{
devboxProject: project,
resolver: resolver,

LockFileVersion: lockFileVersion,
Packages: map[string]*Package{},

system: system,
}
err := cuecfg.ParseFile(lockFilePath(project), lockFile)
if errors.Is(err, fs.ErrNotExist) {
Expand Down Expand Up @@ -91,10 +88,15 @@ func (l *File) Remove(pkgs ...string) error {
func (l *File) Resolve(pkg string) (*Package, error) {
entry, hasEntry := l.Packages[pkg]

userSystem, err := nix.System()
if err != nil {
return nil, err
}

// If the package's system info is missing, we need to resolve it again.
needsSysInfo := false
if hasEntry && featureflag.RemoveNixpkgs.Enabled() {
needsSysInfo = entry.Systems[l.system] == nil
needsSysInfo = entry.Systems[userSystem] == nil
}

if !hasEntry || entry.Resolved == "" || needsSysInfo {
Expand Down