Skip to content

Commit

Permalink
Merge pull request #377 from DeterminateSystems/switch-to-open-tofu
Browse files Browse the repository at this point in the history
  • Loading branch information
lucperkins authored Nov 5, 2024
2 parents fb7641c + a1496c0 commit ce7aca1
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion nix/shell/example.nix
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
};

multi = pkgs.mkShell {
packages = with pkgs; [ python39 kubectl openssl terraform ];
packages = with pkgs; [ python39 kubectl openssl opentofu ];

shellHook = ''
echo "Welcome to a very mixed Nix development environment!"
Expand Down
3 changes: 2 additions & 1 deletion src/briefs/nix-installer-differences.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The Determinate Nix Installer, from [Determinate Systems][ds], differs from the

1. It installs Nix with [flake support][flakes] and the [unified CLI][cli] feature already enabled rather than requiring users to enable those features.
1. It stores a *receipt* for the install process at `/nix/receipt.json`. This receipt enables the Determinate Nix Installer to seamlessly uninstall Nix, whereas the official Nix installation script provides no offboarding path of this kind.
1. Much like [Terraform], the Determinate Nix Installer enables you to [plan][tf-plan] your installation using the [`plan`][dni-plan] command to see how Nix Installer will change your system. We see this as an improvement over the official Nix installation script, which prompts you to approve changes but doesn't present *all* changes.
1. Much like [Terraform]/[OpenTofu], the Determinate Nix Installer enables you to [plan][tf-plan] your installation using the [`plan`][dni-plan] command to see how the installer will change your system. We see this as an improvement over the official Nix installation script, which prompts you to approve changes but doesn't present *all* changes.
1. The Determinate Nix Installer is written in [Rust] rather than a shell scripting language (the official installer is written in [Bash]). This has two key benefits:
1. It makes the Determinate Nix Installer more portable across platforms.
1. It enables the Determinate Nix Installer to parallelize CPU-intensive tasks, which can't be achieved in a language like Bash.
Expand All @@ -18,6 +18,7 @@ The Determinate Nix Installer, from [Determinate Systems][ds], differs from the
[ds]: https://determinate.systems
[flakes]: /concepts/flakes
[official]: https://nixos.org/download
[opentofu]: https://opentofu.org
[rust]: https://rust-lang.org
[terraform]: https://terraform.io
[tf-plan]: https://developer.hashicorp.com/terraform/cli/commands/plan
5 changes: 3 additions & 2 deletions src/pages/start/3.nix-develop.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ This Nix environment has several tools available:

* [Python]
* [kubectl]
* [Terraform]
* [OpenTofu]
* [OpenSSL]

As in the previous examples, you can run commands like `type python` and `type kubectl` to see that these tools are all discoverable in the [Nix store][store] and not somewhere like `/usr/bin`.
Expand Down Expand Up @@ -392,6 +392,7 @@ Probably not what you expected! What happened here? A few things:
[node.js]: https://nodejs.org
[npm]: https://npmjs.org
[openssl]: https://openssl.org
[opentofu]: https://opentofu.org
[output]: /concepts/flakes#outputs
[packages]: /concepts/packages
[path]: https://en.wikipedia.org/wiki/PATH_(variable)
Expand All @@ -404,4 +405,4 @@ Probably not what you expected! What happened here? A few things:
[sbt]: https://scala-sbt.org
[store]: /concepts/nix-store
[templates]: /concepts/flakes#templates
[terraform]: https://terraform.io

1 change: 1 addition & 0 deletions styles/config/vocabularies/Docs/accept.txt
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ offboarding
onboarding
openssh
openssl
opentofu
pandoc
pkgs
plaintext
Expand Down

0 comments on commit ce7aca1

Please sign in to comment.