From a83ca9540d602dcaad8fcc0f774cec93c1c935c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Izquierdo=20Valent=C3=ADn?= <25722135+oscar-izval@users.noreply.github.com> Date: Thu, 28 Nov 2024 20:35:34 +0100 Subject: [PATCH] feat: Add Terraform version `1.10.0` (#99) --- .envrc | 2 +- cli/.envrc | 2 +- cli/devenv.lock | 16 ++++++++-------- cli/go.mod | 11 +++++++---- cli/go.sum | 4 ++-- devenv.lock | 16 ++++++++-------- flake.lock | 8 ++++---- flake.nix | 2 +- versions.json | 7 ++++++- 9 files changed, 38 insertions(+), 30 deletions(-) diff --git a/.envrc b/.envrc index 6de8a8a..31e7057 100644 --- a/.envrc +++ b/.envrc @@ -1,3 +1,3 @@ -source_url "https://raw.githubusercontent.com/cachix/devenv/d1f7b48e35e6dee421cfd0f51481d17f77586997/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0=" +source_url "https://raw.githubusercontent.com/cachix/devenv/790c4230a547243a01435fc8c5292cd54abaec74/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0=" use devenv \ No newline at end of file diff --git a/cli/.envrc b/cli/.envrc index 6de8a8a..31e7057 100644 --- a/cli/.envrc +++ b/cli/.envrc @@ -1,3 +1,3 @@ -source_url "https://raw.githubusercontent.com/cachix/devenv/d1f7b48e35e6dee421cfd0f51481d17f77586997/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0=" +source_url "https://raw.githubusercontent.com/cachix/devenv/790c4230a547243a01435fc8c5292cd54abaec74/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0=" use devenv \ No newline at end of file diff --git a/cli/devenv.lock b/cli/devenv.lock index 7f3d595..9bd4f4e 100644 --- a/cli/devenv.lock +++ b/cli/devenv.lock @@ -3,10 +3,10 @@ "devenv": { "locked": { "dir": "src/modules", - "lastModified": 1726826452, + "lastModified": 1732585607, "owner": "cachix", "repo": "devenv", - "rev": "2bdf6461e88c7e93b94d72d8b11d5a61f167cbf5", + "rev": "a520f05c40ebecaf5e17064b27e28ba8e70c49fb", "type": "github" }, "original": { @@ -19,10 +19,10 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, + "lastModified": 1732722421, "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac", "type": "github" }, "original": { @@ -68,10 +68,10 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1726838390, + "lastModified": 1732632634, "owner": "NixOS", "repo": "nixpkgs", - "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101", + "rev": "6f6076c37180ea3a916f84928cf3a714c5207a30", "type": "github" }, "original": { @@ -91,10 +91,10 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1726745158, + "lastModified": 1732021966, "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "type": "github" }, "original": { diff --git a/cli/go.mod b/cli/go.mod index 2c44708..a4b289d 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -1,12 +1,15 @@ module github.com/stackbuilders/nixpkgs-terraform/cli -go 1.21.7 +go 1.22.1 + +require ( + github.com/Masterminds/semver/v3 v3.2.1 + github.com/google/go-github/v62 v62.0.0 + github.com/spf13/cobra v1.8.1 +) require ( - github.com/Masterminds/semver/v3 v3.2.1 // indirect - github.com/google/go-github/v62 v62.0.0 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/spf13/cobra v1.8.1 // indirect github.com/spf13/pflag v1.0.5 // indirect ) diff --git a/cli/go.sum b/cli/go.sum index 1df2cc8..063a473 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -2,8 +2,8 @@ github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0 github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY= -github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-github/v62 v62.0.0 h1:/6mGCaRywZz9MuHyw9gD1CwsbmBX8GWsbFkwMmHdhl4= github.com/google/go-github/v62 v62.0.0/go.mod h1:EMxeUqGJq2xRu9DYBMwel/mr7kZrzUOfQmmpYrZn2a4= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= diff --git a/devenv.lock b/devenv.lock index 7f3d595..9bd4f4e 100644 --- a/devenv.lock +++ b/devenv.lock @@ -3,10 +3,10 @@ "devenv": { "locked": { "dir": "src/modules", - "lastModified": 1726826452, + "lastModified": 1732585607, "owner": "cachix", "repo": "devenv", - "rev": "2bdf6461e88c7e93b94d72d8b11d5a61f167cbf5", + "rev": "a520f05c40ebecaf5e17064b27e28ba8e70c49fb", "type": "github" }, "original": { @@ -19,10 +19,10 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, + "lastModified": 1732722421, "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac", "type": "github" }, "original": { @@ -68,10 +68,10 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1726838390, + "lastModified": 1732632634, "owner": "NixOS", "repo": "nixpkgs", - "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101", + "rev": "6f6076c37180ea3a916f84928cf3a714c5207a30", "type": "github" }, "original": { @@ -91,10 +91,10 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1726745158, + "lastModified": 1732021966, "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "type": "github" }, "original": { diff --git a/flake.lock b/flake.lock index 464c924..4b642aa 100644 --- a/flake.lock +++ b/flake.lock @@ -69,17 +69,17 @@ }, "nixpkgs-1_9": { "locked": { - "lastModified": 1726871744, - "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", + "lastModified": 1732617236, + "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", + "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", + "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 5b62a71..52bef93 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ flake-parts.url = "github:hercules-ci/flake-parts"; nixpkgs-1_0.url = "github:nixos/nixpkgs/41de143fda10e33be0f47eab2bfe08a50f234267"; # nixos-23.05 nixpkgs-1_6.url = "github:nixos/nixpkgs/d6b3ddd253c578a7ab98f8011e59990f21dc3932"; # nixos-24.05 - nixpkgs-1_9.url = "github:nixos/nixpkgs/a1d92660c6b3b7c26fb883500a80ea9d33321be2"; # nixpkgs-unstable + nixpkgs-1_9.url = "github:nixos/nixpkgs/af51545ec9a44eadf3fe3547610a5cdd882bc34e"; # nixpkgs-unstable systems.url = "github:nix-systems/default"; }; diff --git a/versions.json b/versions.json index 42ca1b8..4307092 100644 --- a/versions.json +++ b/versions.json @@ -347,6 +347,10 @@ "1.9.8": { "hash": "sha256-0xBhOdaIbw1fLmbI4KDvQoHD4BmVZoiMT/zv9MnwuD4=", "vendorHash": "sha256-tH9KQF4oHcQh34ikB9Bx6fij/iLZN+waxv5ZilqGGlU=" + }, + "1.10.0": { + "hash": "sha256-GvFBefp1RWqgB79Sv+2vYZyTjeLEYNsXFJrJxEUJAlY=", + "vendorHash": "sha256-UmPnOfjR6kYI0TMH2J54LzDeDGJKMkAC0xZk6xstIuk=" } }, "latest": { @@ -359,6 +363,7 @@ "1.6": "1.6.6", "1.7": "1.7.5", "1.8": "1.8.5", - "1.9": "1.9.8" + "1.9": "1.9.8", + "1.10": "1.10.0" } } \ No newline at end of file