terraform: 1.13.5 -> 1.14.0 (#463217)
This commit is contained in:
@@ -194,9 +194,9 @@ rec {
|
||||
mkTerraform = attrs: pluggable (generic attrs);
|
||||
|
||||
terraform_1 = mkTerraform {
|
||||
version = "1.13.5";
|
||||
hash = "sha256-F8fpTI6kPrjOM+4N67uBCpsxMLQUR6sXzTr1SYFI9Ww=";
|
||||
vendorHash = "sha256-3skDvOcDlTOv8okiGmaB0bvkoMrQjutGdvpxcradqUk=";
|
||||
version = "1.14.0";
|
||||
hash = "sha256-G9GyrwELOuzQqTMimC+z2GJUjq+c5YJDoE313JSsX5w=";
|
||||
vendorHash = "sha256-T6baxFk5lrmhyeJgcn7s5cF+utaogSQOD9S5omEKTZg=";
|
||||
patches = [ ./provider-path-0_15.patch ];
|
||||
passthru = {
|
||||
inherit plugins;
|
||||
|
||||
@@ -1,18 +1,19 @@
|
||||
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
|
||||
@@ -7,6 +7,7 @@
|
||||
"context"
|
||||
diff -Naur terraform.old/internal/command/init_run.go terraform.new/internal/command/init_run.go
|
||||
--- terraform.old/internal/command/init_run.go
|
||||
+++ terraform.new/internal/command/init_run.go
|
||||
@@ -6,6 +6,7 @@
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
+ "os"
|
||||
"log"
|
||||
"reflect"
|
||||
"sort"
|
||||
@@ -79,6 +80,11 @@
|
||||
"strings"
|
||||
|
||||
"github.com/hashicorp/hcl/v2"
|
||||
@@ -76,6 +77,11 @@
|
||||
if c.forceInitCopy {
|
||||
c.migrateState = true
|
||||
}
|
||||
|
||||
|
||||
+ val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR")
|
||||
+ if ok {
|
||||
+ initArgs.PluginPath = append(initArgs.PluginPath, val)
|
||||
|
||||
Reference in New Issue
Block a user