pulled upstream

Author: Bee-Mar

devbox.go

@@ -0,0 +1,32 @@
+// Package devbox creates and configures Devbox development environments.
+package devbox
+
+import (
+	"context"
+	"io"
+
+	"go.jetpack.io/devbox/internal/devbox"
+	"go.jetpack.io/devbox/internal/devbox/devopt"
+)
+
+// Devbox is a Devbox development environment.
+type Devbox struct {
+	dx *devbox.Devbox
+}
+
+// Open loads a Devbox environment from a config file or directory.
+func Open(path string) (*Devbox, error) {
+	dx, err := devbox.Open(&devopt.Opts{
+		Dir:    path,
+		Stderr: io.Discard,
+	})
+	if err != nil {
+		return nil, err
+	}
+	return &Devbox{dx: dx}, nil
+}
+
+// Install downloads and installs missing packages.
+func (d *Devbox) Install(ctx context.Context) error {
+	return d.dx.Install(ctx)
+}

docs/app/docs/installing_devbox.mdx

@@ -20,7 +20,7 @@ curl -fsSL https://get.jetify.com/devbox | bash
 
 Devbox requires the [Nix Package Manager](https://nixos.org/download.html). If Nix is not detected when running a command, Devbox will install it for you in single-user mode for Linux. Don't worry: You can use Devbox without needing to learn the Nix Language.
 
-If you would like to install Nix yourself, we recommend the [Determinate Nix Installer](https://determinate.systems/posts/determinate-nix-installer/).
+If you would like to install Nix yourself, we recommend the [Determinate Nix Installer](https://determinate.systems/nix-installer/).
 
 </TabItem>
 <TabItem value="macos" label="MacOS">

examples/databases/postgres/devbox.json

@@ -1,10 +1,6 @@
 {
   "packages": {
-    "postgresql": "latest",
-    "glibcLocales": {
-      "version":   "latest",
-      "platforms": ["x86_64-linux", "aarch64-linux"]
-    }
+    "postgresql": "latest"
   },
   "shell": {
     "init_hook": null

examples/development/haskell/devbox.json

@@ -7,6 +7,9 @@
     "zlib@latest",
     "hpack@latest"
   ],
+  "env": {
+    "PATH": "$PATH:/usr/bin"
+  },
   "shell": {
     "init_hook": null,
     "scripts": {
@@ -17,4 +20,4 @@
       ]
     }
   }
-}
+}

flake.nix

@@ -11,7 +11,7 @@
       let
         pkgs = nixpkgs.legacyPackages.${system};
 
-        lastTag = "0.13.6";
+        lastTag = "0.13.7";
 
         revision =
           if (self ? shortRev)
@@ -47,6 +47,9 @@
             "-X go.jetpack.io/devbox/internal/build.Commit=${revision}"
           ];
 
+          # Don't generate test binaries (as we'd include them as a bin)
+          excludedPackages = [ "testscripts" ];
+
           # Disable tests if they require network access or are integration tests
           doCheck = false;
 

go.mod

@@ -14,8 +14,6 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/sts v1.28.11
 	github.com/bmatcuk/doublestar/v4 v4.6.1
 	github.com/briandowns/spinner v1.23.0
-	github.com/cavaliergopher/grab/v3 v3.0.1
-	github.com/cloudflare/ahocorasick v0.0.0-20210425175752-730270c3e184
 	github.com/denisbrodbeck/machineid v1.0.1
 	github.com/f1bonacc1/process-compose v1.6.1
 	github.com/fatih/color v1.17.0
@@ -48,7 +46,6 @@ require (
 	golang.org/x/oauth2 v0.21.0
 	golang.org/x/sync v0.7.0
 	golang.org/x/tools v0.22.0
-	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gopkg.in/yaml.v3 v3.0.1
 )
 
@@ -78,6 +75,7 @@ require (
 	github.com/bodgit/sevenzip v1.5.1 // indirect
 	github.com/bodgit/windows v1.0.1 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
+	github.com/cavaliergopher/grab/v3 v3.0.1 // indirect
 	github.com/charmbracelet/lipgloss v0.11.0 // indirect
 	github.com/charmbracelet/x/ansi v0.1.2 // indirect
 	github.com/cloudflare/circl v1.3.8 // indirect

go.sum

@@ -13,7 +13,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"go.jetpack.io/devbox/internal/boxcli/usererr"
-	"go.jetpack.io/devbox/internal/cloud"
 	"go.jetpack.io/devbox/internal/devbox"
 	"go.jetpack.io/devbox/internal/devbox/devopt"
 	"go.jetpack.io/devbox/internal/devbox/docgen"
@@ -24,7 +23,6 @@ type generateCmdFlags struct {
 	config            configFlags
 	force             bool
 	printEnvrcContent bool
-	githubUsername    string
 	rootUser          bool
 }
 
@@ -61,7 +59,6 @@ func generateCmd() *cobra.Command {
 	command.AddCommand(debugCmd())
 	command.AddCommand(direnvCmd())
 	command.AddCommand(genReadmeCmd())
-	command.AddCommand(sshConfigCmd())
 	flags.config.register(command)
 
 	return command
@@ -158,27 +155,6 @@ func direnvCmd() *cobra.Command {
 	return command
 }
 
-func sshConfigCmd() *cobra.Command {
-	flags := &generateCmdFlags{}
-	command := &cobra.Command{
-		Use:    "ssh-config",
-		Hidden: true,
-		Short:  "Generate ssh config to connect to devbox cloud",
-		Long:   "Check ssh config and if they don't exist, it generates the configs necessary to connect to devbox cloud VMs.",
-		Args:   cobra.MaximumNArgs(0),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			// ssh-config command is exception and it should run without a config file present
-			_, err := cloud.SSHSetup(flags.githubUsername)
-			return errors.WithStack(err)
-		},
-	}
-	command.Flags().StringVarP(
-		&flags.githubUsername, "username", "u", "", "GitHub username to use for ssh",
-	)
-	flags.config.register(command)
-	return command
-}
-
 func genReadmeCmd() *cobra.Command {
 	flags := &GenerateReadmeCmdFlags{}