about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdam Stephens <adam@valkor.net>2024-08-10 13:03:28 -0400
committerAdam Stephens <adam@valkor.net>2024-08-10 13:23:38 -0400
commitac18c4d1e99f7308345ea5f5b9a0584331c30362 (patch)
tree208dd98be390942306830e71216e2a82dac82113
parent094f2b6c9d87da6348e2517936a3ad907c82d1cf (diff)
treewide: remove lxc team from lxd packages and modules
LXD is not under the LXC project any longer
-rw-r--r--nixos/modules/virtualisation/lxc-image-metadata.nix4
-rw-r--r--nixos/modules/virtualisation/lxc-instance-common.nix4
-rw-r--r--nixos/modules/virtualisation/lxd-agent.nix4
-rw-r--r--nixos/modules/virtualisation/lxd-virtual-machine.nix4
-rw-r--r--nixos/modules/virtualisation/lxd.nix4
-rw-r--r--nixos/tests/lxd/container.nix4
-rw-r--r--nixos/tests/lxd/nftables.nix4
-rw-r--r--nixos/tests/lxd/preseed.nix4
-rw-r--r--nixos/tests/lxd/ui.nix6
-rw-r--r--nixos/tests/lxd/virtual-machine.nix4
-rw-r--r--pkgs/by-name/lx/lxd-ui/package.nix2
-rw-r--r--pkgs/by-name/lx/lxd-unwrapped-lts/package.nix2
-rw-r--r--pkgs/development/libraries/dqlite/default.nix2
-rw-r--r--pkgs/development/libraries/raft-canonical/default.nix2
14 files changed, 13 insertions, 37 deletions
diff --git a/nixos/modules/virtualisation/lxc-image-metadata.nix b/nixos/modules/virtualisation/lxc-image-metadata.nix
index 38d955798f3e0..eb14f9dc5fc1b 100644
--- a/nixos/modules/virtualisation/lxc-image-metadata.nix
+++ b/nixos/modules/virtualisation/lxc-image-metadata.nix
@@ -46,6 +46,10 @@ let
   else { files = []; properties = {}; };
 
 in {
+  meta = {
+    maintainers = lib.teams.lxc.members;
+  };
+
   options = {
     virtualisation.lxc = {
       templates = lib.mkOption {
diff --git a/nixos/modules/virtualisation/lxc-instance-common.nix b/nixos/modules/virtualisation/lxc-instance-common.nix
index d6a0e05fb1c96..77285e5297263 100644
--- a/nixos/modules/virtualisation/lxc-instance-common.nix
+++ b/nixos/modules/virtualisation/lxc-instance-common.nix
@@ -1,6 +1,10 @@
 {lib, ...}:
 
 {
+  meta = {
+    maintainers = lib.teams.lxc.members;
+  };
+
   imports = [
     ./lxc-image-metadata.nix
 
diff --git a/nixos/modules/virtualisation/lxd-agent.nix b/nixos/modules/virtualisation/lxd-agent.nix
index d319371478481..4bcec117aba97 100644
--- a/nixos/modules/virtualisation/lxd-agent.nix
+++ b/nixos/modules/virtualisation/lxd-agent.nix
@@ -45,10 +45,6 @@ let
     chown -R root:root "$PREFIX"
   '';
 in {
-  meta = {
-    maintainers = lib.teams.lxc.members;
-  };
-
   options = {
     virtualisation.lxd.agent.enable = lib.mkEnableOption "LXD agent";
   };
diff --git a/nixos/modules/virtualisation/lxd-virtual-machine.nix b/nixos/modules/virtualisation/lxd-virtual-machine.nix
index 2768e7c259662..138a858997188 100644
--- a/nixos/modules/virtualisation/lxd-virtual-machine.nix
+++ b/nixos/modules/virtualisation/lxd-virtual-machine.nix
@@ -6,10 +6,6 @@ let
     then "ttyS0"
     else "ttyAMA0"; # aarch64
 in {
-  meta = {
-    maintainers = lib.teams.lxc.members;
-  };
-
   imports = [
     ./lxc-instance-common.nix
 
diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix
index 277c09eb01709..bdcd60a0560f4 100644
--- a/nixos/modules/virtualisation/lxd.nix
+++ b/nixos/modules/virtualisation/lxd.nix
@@ -6,10 +6,6 @@ let
   cfg = config.virtualisation.lxd;
   preseedFormat = pkgs.formats.yaml {};
 in {
-  meta = {
-    maintainers = lib.teams.lxc.members;
-  };
-
   imports = [
     (lib.mkRemovedOptionModule [ "virtualisation" "lxd" "zfsPackage" ] "Override zfs in an overlay instead to override it globally")
   ];
diff --git a/nixos/tests/lxd/container.nix b/nixos/tests/lxd/container.nix
index ef9c3f4bbee7e..26dcad2f97a77 100644
--- a/nixos/tests/lxd/container.nix
+++ b/nixos/tests/lxd/container.nix
@@ -18,10 +18,6 @@ let
 in {
   name = "lxd-container";
 
-  meta = {
-    maintainers = lib.teams.lxc.members;
-  };
-
   nodes.machine = { lib, ... }: {
     virtualisation = {
       diskSize = 6144;
diff --git a/nixos/tests/lxd/nftables.nix b/nixos/tests/lxd/nftables.nix
index e6ce4089d719d..d419f9b66af13 100644
--- a/nixos/tests/lxd/nftables.nix
+++ b/nixos/tests/lxd/nftables.nix
@@ -8,10 +8,6 @@
 import ../make-test-python.nix ({ pkgs, lib, ...} : {
   name = "lxd-nftables";
 
-  meta = {
-    maintainers = lib.teams.lxc.members;
-  };
-
   nodes.machine = { lib, ... }: {
     virtualisation = {
       lxd.enable = true;
diff --git a/nixos/tests/lxd/preseed.nix b/nixos/tests/lxd/preseed.nix
index fb80dcf3893e4..2e0ff33d521fe 100644
--- a/nixos/tests/lxd/preseed.nix
+++ b/nixos/tests/lxd/preseed.nix
@@ -3,10 +3,6 @@ import ../make-test-python.nix ({ pkgs, lib, ... } :
 {
   name = "lxd-preseed";
 
-  meta = {
-    maintainers = lib.teams.lxc.members;
-  };
-
   nodes.machine = { lib, ... }: {
     virtualisation = {
       diskSize = 4096;
diff --git a/nixos/tests/lxd/ui.nix b/nixos/tests/lxd/ui.nix
index c442f44ab81cd..f96c3d74d93cd 100644
--- a/nixos/tests/lxd/ui.nix
+++ b/nixos/tests/lxd/ui.nix
@@ -1,10 +1,6 @@
-import ../make-test-python.nix ({ pkgs, lib, ... }: {
+import ../make-test-python.nix ({ pkgs, ... }: {
   name = "lxd-ui";
 
-  meta = {
-    maintainers = lib.teams.lxc.members;
-  };
-
   nodes.machine = { lib, ... }: {
     virtualisation = {
       lxd.enable = true;
diff --git a/nixos/tests/lxd/virtual-machine.nix b/nixos/tests/lxd/virtual-machine.nix
index 2a9dd8fcdbf61..14c5e8a82aa8f 100644
--- a/nixos/tests/lxd/virtual-machine.nix
+++ b/nixos/tests/lxd/virtual-machine.nix
@@ -18,10 +18,6 @@ let
 in {
   name = "lxd-virtual-machine";
 
-  meta = {
-    maintainers = lib.teams.lxc.members;
-  };
-
   nodes.machine = {lib, ...}: {
     virtualisation = {
       diskSize = 4096;
diff --git a/pkgs/by-name/lx/lxd-ui/package.nix b/pkgs/by-name/lx/lxd-ui/package.nix
index 70b85e236488e..9b613325c328a 100644
--- a/pkgs/by-name/lx/lxd-ui/package.nix
+++ b/pkgs/by-name/lx/lxd-ui/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/canonical/lxd-ui";
     changelog = "https://github.com/canonical/lxd-ui/releases/tag/${version}";
     license = lib.licenses.gpl3;
-    maintainers = lib.teams.lxc.members;
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix b/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix
index 6b812bb752ba2..5b3f229d2fe06 100644
--- a/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix
+++ b/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix
@@ -108,7 +108,7 @@ buildGoModule rec {
       asl20
       agpl3Plus
     ];
-    maintainers = teams.lxc.members;
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix
index 79226377bac30..4ef75a9ee469b 100644
--- a/pkgs/development/libraries/dqlite/default.nix
+++ b/pkgs/development/libraries/dqlite/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://dqlite.io/";
     license = licenses.asl20;
-    maintainers = teams.lxc.members;
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix
index 65f4b899d747e..4d60456d8ab21 100644
--- a/pkgs/development/libraries/raft-canonical/default.nix
+++ b/pkgs/development/libraries/raft-canonical/default.nix
@@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/canonical/raft";
     license = licenses.asl20;
     platforms = platforms.linux;
-    maintainers = teams.lxc.members;
+    maintainers = [ ];
   };
 }