Skip to content
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

Jump to bottom

[easy][lock-tidy] Don't tidy flakes #2162

Merged
merged 1 commit into from
Jun 19, 2024
Merged

[easy][lock-tidy] Don't tidy flakes #2162

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
2 changes: 1 addition & 1 deletion internal/devbox/packages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ func (d *Devbox) moveAllowInsecureFromLockfile(writer io.Writer, lockfile *lock.
func (d *Devbox) FixMissingStorePaths(ctx context.Context) error {
packages := d.InstallablePackages()
for _, pkg := range packages {
if pkg.IsRunX() {
if !pkg.IsDevboxPackage || pkg.IsRunX() {
continue
}
existingStorePaths, err := pkg.GetResolvedStorePaths()
Expand Down
1 change: 1 addition & 0 deletions internal/devpkg/package.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ func newPackage(raw string, isInstallable func() bool, locker lock.Locker) *Pack
// assume a Devbox package.
parsed, err := flake.ParseInstallable(raw)
if err != nil || pkgtype.IsAmbiguous(raw, parsed) {
// TODO: This sets runx packages as devbox packages. Not sure if that's what we want.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oooh :D
good thing runx isn't public yet, so we can land this

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This hasn't broken anything for us (yet) even though we use runx. But I think in the future this confusion could lead to bugs.

pkg.IsDevboxPackage = true
pkg.resolve = sync.OnceValue(func() error { return resolve(pkg) })
return pkg
Expand Down