From 9b10b523f3db3985d6df6a924a3388f5eb88d737 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 30 Dec 2021 18:18:41 +1000 Subject: terraform-providers.lxd: remove separate derivation --- .../cluster/terraform-providers/default.nix | 1 - .../cluster/terraform-providers/lxd/default.nix | 27 ---------------------- .../cluster/terraform-providers/providers.json | 9 ++++++++ 3 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 862c8e800be8f..d4ce235a92dce 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -55,7 +55,6 @@ let # Packages that don't fit the default model gandi = callPackage ./gandi { }; libvirt = callPackage ./libvirt { }; - lxd = callPackage ./lxd { }; teleport = callPackage ./teleport { }; vpsadmin = callPackage ./vpsadmin { }; vercel = callPackage ./vercel { }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix deleted file mode 100644 index 4ea2194a03a3a..0000000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "terraform-provider-lxd"; - version = "1.6.0"; - - src = fetchFromGitHub { - owner = "sl1pm4t"; - repo = "terraform-provider-lxd"; - rev = "v${version}"; - sha256 = "sha256-fl9sYoyrVV6LvnIrnyAXy18QLLazQajjcLO1JWsqAR4="; - }; - - vendorSha256 = "sha256-ervfG/BAaF4M+BXsp0eCDM6nPWQOS3pthClhArsUoYc="; - - doCheck = false; - - postBuild = "mv ../go/bin/terraform-provider-lxd{,_v${version}}"; - - meta = with lib; { - homepage = "https://github.com/sl1pm4t/terraform-provider-lxd"; - description = "Terraform provider for lxd"; - platforms = platforms.linux; - license = licenses.mpl20; - maintainers = with maintainers; [ gila ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 946199a9a4789..26e730c4f7e24 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -666,6 +666,15 @@ "sha256": "00d8qx95cxaif636dyh935nv9nn6lmb1ybxy7n4myy9g80y50ap1", "version": "1.3.0" }, + "lxd": { + "owner": "terraform-lxd", + "provider-source-address": "registry.terraform.io/terraform-lxd/lxd", + "repo": "terraform-provider-lxd", + "rev": "v1.6.0", + "sha256": "07h159mjbddkf3ishhdknqn10pyb2wh9yavjps5mwmdbiii6qpvy", + "vendorSha256": "11x12jxh4q99hinpljqfchysgkhch93sgv0mz065ws20y0dxzfvs", + "version": "1.6.0" + }, "mailgun": { "owner": "terraform-providers", "repo": "terraform-provider-mailgun", -- cgit 1.4.1