From 785780706e9cedab2f32a74c8a121c679a8f7b7e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 15 Nov 2022 19:22:23 +1000 Subject: [PATCH 1/2] terraform-providers: support gitlab source --- .../networking/cluster/terraform-providers/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index b2c730a24be3..1c4654ed0561 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -2,6 +2,7 @@ , stdenv , buildGoModule , fetchFromGitHub +, fetchFromGitLab , callPackage , config , writeShellScript @@ -21,6 +22,7 @@ let , vendorHash ? throw "use vendorHash instead of vendorSha256" # added 2202/09 , deleteVendor ? false , proxyVendor ? false + , mkProviderFetcher ? fetchFromGitHub , mkProviderGoModule ? buildGoModule # Looks like "registry.terraform.io/vancluever/acme" , provider-source-address @@ -35,7 +37,7 @@ let # goreleaser (used for builds distributed via terraform registry) requires that CGO is disabled CGO_ENABLED = 0; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${rev}" ]; - src = fetchFromGitHub { + src = mkProviderFetcher { name = "source-${rev}"; inherit owner repo rev hash; }; From 6b476b87dfc19407f71eb430593c004380f7cc74 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 15 Nov 2022 19:22:24 +1000 Subject: [PATCH 2/2] terraform-providers.gitlab: 3.18.0 -> 3.19.0 --- .../networking/cluster/terraform-providers/default.nix | 1 + .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 1c4654ed0561..cd3498720bb4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -70,6 +70,7 @@ let netlify = automated-providers.netlify.overrideAttrs (_: { meta.broken = stdenv.isDarwin; }); pass = automated-providers.pass.overrideAttrs (_: { meta.broken = stdenv.isDarwin; }); tencentcloud = automated-providers.tencentcloud.overrideAttrs (_: { meta.broken = stdenv.isDarwin; }); + gitlab = automated-providers.gitlab.override { mkProviderFetcher = fetchFromGitLab; owner = "gitlab-org"; }; # mkisofs needed to create ISOs holding cloud-init data and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; }); }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6fe52ab7b895..0ed0a3bbf30b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -431,13 +431,13 @@ "version": "5.8.0" }, "gitlab": { - "hash": "sha256-eNd1o0UjG6A9OTRmcJfcPLLtWIJmdZ+viDnSZhyHpgY=", + "hash": "sha256-1Ljf9kwpj96mzu/uHqitYCKIixNn/sZL21zOM8xQsU4=", "owner": "gitlabhq", "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", - "rev": "v3.18.0", - "vendorHash": "sha256-YrgsycnRIB5UoWGADphfP6lf78M8ZnkJGP0Ti2QJtQ8=", - "version": "3.18.0" + "rev": "v3.19.0", + "vendorHash": "sha256-e9J4g5ZuiKcI/WSXMFY3Qglgt87qbXv7tDpxYbRRuaU=", + "version": "3.19.0" }, "google": { "hash": "sha256-guE04J0RCFOHPXGtEpxGZu8s6fnfoh0WLRRZ5GW/gLk=",