diff --git a/examples/databases/mariadb/devbox.json b/examples/databases/mariadb/devbox.json index 91044724072..39024a213c6 100644 --- a/examples/databases/mariadb/devbox.json +++ b/examples/databases/mariadb/devbox.json @@ -19,4 +19,4 @@ "nixpkgs": { "commit": "f80ac848e3d6f0c12c52758c0f25c10c97ca3b62" } -} +} \ No newline at end of file diff --git a/examples/databases/mariadb/devbox.lock b/examples/databases/mariadb/devbox.lock index 7be4ae11062..d17674e034a 100644 --- a/examples/databases/mariadb/devbox.lock +++ b/examples/databases/mariadb/devbox.lock @@ -6,6 +6,7 @@ }, "mariadb@latest": { "last_modified": "2023-05-01T16:53:22Z", + "plugin_version": "0.0.1", "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#mariadb", "version": "10.6.12" } diff --git a/examples/development/csharp/hello-world/devbox.lock b/examples/development/csharp/hello-world/devbox.lock new file mode 100644 index 00000000000..035c807045a --- /dev/null +++ b/examples/development/csharp/hello-world/devbox.lock @@ -0,0 +1,10 @@ +{ + "lockfile_version": "1", + "packages": { + "dotnet-sdk@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#dotnet-sdk", + "version": "6.0.408" + } + } +} \ No newline at end of file diff --git a/examples/development/elixir/elixir_hello/devbox.json b/examples/development/elixir/elixir_hello/devbox.json index cfcd56723f6..4daf5ab2c9e 100644 --- a/examples/development/elixir/elixir_hello/devbox.json +++ b/examples/development/elixir/elixir_hello/devbox.json @@ -1,6 +1,6 @@ { "packages": [ - "elixir" + "elixir@latest" ], "env": { "MIX_HOME": "$PWD/.nix-mix", diff --git a/examples/development/elixir/elixir_hello/devbox.lock b/examples/development/elixir/elixir_hello/devbox.lock new file mode 100644 index 00000000000..e66c52f73cd --- /dev/null +++ b/examples/development/elixir/elixir_hello/devbox.lock @@ -0,0 +1,10 @@ +{ + "lockfile_version": "1", + "packages": { + "elixir@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#elixir", + "version": "1.14.4" + } + } +} \ No newline at end of file diff --git a/examples/development/fsharp/hello-world/devbox.json b/examples/development/fsharp/hello-world/devbox.json index f77ae4a2b65..72e5a7487a8 100644 --- a/examples/development/fsharp/hello-world/devbox.json +++ b/examples/development/fsharp/hello-world/devbox.json @@ -1,6 +1,6 @@ { "packages": [ - "dotnet-sdk" + "dotnet-sdk@latest" ], "shell": { "init_hook": null, diff --git a/examples/development/fsharp/hello-world/devbox.lock b/examples/development/fsharp/hello-world/devbox.lock new file mode 100644 index 00000000000..035c807045a --- /dev/null +++ b/examples/development/fsharp/hello-world/devbox.lock @@ -0,0 +1,10 @@ +{ + "lockfile_version": "1", + "packages": { + "dotnet-sdk@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#dotnet-sdk", + "version": "6.0.408" + } + } +} \ No newline at end of file diff --git a/examples/development/go/hello-world/.envrc b/examples/development/go/hello-world/.envrc new file mode 100644 index 00000000000..84fc8e53614 --- /dev/null +++ b/examples/development/go/hello-world/.envrc @@ -0,0 +1,7 @@ +# Automatically sets up your devbox environment whenever you cd into this +# directory via our direnv integration: + +eval "$(devbox generate direnv --print-envrc)" + +# check out https://www.jetpack.io/devbox/docs/ide_configuration/direnv/ +# for more details diff --git a/examples/development/go/hello-world/devbox.json b/examples/development/go/hello-world/devbox.json index 67d4207211b..1b5920a2c41 100644 --- a/examples/development/go/hello-world/devbox.json +++ b/examples/development/go/hello-world/devbox.json @@ -1,9 +1,11 @@ { "packages": [ - "go_1_19" + "go@1.19.8" ], "shell": { - "init_hook": null, + "init_hook": [ + "export \"GOROOT=$(go env GOROOT)\"" + ], "scripts": { "run_test": "go run main.go" } diff --git a/examples/development/go/hello-world/devbox.lock b/examples/development/go/hello-world/devbox.lock new file mode 100644 index 00000000000..34556d3f8bf --- /dev/null +++ b/examples/development/go/hello-world/devbox.lock @@ -0,0 +1,10 @@ +{ + "lockfile_version": "1", + "packages": { + "go@1.19.8": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#go_1_19", + "version": "1.19.8" + } + } +} \ No newline at end of file diff --git a/examples/development/go/hello-world/main.go b/examples/development/go/hello-world/main.go index 15b6822d081..a3999032676 100644 --- a/examples/development/go/hello-world/main.go +++ b/examples/development/go/hello-world/main.go @@ -6,7 +6,7 @@ import ( ) func main() { - expected := "go1.19.4" + expected := "go1.19.8" goVersion := runtime.Version() fmt.Printf("Go version: %s\n", goVersion) if goVersion != expected { diff --git a/examples/development/haskell/devbox.json b/examples/development/haskell/devbox.json index 7b1da836943..2f8d7691f9d 100644 --- a/examples/development/haskell/devbox.json +++ b/examples/development/haskell/devbox.json @@ -1,11 +1,11 @@ { "packages": [ - "ghc", - "gmp", - "stack", - "cabal-install", - "zlib", - "hpack" + "ghc@latest", + "gmp@latest", + "stack@latest", + "cabal-install@latest", + "zlib@latest", + "hpack@latest" ], "shell": { "init_hook": null, diff --git a/examples/development/haskell/devbox.lock b/examples/development/haskell/devbox.lock new file mode 100644 index 00000000000..5f44d35fe00 --- /dev/null +++ b/examples/development/haskell/devbox.lock @@ -0,0 +1,10 @@ +{ + "lockfile_version": "1", + "packages": { + "ghc@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#ghc", + "version": "9.2.7" + } + } +} diff --git a/examples/development/java/gradle/hello-world/devbox.json b/examples/development/java/gradle/hello-world/devbox.json index 576572ca51a..bab0ca985f0 100644 --- a/examples/development/java/gradle/hello-world/devbox.json +++ b/examples/development/java/gradle/hello-world/devbox.json @@ -1,8 +1,8 @@ { "packages": [ - "gradle", - "jdk", - "binutils" + "gradle@latest", + "jdk@19", + "binutils@latest" ], "shell": { "init_hook": null, diff --git a/examples/development/java/gradle/hello-world/devbox.lock b/examples/development/java/gradle/hello-world/devbox.lock new file mode 100644 index 00000000000..c47099c4486 --- /dev/null +++ b/examples/development/java/gradle/hello-world/devbox.lock @@ -0,0 +1,20 @@ +{ + "lockfile_version": "1", + "packages": { + "binutils@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#binutils", + "version": "2.40" + }, + "gradle@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#gradle", + "version": "8.0.1" + }, + "jdk@19": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#jdk", + "version": "19.0.2+7" + } + } +} \ No newline at end of file diff --git a/examples/development/java/maven/hello-world/devbox.json b/examples/development/java/maven/hello-world/devbox.json index 7884e089cd3..5f4e293b546 100644 --- a/examples/development/java/maven/hello-world/devbox.json +++ b/examples/development/java/maven/hello-world/devbox.json @@ -1,8 +1,8 @@ { "packages": [ - "maven", - "jdk", - "binutils" + "maven@latest", + "jdk@19", + "binutils@latest" ], "shell": { "init_hook": null, diff --git a/examples/development/java/maven/hello-world/devbox.lock b/examples/development/java/maven/hello-world/devbox.lock new file mode 100644 index 00000000000..b9da51be9e0 --- /dev/null +++ b/examples/development/java/maven/hello-world/devbox.lock @@ -0,0 +1,20 @@ +{ + "lockfile_version": "1", + "packages": { + "binutils@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#binutils", + "version": "2.40" + }, + "jdk@19": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#jdk", + "version": "19.0.2+7" + }, + "maven@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#maven", + "version": "3.8.6" + } + } +} \ No newline at end of file diff --git a/examples/development/nim/spinnytest/devbox.json b/examples/development/nim/spinnytest/devbox.json index 344d9cdccec..92f5b391a8d 100644 --- a/examples/development/nim/spinnytest/devbox.json +++ b/examples/development/nim/spinnytest/devbox.json @@ -1,8 +1,8 @@ { "packages": [ - "nim", - "nimble-unwrapped", - "openssl_1_1" + "nim@1.6.12", + "nimble-unwrapped@0.14", + "openssl_1_1@latest" ], "shell": { "init_hook": null, diff --git a/examples/development/nim/spinnytest/devbox.lock b/examples/development/nim/spinnytest/devbox.lock new file mode 100644 index 00000000000..93447c29111 --- /dev/null +++ b/examples/development/nim/spinnytest/devbox.lock @@ -0,0 +1,20 @@ +{ + "lockfile_version": "1", + "packages": { + "nim@1.6.12": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#nim", + "version": "1.6.12" + }, + "nimble-unwrapped@0.14": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#nimble-unwrapped", + "version": "0.14.2" + }, + "openssl_1_1@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#openssl_1_1", + "version": "1.1.1t" + } + } +} \ No newline at end of file diff --git a/examples/development/nodejs/nodejs-npm/devbox.json b/examples/development/nodejs/nodejs-npm/devbox.json index 90d5756b58d..14253e7eb4a 100644 --- a/examples/development/nodejs/nodejs-npm/devbox.json +++ b/examples/development/nodejs/nodejs-npm/devbox.json @@ -1,6 +1,6 @@ { "packages": [ - "nodejs" + "nodejs@19.8" ], "shell": { "init_hook": [ diff --git a/examples/development/nodejs/nodejs-npm/devbox.lock b/examples/development/nodejs/nodejs-npm/devbox.lock new file mode 100644 index 00000000000..87a783d3d86 --- /dev/null +++ b/examples/development/nodejs/nodejs-npm/devbox.lock @@ -0,0 +1,10 @@ +{ + "lockfile_version": "1", + "packages": { + "nodejs@19.8": { + "last_modified": "2023-03-31T22:52:29Z", + "resolved": "github:NixOS/nixpkgs/242246ee1e58f54d2322227fc5eef53b4a616a31#nodejs-19_x", + "version": "19.8.1" + } + } +} \ No newline at end of file diff --git a/examples/development/nodejs/nodejs-typescript/devbox.json b/examples/development/nodejs/nodejs-typescript/devbox.json index b6b7a46a7b5..53bfc579b91 100644 --- a/examples/development/nodejs/nodejs-typescript/devbox.json +++ b/examples/development/nodejs/nodejs-typescript/devbox.json @@ -1,6 +1,6 @@ { "packages": [ - "nodejs-18_x", + "nodejs@18.16", "nodePackages.typescript" ], "shell": { diff --git a/examples/development/nodejs/nodejs-typescript/devbox.lock b/examples/development/nodejs/nodejs-typescript/devbox.lock new file mode 100644 index 00000000000..95a0d41ceee --- /dev/null +++ b/examples/development/nodejs/nodejs-typescript/devbox.lock @@ -0,0 +1,13 @@ +{ + "lockfile_version": "1", + "packages": { + "nodePackages.typescript": { + "resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#nodePackages.typescript" + }, + "nodejs@18.16": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#nodejs_18", + "version": "18.16.0" + } + } +} \ No newline at end of file diff --git a/examples/development/nodejs/nodejs-typescript/index.ts b/examples/development/nodejs/nodejs-typescript/index.ts index 5dec25c8dbd..458125aa37d 100644 --- a/examples/development/nodejs/nodejs-typescript/index.ts +++ b/examples/development/nodejs/nodejs-typescript/index.ts @@ -1,4 +1,6 @@ const NODE_MAJOR_VERSION = process.versions.node.split('.')[0]; if (NODE_MAJOR_VERSION !== "18") { throw new Error('Node version is not 18'); +} else { + console.log('Node version is 18'); } diff --git a/examples/development/nodejs/nodejs-typescript/yarn.lock b/examples/development/nodejs/nodejs-typescript/yarn.lock index 4d336c04a84..503bf558aaf 100644 --- a/examples/development/nodejs/nodejs-typescript/yarn.lock +++ b/examples/development/nodejs/nodejs-typescript/yarn.lock @@ -3,11 +3,11 @@ "@types/node@^18.7.18": - "integrity" "sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg==" - "resolved" "https://registry.npmjs.org/@types/node/-/node-18.7.18.tgz" - "version" "18.7.18" + version "18.7.18" + resolved "https://registry.npmjs.org/@types/node/-/node-18.7.18.tgz" + integrity sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg== -"typescript@^4.6.4": - "integrity" "sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==" - "resolved" "https://registry.npmjs.org/typescript/-/typescript-4.8.3.tgz" - "version" "4.8.3" +typescript@^4.6.4: + version "4.8.3" + resolved "https://registry.npmjs.org/typescript/-/typescript-4.8.3.tgz" + integrity sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig== diff --git a/examples/development/nodejs/nodejs-yarn/devbox.json b/examples/development/nodejs/nodejs-yarn/devbox.json index 9d5a09caefb..cdeee6500dc 100644 --- a/examples/development/nodejs/nodejs-yarn/devbox.json +++ b/examples/development/nodejs/nodejs-yarn/devbox.json @@ -1,7 +1,7 @@ { "packages": [ - "nodejs", - "yarn" + "nodejs@19.8", + "yarn@1.22" ], "shell": { "init_hook": null diff --git a/examples/development/nodejs/nodejs-yarn/devbox.lock b/examples/development/nodejs/nodejs-yarn/devbox.lock new file mode 100644 index 00000000000..85005e3e670 --- /dev/null +++ b/examples/development/nodejs/nodejs-yarn/devbox.lock @@ -0,0 +1,15 @@ +{ + "lockfile_version": "1", + "packages": { + "nodejs@19.8": { + "last_modified": "2023-03-31T22:52:29Z", + "resolved": "github:NixOS/nixpkgs/242246ee1e58f54d2322227fc5eef53b4a616a31#nodejs-19_x", + "version": "19.8.1" + }, + "yarn@1.22": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#yarn", + "version": "1.22.19" + } + } +} \ No newline at end of file diff --git a/examples/development/nodejs/nodejs-yarn/package-lock.json b/examples/development/nodejs/nodejs-yarn/package-lock.json new file mode 100644 index 00000000000..d0c67cc425b --- /dev/null +++ b/examples/development/nodejs/nodejs-yarn/package-lock.json @@ -0,0 +1,10 @@ +{ + "name": "nodejs-yarn", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "nodejs-yarn" + } + } +} diff --git a/examples/development/python/pip/devbox.json b/examples/development/python/pip/devbox.json index 2baf02af1e0..8eeca6dd219 100644 --- a/examples/development/python/pip/devbox.json +++ b/examples/development/python/pip/devbox.json @@ -1,7 +1,7 @@ { "packages": [ "python310", - "python310Packages.pip" + "python310Packages.pip@23.0.1" ], "shell": { "init_hook": [ diff --git a/examples/development/python/pip/devbox.lock b/examples/development/python/pip/devbox.lock index f0bbc9f018c..d31226d1663 100644 --- a/examples/development/python/pip/devbox.lock +++ b/examples/development/python/pip/devbox.lock @@ -2,14 +2,12 @@ "lockfile_version": "1", "packages": { "python310": { - "last_modified": "", - "resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#python310", - "version": "" + "resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#python310" }, - "python310Packages.pip": { - "last_modified": "", - "resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#python310Packages.pip", - "version": "" + "python310Packages.pip@23.0.1": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#python310Packages.pip", + "version": "23.0.1" } } } \ No newline at end of file diff --git a/examples/development/python/pipenv/devbox.json b/examples/development/python/pipenv/devbox.json index 1345ffd4d7b..9e9def315d0 100644 --- a/examples/development/python/pipenv/devbox.json +++ b/examples/development/python/pipenv/devbox.json @@ -1,7 +1,7 @@ { "packages": [ - "pipenv", - "python310" + "pipenv@latest", + "python@3.10" ], "shell": { "init_hook": [ diff --git a/examples/development/python/poetry/poetry-demo/devbox.json b/examples/development/python/poetry/poetry-demo/devbox.json index a77b6bb96ee..71860f2a8f4 100644 --- a/examples/development/python/poetry/poetry-demo/devbox.json +++ b/examples/development/python/poetry/poetry-demo/devbox.json @@ -1,7 +1,7 @@ { "packages": [ - "python310", - "poetry" + "python@3.10", + "poetry@1.4" ], "shell": { "init_hook": [ diff --git a/examples/development/ruby/.envrc b/examples/development/ruby/.envrc index 7108975b132..84fc8e53614 100644 --- a/examples/development/ruby/.envrc +++ b/examples/development/ruby/.envrc @@ -1,15 +1,7 @@ # Automatically sets up your devbox environment whenever you cd into this # directory via our direnv integration: -use_devbox() { - watch_file devbox.json - if [ -f .devbox/gen/flake/flake.nix ]; then - DEVBOX_SHELL_ENABLED_BACKUP=$DEVBOX_SHELL_ENABLED - eval "$(devbox shellenv --init-hook)" - export DEVBOX_SHELL_ENABLED=$DEVBOX_SHELL_ENABLED_BACKUP - fi -} -use devbox +eval "$(devbox generate direnv --print-envrc)" # check out https://www.jetpack.io/devbox/docs/ide_configuration/direnv/ # for more details diff --git a/examples/development/ruby/devbox.json b/examples/development/ruby/devbox.json index e988d931232..599975c1954 100644 --- a/examples/development/ruby/devbox.json +++ b/examples/development/ruby/devbox.json @@ -1,12 +1,12 @@ { - "packages": [ - "bundler", - "ruby_3_1" - ], - "shell": { - "init_hook": [], - "scripts": { - "run_test": "ruby -e 'puts \"Hello from Ruby #{RUBY_VERSION}\"'" - } + "packages": [ + "bundler@2.4", + "ruby@3.1" + ], + "shell": { + "init_hook": [], + "scripts": { + "run_test": "ruby -e 'puts \"Hello from Ruby #{RUBY_VERSION}\"'" } -} \ No newline at end of file + } +} diff --git a/examples/development/ruby/devbox.lock b/examples/development/ruby/devbox.lock new file mode 100644 index 00000000000..263b0070fdf --- /dev/null +++ b/examples/development/ruby/devbox.lock @@ -0,0 +1,19 @@ +{ + "lockfile_version": "1", + "packages": { + "bundler": { + "resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#bundler" + }, + "bundler@2.4": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#bundler", + "version": "2.4.12" + }, + "ruby@3.1": { + "last_modified": "2023-05-01T16:53:22Z", + "plugin_version": "0.0.1", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#ruby", + "version": "3.1.4" + } + } +} \ No newline at end of file diff --git a/examples/development/rust/rust-stable-hello-world/devbox.json b/examples/development/rust/rust-stable-hello-world/devbox.json index d3a4c3b7434..738096f684e 100644 --- a/examples/development/rust/rust-stable-hello-world/devbox.json +++ b/examples/development/rust/rust-stable-hello-world/devbox.json @@ -1,7 +1,7 @@ { "packages": [ - "rustup", - "libiconv" + "rustup@latest", + "libiconv@latest" ], "env": { "PROJECT_DIR": "$PWD" diff --git a/examples/development/rust/rust-stable-hello-world/devbox.lock b/examples/development/rust/rust-stable-hello-world/devbox.lock new file mode 100644 index 00000000000..308ef6c34fa --- /dev/null +++ b/examples/development/rust/rust-stable-hello-world/devbox.lock @@ -0,0 +1,15 @@ +{ + "lockfile_version": "1", + "packages": { + "libiconv@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#libiconv", + "version": "2.37" + }, + "rustup@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#rustup", + "version": "1.25.2" + } + } +} \ No newline at end of file diff --git a/examples/development/zig/zig-hello-world/devbox.json b/examples/development/zig/zig-hello-world/devbox.json index 06c133e4e12..2c754f48b4e 100644 --- a/examples/development/zig/zig-hello-world/devbox.json +++ b/examples/development/zig/zig-hello-world/devbox.json @@ -1,6 +1,6 @@ { "packages": [ - "zig" + "zig@0.10" ], "shell": { "init_hook": null, diff --git a/examples/stacks/drupal/devbox.d/php81/php-fpm.conf b/examples/flakes/php/devbox.d/php/php-fpm.conf similarity index 100% rename from examples/stacks/drupal/devbox.d/php81/php-fpm.conf rename to examples/flakes/php/devbox.d/php/php-fpm.conf diff --git a/examples/stacks/drupal/devbox.d/php81/php.ini b/examples/flakes/php/devbox.d/php/php.ini similarity index 88% rename from examples/stacks/drupal/devbox.d/php81/php.ini rename to examples/flakes/php/devbox.d/php/php.ini index 86cf48272e6..b4626d503ab 100644 --- a/examples/stacks/drupal/devbox.d/php81/php.ini +++ b/examples/flakes/php/devbox.d/php/php.ini @@ -2,5 +2,5 @@ ; Put your php.ini directives here. For the latest default php.ini file, see https://github.com/php/php-src/blob/master/php.ini-production -memory_limit = 512M +; memory_limit = 128M ; expose_php = Off diff --git a/examples/flakes/php/devbox.json b/examples/flakes/php/devbox.json index d7c8bc7f2c7..586f8cc1311 100644 --- a/examples/flakes/php/devbox.json +++ b/examples/flakes/php/devbox.json @@ -11,8 +11,5 @@ }, "nixpkgs": { "commit": "f80ac848e3d6f0c12c52758c0f25c10c97ca3b62" - }, - "include": [ - "plugin:php" - ] + } } diff --git a/examples/flakes/php/devbox.lock b/examples/flakes/php/devbox.lock new file mode 100644 index 00000000000..492a5466a25 --- /dev/null +++ b/examples/flakes/php/devbox.lock @@ -0,0 +1,4 @@ +{ + "lockfile_version": "1", + "packages": {} +} \ No newline at end of file diff --git a/examples/flakes/php/my-php-flake/flake.nix b/examples/flakes/php/my-php-flake/flake.nix index b3b0e0a3df5..c897e4193b0 100644 --- a/examples/flakes/php/my-php-flake/flake.nix +++ b/examples/flakes/php/my-php-flake/flake.nix @@ -15,7 +15,7 @@ packages = { # Flakes can export multiple packages. To include specific packages in # devbox.json you can use url fragments (e.g. path:my-flake#my-package) - php = pkgs.php.withExtensions ({ enabled, all }: enabled ++ (with all; [ ds memcached ])); + php = pkgs.php.withExtensions ({ enabled, all }: enabled ++ (with all; [ ds ])); hello = pkgs.hello; # If you only want to export a single package, you can name it default which allows diff --git a/examples/servers/apache/devbox.d/apacheHttpd/apache.pid b/examples/servers/apache/devbox.d/apacheHttpd/apache.pid deleted file mode 100644 index 03d21207443..00000000000 --- a/examples/servers/apache/devbox.d/apacheHttpd/apache.pid +++ /dev/null @@ -1 +0,0 @@ -8114 diff --git a/examples/servers/apache/devbox.json b/examples/servers/apache/devbox.json index acd97cece78..1df851080c1 100644 --- a/examples/servers/apache/devbox.json +++ b/examples/servers/apache/devbox.json @@ -1,8 +1,6 @@ { "packages": [ - "apacheHttpd", - "tree", - "pulumi-bin" + "apacheHttpd@latest" ], "shell": { "init_hook": [] diff --git a/examples/servers/apache/devbox.lock b/examples/servers/apache/devbox.lock new file mode 100644 index 00000000000..cad26c5f056 --- /dev/null +++ b/examples/servers/apache/devbox.lock @@ -0,0 +1,10 @@ +{ + "lockfile_version": "1", + "packages": { + "apacheHttpd@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#apacheHttpd", + "version": "2.4.57" + } + } +} \ No newline at end of file diff --git a/examples/servers/caddy/devbox.json b/examples/servers/caddy/devbox.json index 8ee96798eff..79629270f56 100644 --- a/examples/servers/caddy/devbox.json +++ b/examples/servers/caddy/devbox.json @@ -1,6 +1,6 @@ { "packages": [ - "caddy" + "caddy@latest" ], "shell": { "init_hook": null diff --git a/examples/servers/caddy/devbox.lock b/examples/servers/caddy/devbox.lock new file mode 100644 index 00000000000..1d3aa331e3b --- /dev/null +++ b/examples/servers/caddy/devbox.lock @@ -0,0 +1,10 @@ +{ + "lockfile_version": "1", + "packages": { + "caddy@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#caddy", + "version": "2.6.4" + } + } +} \ No newline at end of file diff --git a/examples/servers/nginx/.envrc b/examples/servers/nginx/.envrc index 7108975b132..84fc8e53614 100644 --- a/examples/servers/nginx/.envrc +++ b/examples/servers/nginx/.envrc @@ -1,15 +1,7 @@ # Automatically sets up your devbox environment whenever you cd into this # directory via our direnv integration: -use_devbox() { - watch_file devbox.json - if [ -f .devbox/gen/flake/flake.nix ]; then - DEVBOX_SHELL_ENABLED_BACKUP=$DEVBOX_SHELL_ENABLED - eval "$(devbox shellenv --init-hook)" - export DEVBOX_SHELL_ENABLED=$DEVBOX_SHELL_ENABLED_BACKUP - fi -} -use devbox +eval "$(devbox generate direnv --print-envrc)" # check out https://www.jetpack.io/devbox/docs/ide_configuration/direnv/ # for more details diff --git a/examples/servers/nginx/devbox.json b/examples/servers/nginx/devbox.json index 22d61b25eec..a6608c63b8d 100644 --- a/examples/servers/nginx/devbox.json +++ b/examples/servers/nginx/devbox.json @@ -1,6 +1,6 @@ { "packages": [ - "nginx" + "nginx@latest" ], "shell": { "init_hook": null diff --git a/examples/servers/nginx/devbox.lock b/examples/servers/nginx/devbox.lock new file mode 100644 index 00000000000..aae75c8e6a1 --- /dev/null +++ b/examples/servers/nginx/devbox.lock @@ -0,0 +1,10 @@ +{ + "lockfile_version": "1", + "packages": { + "nginx@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#nginx", + "version": "1.24.0" + } + } +} \ No newline at end of file diff --git a/examples/stacks/django/devbox.json b/examples/stacks/django/devbox.json index c577b182918..b428c7d543a 100644 --- a/examples/stacks/django/devbox.json +++ b/examples/stacks/django/devbox.json @@ -1,9 +1,9 @@ { "packages": [ "python310", - "openssl", + "openssl@latest", "python310Packages.pip", - "postgresql" + "postgresql@latest" ], "env": { "PGPORT": "5434" @@ -28,7 +28,7 @@ "server": [ "python todo_project/manage.py runserver" ], - "run_test": [ + "test": [ "initdb", "devbox services start", "devbox run create_db", diff --git a/examples/stacks/django/devbox.lock b/examples/stacks/django/devbox.lock index beedfba5498..5b087153ae5 100644 --- a/examples/stacks/django/devbox.lock +++ b/examples/stacks/django/devbox.lock @@ -2,24 +2,28 @@ "lockfile_version": "1", "packages": { "openssl": { - "last_modified": "", - "resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#openssl", - "version": "" + "resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#openssl" + }, + "openssl@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#openssl", + "version": "3.0.8" }, "postgresql": { - "last_modified": "", - "resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#postgresql", - "version": "" + "resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#postgresql" + }, + "postgresql@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#postgresql", + "version": "14.7" }, "python310": { - "last_modified": "", - "resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#python310", - "version": "" + "plugin_version": "0.0.1", + "resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#python310" }, "python310Packages.pip": { - "last_modified": "", - "resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#python310Packages.pip", - "version": "" + "plugin_version": "0.0.1", + "resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#python310Packages.pip" } } } \ No newline at end of file diff --git a/examples/stacks/drupal/devbox.d/mysql/mysql.sh b/examples/stacks/drupal/devbox.d/mysql/mysql.sh deleted file mode 100755 index 9c4b6cb0d5c..00000000000 --- a/examples/stacks/drupal/devbox.d/mysql/mysql.sh +++ /dev/null @@ -1,17 +0,0 @@ -#! /bin/bash - - set -eux - alias mysql='mysql -u root' - - if [ ! -d "$MYSQL_DATADIR" ]; then - # Make sure to use normal authentication method otherwise we can only - # connect with unix account. But users do not actually exists in nix. - mysql_install_db --auth-root-authentication-method=normal \ - --datadir=$MYSQL_DATADIR --basedir=$MYSQL_BASEDIR \ - --pid-file=$MYSQL_PID_FILE - fi - - # Starts the daemon - mysqld --datadir=$MYSQL_DATADIR --pid-file=$MYSQL_PID_FILE \ - --socket=$MYSQL_UNIX_PORT 2> $MYSQL_HOME/mysql.log & MYSQL_PID=$! - \ No newline at end of file diff --git a/examples/stacks/drupal/devbox.d/mysql/set-env.sh b/examples/stacks/drupal/devbox.d/mysql/set-env.sh deleted file mode 100644 index d8ebd96c0b6..00000000000 --- a/examples/stacks/drupal/devbox.d/mysql/set-env.sh +++ /dev/null @@ -1,6 +0,0 @@ -#! bash -export MYSQL_BASEDIR=$(which mariadb | sed -r "s/\/bin\/mariadb//g") -export MYSQL_HOME=$PWD/devbox.d/mysql -export MYSQL_DATADIR=$MYSQL_HOME/data -export MYSQL_UNIX_PORT=$MYSQL_HOME/mysql.sock -export MYSQL_PID_FILE=$MYSQL_HOME/mysql.pid \ No newline at end of file diff --git a/examples/stacks/drupal/devbox.d/mysql/set-exit.sh b/examples/stacks/drupal/devbox.d/mysql/set-exit.sh deleted file mode 100644 index 9311480bd0f..00000000000 --- a/examples/stacks/drupal/devbox.d/mysql/set-exit.sh +++ /dev/null @@ -1,5 +0,0 @@ - finish() - { - mysqladmin -u root --socket=$MYSQL_UNIX_PORT shutdown - } - trap finish EXIT SIGHUP \ No newline at end of file diff --git a/examples/stacks/lapp-stack/devbox.d/php81/php-fpm.conf b/examples/stacks/drupal/devbox.d/php/php-fpm.conf similarity index 100% rename from examples/stacks/lapp-stack/devbox.d/php81/php-fpm.conf rename to examples/stacks/drupal/devbox.d/php/php-fpm.conf diff --git a/examples/stacks/drupal/devbox.d/php/php.ini b/examples/stacks/drupal/devbox.d/php/php.ini new file mode 100644 index 00000000000..b4626d503ab --- /dev/null +++ b/examples/stacks/drupal/devbox.d/php/php.ini @@ -0,0 +1,6 @@ +[php] + +; Put your php.ini directives here. For the latest default php.ini file, see https://github.com/php/php-src/blob/master/php.ini-production + +; memory_limit = 128M +; expose_php = Off diff --git a/examples/stacks/drupal/devbox.json b/examples/stacks/drupal/devbox.json index c59c522ca7e..9481c7498c8 100644 --- a/examples/stacks/drupal/devbox.json +++ b/examples/stacks/drupal/devbox.json @@ -1,34 +1,20 @@ { "packages": [ - "mariadb", - "git", - "php81", - "php81Packages.composer", - "nginx" + "git@latest", + "php@8.1", + "php81Packages.composer@latest", + "nginx@latest", + "mariadb@latest" ], - "env": { - "PHPRC": "$PWD/devbox.d/php81" - }, "shell": { - "init_hook": [ - "source devbox.d/mysql/set-env.sh" - ], + "init_hook": [], "scripts": { "run_test": [ - "devbox.d/mysql/mysql.sh", "devbox services up -b", + "echo 'Waiting for services to start' && sleep 2", "./install-drupal.sh", "curl localhost:8000", - "devbox services stop", - "mysqladmin -u root --socket=$MYSQL_UNIX_PORT shutdown" - ], - "start_services": [ - "devbox.d/mysql/mysql.sh", - "devbox services up" - ], - "stop_services": [ - "devbox services stop", - "mysqladmin -u root --socket=$MYSQL_UNIX_PORT shutdown" + "devbox services stop" ] } } diff --git a/examples/stacks/drupal/devbox.lock b/examples/stacks/drupal/devbox.lock index 80d8213eda9..b28102e2b06 100644 --- a/examples/stacks/drupal/devbox.lock +++ b/examples/stacks/drupal/devbox.lock @@ -4,19 +4,48 @@ "git": { "resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#git" }, + "git@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#git", + "version": "2.40.1" + }, "mariadb": { + "plugin_version": "0.0.1", "resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#mariadb" }, + "mariadb@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "plugin_version": "0.0.1", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#mariadb", + "version": "10.6.12" + }, "nginx": { "plugin_version": "0.0.1", "resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#nginx" }, + "nginx@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "plugin_version": "0.0.1", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#nginx", + "version": "1.24.0" + }, "php81": { "plugin_version": "0.0.1", "resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#php81" }, "php81Packages.composer": { "resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#php81Packages.composer" + }, + "php81Packages.composer@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#php81Packages.composer", + "version": "2.5.5" + }, + "php@8.1": { + "last_modified": "2023-05-01T16:53:22Z", + "plugin_version": "0.0.1", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#php", + "version": "8.1.18" } } } \ No newline at end of file diff --git a/examples/stacks/jekyll/.envrc b/examples/stacks/jekyll/.envrc index 7108975b132..84fc8e53614 100644 --- a/examples/stacks/jekyll/.envrc +++ b/examples/stacks/jekyll/.envrc @@ -1,15 +1,7 @@ # Automatically sets up your devbox environment whenever you cd into this # directory via our direnv integration: -use_devbox() { - watch_file devbox.json - if [ -f .devbox/gen/flake/flake.nix ]; then - DEVBOX_SHELL_ENABLED_BACKUP=$DEVBOX_SHELL_ENABLED - eval "$(devbox shellenv --init-hook)" - export DEVBOX_SHELL_ENABLED=$DEVBOX_SHELL_ENABLED_BACKUP - fi -} -use devbox +eval "$(devbox generate direnv --print-envrc)" # check out https://www.jetpack.io/devbox/docs/ide_configuration/direnv/ # for more details diff --git a/examples/stacks/jekyll/devbox.json b/examples/stacks/jekyll/devbox.json index 769161698b0..13e58c673b4 100644 --- a/examples/stacks/jekyll/devbox.json +++ b/examples/stacks/jekyll/devbox.json @@ -1,8 +1,8 @@ { "packages": [ - "bundler", - "ruby_3_1", - "libffi" + "bundler@latest", + "ruby@3.1", + "libffi@latest" ], "shell": { "init_hook": [], @@ -26,4 +26,4 @@ ] } } -} \ No newline at end of file +} diff --git a/examples/stacks/jekyll/devbox.lock b/examples/stacks/jekyll/devbox.lock new file mode 100644 index 00000000000..4dbd10d39d2 --- /dev/null +++ b/examples/stacks/jekyll/devbox.lock @@ -0,0 +1,20 @@ +{ + "lockfile_version": "1", + "packages": { + "bundler@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#bundler", + "version": "2.4.12" + }, + "libffi@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#libffi", + "version": "3.4.4" + }, + "ruby@3.1": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#ruby", + "version": "3.1.4" + } + } +} \ No newline at end of file diff --git a/examples/stacks/jekyll/myblog/Gemfile.lock b/examples/stacks/jekyll/myblog/Gemfile.lock index b59c3d1dab2..8a8084a2265 100644 --- a/examples/stacks/jekyll/myblog/Gemfile.lock +++ b/examples/stacks/jekyll/myblog/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.1) + addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) colorator (1.1.0) concurrent-ruby (1.2.2) @@ -12,7 +12,7 @@ GEM ffi (1.15.5) forwardable-extended (2.6.0) http_parser.rb (0.8.0) - i18n (1.12.0) + i18n (1.13.0) concurrent-ruby (~> 1.0) jekyll (3.9.3) addressable (~> 2.4) @@ -65,7 +65,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.11) thread_safe (~> 0.1) - tzinfo-data (1.2022.7) + tzinfo-data (1.2023.3) tzinfo (>= 1.0.0) wdm (0.1.1) webrick (1.8.1) @@ -89,4 +89,4 @@ DEPENDENCIES webrick (~> 1.8) BUNDLED WITH - 2.4.5 + 2.4.12 diff --git a/examples/stacks/lapp-stack/devbox.d/apacheHttpd/httpd.conf b/examples/stacks/lapp-stack/devbox.d/apache/httpd.conf similarity index 100% rename from examples/stacks/lapp-stack/devbox.d/apacheHttpd/httpd.conf rename to examples/stacks/lapp-stack/devbox.d/apache/httpd.conf diff --git a/examples/stacks/lepp-stack/devbox.d/php81/php-fpm.conf b/examples/stacks/lapp-stack/devbox.d/php/php-fpm.conf similarity index 100% rename from examples/stacks/lepp-stack/devbox.d/php81/php-fpm.conf rename to examples/stacks/lapp-stack/devbox.d/php/php-fpm.conf diff --git a/examples/stacks/lapp-stack/devbox.d/php/php.ini b/examples/stacks/lapp-stack/devbox.d/php/php.ini new file mode 100644 index 00000000000..b4626d503ab --- /dev/null +++ b/examples/stacks/lapp-stack/devbox.d/php/php.ini @@ -0,0 +1,6 @@ +[php] + +; Put your php.ini directives here. For the latest default php.ini file, see https://github.com/php/php-src/blob/master/php.ini-production + +; memory_limit = 128M +; expose_php = Off diff --git a/examples/stacks/lapp-stack/devbox.json b/examples/stacks/lapp-stack/devbox.json index 55ce04b6245..a63080926c2 100644 --- a/examples/stacks/lapp-stack/devbox.json +++ b/examples/stacks/lapp-stack/devbox.json @@ -1,10 +1,10 @@ { "packages": [ - "curl", - "postgresql", - "php81", - "php81Extensions.pgsql", - "apacheHttpd" + "curl@8.0", + "postgresql@14", + "php@8.1", + "php81Extensions.pgsql@latest", + "apache@2.4" ], "env": { "PGPORT": "5432" diff --git a/examples/stacks/lapp-stack/devbox.lock b/examples/stacks/lapp-stack/devbox.lock new file mode 100644 index 00000000000..0e9159bc4c8 --- /dev/null +++ b/examples/stacks/lapp-stack/devbox.lock @@ -0,0 +1,30 @@ +{ + "lockfile_version": "1", + "packages": { + "apache@2.4": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#apacheHttpd", + "version": "2.4.57" + }, + "curl@8.0": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#curl", + "version": "8.0.1" + }, + "php81Extensions.pgsql@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#php81Extensions.pgsql", + "version": "8.1.18" + }, + "php@8.1": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#php", + "version": "8.1.18" + }, + "postgresql@14": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#postgresql", + "version": "14.7" + } + } +} \ No newline at end of file diff --git a/examples/stacks/lepp-stack/devbox.d/php/php-fpm.conf b/examples/stacks/lepp-stack/devbox.d/php/php-fpm.conf new file mode 100644 index 00000000000..b9359574722 --- /dev/null +++ b/examples/stacks/lepp-stack/devbox.d/php/php-fpm.conf @@ -0,0 +1,17 @@ +[global] +pid = ${PHPFPM_PID_FILE} +error_log = ${PHPFPM_ERROR_LOG_FILE} +daemonize = yes + +[www] +; user = www-data +; group = www-data +listen = 127.0.0.1:${PHPFPM_PORT} +; listen.owner = www-data +; listen.group = www-data +pm = dynamic +pm.max_children = 5 +pm.start_servers = 2 +pm.min_spare_servers = 1 +pm.max_spare_servers = 3 +chdir = / diff --git a/examples/stacks/lepp-stack/devbox.d/php/php.ini b/examples/stacks/lepp-stack/devbox.d/php/php.ini new file mode 100644 index 00000000000..b4626d503ab --- /dev/null +++ b/examples/stacks/lepp-stack/devbox.d/php/php.ini @@ -0,0 +1,6 @@ +[php] + +; Put your php.ini directives here. For the latest default php.ini file, see https://github.com/php/php-src/blob/master/php.ini-production + +; memory_limit = 128M +; expose_php = Off diff --git a/examples/stacks/lepp-stack/devbox.json b/examples/stacks/lepp-stack/devbox.json index 07ecf70530f..6a95b420936 100644 --- a/examples/stacks/lepp-stack/devbox.json +++ b/examples/stacks/lepp-stack/devbox.json @@ -1,10 +1,10 @@ { "packages": [ - "curl", - "postgresql", - "php81", - "nginx", - "php81Extensions.pgsql" + "curl@8.0", + "postgresql@14", + "php@8.1", + "php81Extensions.pgsql@latest", + "nginx@1.24" ], "env": { "PGPORT": "5433" @@ -19,8 +19,8 @@ ], "run_test": [ "devbox run init_db", - "devbox services start", - "echo 'sleep 1 second for the postgres server to initialize.' && sleep 1", + "devbox services up -b", + "echo 'sleep 2 second for the postgres server to initialize.' && sleep 2", "devbox run create_db", "curl localhost:8089", "devbox services stop" diff --git a/examples/stacks/lepp-stack/devbox.lock b/examples/stacks/lepp-stack/devbox.lock new file mode 100644 index 00000000000..5e088951a74 --- /dev/null +++ b/examples/stacks/lepp-stack/devbox.lock @@ -0,0 +1,33 @@ +{ + "lockfile_version": "1", + "packages": { + "curl@8.0": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#curl", + "version": "8.0.1" + }, + "nginx@1.24": { + "last_modified": "2023-05-01T16:53:22Z", + "plugin_version": "0.0.1", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#nginx", + "version": "1.24.0" + }, + "php81Extensions.pgsql@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#php81Extensions.pgsql", + "version": "8.1.18" + }, + "php@8.1": { + "last_modified": "2023-05-01T16:53:22Z", + "plugin_version": "0.0.1", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#php", + "version": "8.1.18" + }, + "postgresql@14": { + "last_modified": "2023-05-01T16:53:22Z", + "plugin_version": "0.0.1", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#postgresql", + "version": "14.7" + } + } +} \ No newline at end of file diff --git a/examples/stacks/lepp-stack/my_app/index.php b/examples/stacks/lepp-stack/my_app/index.php index 1511e202888..9a1f12c9a26 100644 --- a/examples/stacks/lepp-stack/my_app/index.php +++ b/examples/stacks/lepp-stack/my_app/index.php @@ -2,7 +2,7 @@ include 'config.php'; -$dbconn = pg_connect("host=$db_hostname dbname=$db_database user=$db_username password=$db_password") +$dbconn = pg_connect("host=$db_hostname dbname=$db_database user=$db_username password=$db_password port=$db_port") or die('Could not connect: ' . pg_last_error()); // Check if the form has been submitted @@ -13,7 +13,7 @@ $last_name = $_POST['last_name']; $phone = $_POST['phone']; $email = $_POST['email']; - + // Insert the new record into the database $query = "INSERT INTO address_book (first_name, last_name, phone, email,) VALUES ('$first_name', '$last_name', '$phone', '$email')"; $result = pg_query($dbconn, $query); @@ -21,16 +21,16 @@ die("Error: " . pg_last_error($dbconn)); } } - + // Query the database for all records $query = "SELECT * FROM address_book ORDER BY last_name, first_name"; $result = pg_query($dbconn, $query); if (!$result) { die("Error: " . pg_last_error($dbconn)); } - + ?> - +

@@ -43,7 +43,7 @@
- + @@ -59,9 +59,9 @@
- + 7.0.4" diff --git a/examples/stacks/rails/blog/Gemfile.lock b/examples/stacks/rails/blog/Gemfile.lock index 4143dd5d764..0d1111cc859 100644 --- a/examples/stacks/rails/blog/Gemfile.lock +++ b/examples/stacks/rails/blog/Gemfile.lock @@ -233,7 +233,7 @@ DEPENDENCIES webdrivers RUBY VERSION - ruby 3.1.2p20 + ruby 3.1.4p223 BUNDLED WITH 2.3.11 diff --git a/examples/stacks/rails/devbox.json b/examples/stacks/rails/devbox.json index f2dbd2496d0..8236d0d55df 100644 --- a/examples/stacks/rails/devbox.json +++ b/examples/stacks/rails/devbox.json @@ -1,11 +1,11 @@ { "packages": [ - "ruby_3_1", - "bundler", - "nodejs-19_x", - "yarn", - "curl", - "sqlite" + "ruby@3.1", + "bundler@latest", + "nodejs@19", + "yarn@latest", + "curl@latest", + "sqlite@latest" ], "shell": { "init_hook": [ diff --git a/examples/stacks/rails/devbox.lock b/examples/stacks/rails/devbox.lock new file mode 100644 index 00000000000..6b12f31a60b --- /dev/null +++ b/examples/stacks/rails/devbox.lock @@ -0,0 +1,36 @@ +{ + "lockfile_version": "1", + "packages": { + "bundler@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#bundler", + "version": "2.4.12" + }, + "curl@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#curl", + "version": "8.0.1" + }, + "nodejs@19": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#nodejs_19", + "version": "19.9.0" + }, + "ruby@3.1": { + "last_modified": "2023-05-01T16:53:22Z", + "plugin_version": "0.0.1", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#ruby", + "version": "3.1.4" + }, + "sqlite@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#sqlite", + "version": "3.41.2" + }, + "yarn@latest": { + "last_modified": "2023-05-01T16:53:22Z", + "resolved": "github:NixOS/nixpkgs/8670e496ffd093b60e74e7fa53526aa5920d09eb#yarn", + "version": "1.22.19" + } + } +} \ No newline at end of file