pyrox.dev
terraform: 1.8.5 -> 1.9.2 (#326158)
authored by James Cleverley-Prance and committed by GitHub 199a76ea bbb60ff0
+3
-3
pkgs/applications/networking/cluster/terraform/default.nix
+3
-3
pkgs/applications/networking/cluster/terraform/default.nix
···
165
165
mkTerraform = attrs: pluggable (generic attrs);
166
166
167
167
terraform_1 = mkTerraform {
168
-
version = "1.8.5";
169
-
hash = "sha256-5PzP0LUJPpOQQ8YqwBFyEFcsHF2O1uDD8Yh8wB3uJ8s=";
170
-
vendorHash = "sha256-PXA2AWq1IFmnqhhU92S9UaIYTUAAn5lsg3S7h5hBOQE=";
168
+
version = "1.9.2";
169
+
hash = "sha256-g1CsDWjwjBVfSNFZ9PRGlPlJOrqXP2eMYk1P+ohtYNU=";
170
+
vendorHash = "sha256-cPWJtrGad8VsvyjJHQwpfDitsJY/Q0iCtp1MRyzGT+U=";
171
171
patches = [ ./provider-path-0_15.patch ];
172
172
passthru = {
173
173
inherit plugins;
+11
-11
pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch
+11
-11
pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch
···
1
1
diff -Naur terraform.old/internal/command/init.go terraform.new/internal/command/init.go
2
2
--- terraform.old/internal/command/init.go
3
3
+++ terraform.new/internal/command/init.go
4
-
@@ -3,6 +3,7 @@
5
-
import (
4
+
@@ -7,6 +7,7 @@
6
5
"context"
6
+
"errors"
7
7
"fmt"
8
8
+ "os"
9
9
"log"
10
-
"strings"
11
-
12
-
@@ -55,6 +56,11 @@
13
-
14
-
var diags tfdiags.Diagnostics
15
-
10
+
"reflect"
11
+
"sort"
12
+
@@ -79,6 +80,11 @@
13
+
c.migrateState = true
14
+
}
15
+
16
16
+ val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR")
17
17
+ if ok {
18
-
+ flagPluginPath = append(flagPluginPath, val)
18
+
+ initArgs.PluginPath = append(initArgs.PluginPath, val)
19
19
+ }
20
20
+
21
-
if len(flagPluginPath) > 0 {
22
-
c.pluginPath = flagPluginPath
21
+
if len(initArgs.PluginPath) > 0 {
22
+
c.pluginPath = initArgs.PluginPath
23
23
}