opentofu: 1.11.8 -> 1.12.0 (#522163)

This commit is contained in:
zowoq
2026-05-26 22:17:23 +00:00
committed by GitHub
3 changed files with 28 additions and 27 deletions
+4 -4
View File
@@ -16,16 +16,16 @@
let
package = buildGoModule rec {
pname = "opentofu";
version = "1.11.8";
version = "1.12.0";
src = fetchFromGitHub {
owner = "opentofu";
repo = "opentofu";
tag = "v${version}";
hash = "sha256-0lsx+tLo/m7crkRLOtASwLpbjnpghFrsxuwNr2d+7y0=";
hash = "sha256-ciT5GOeL+09dnwdrRpFQBAhWVvpSBQQjJKJvNdVqjCw=";
};
vendorHash = "sha256-WO5OtKwluks5nuSHJ4NO1+EKhtCrJE9MuMGmu5fYKM4=";
vendorHash = "sha256-ZcsZv4MLcrVUNoK/NewfwDWUpMdgxO/f2DkyTjUqCK4=";
ldflags = [
"-s"
"-w"
@@ -34,7 +34,7 @@ let
];
nativeBuildInputs = [ installShellFiles ];
patches = [ ./provider-path-0_15.patch ];
patches = [ ./provider-path-1_12.patch ];
passthru = {
inherit plugins;
@@ -1,23 +0,0 @@
diff -Naur terraform.old/internal/command/init.go terraform.new/internal/command/init.go
--- terraform.old/internal/command/init.go
+++ terraform.new/internal/command/init.go
@@ -3,6 +3,7 @@
import (
"context"
"fmt"
+ "os"
"log"
"strings"
@@ -55,6 +56,11 @@
var diags tfdiags.Diagnostics
+ val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR")
+ if ok {
+ flagPluginPath = append(flagPluginPath, val)
+ }
+
if len(flagPluginPath) > 0 {
c.pluginPath = flagPluginPath
}
@@ -0,0 +1,24 @@
diff --git a/internal/command/init.go b/internal/command/init.go
index cd44c899bd..bef2426475 100644
--- a/internal/command/init.go
+++ b/internal/command/init.go
@@ -8,6 +8,7 @@ package command
import (
"context"
"fmt"
+ "os"
"log"
"reflect"
"slices"
@@ -78,6 +79,11 @@ func (c *InitCommand) Run(rawArgs []string) int {
// continue to mutate the Meta object state for now.
c.Meta.input = args.ViewOptions.InputEnabled
+ val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR")
+ if ok {
+ args.FlagPluginPath = append(args.FlagPluginPath, val)
+ }
+
if len(args.FlagPluginPath) > 0 {
c.pluginPath = args.FlagPluginPath
}