Unverified Commit c78dfbcf authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

Merge pull request #200642 from qowoz/tf-rm-gitlab 

terraform-providers.gitlab: 3.18.0 -> 3.19.0
parents 8c8f38c1 6b476b87

pkgs/applications/networking/cluster/terraform-providers/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -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;

        };
@@ -68,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 ]; });

    };

pkgs/applications/networking/cluster/terraform-providers/providers.json

+4 −4
Original line number Diff line number Diff line
@@ -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=",