From 7753c27042e0dfa0dfec6091b4b8aa9ad6c76e76 Mon Sep 17 00:00:00 2001
From: mesh-tools <mesh-tools@noreply.localhost>
Date: Wed, 21 Oct 2026 09:49:50 +0000
Subject: [PATCH] Make dev-tools, lab and the two build modules require the
 toolchain provisions instead of declaring the packages (issue 1573)

---
 modules/dev-tools/module.json       | 19 ++++---------------
 modules/lab/module.json             | 14 +++-----------
 modules/mesh-build-go/module.json   |  8 ++------
 modules/mesh-build-node/module.json | 13 ++-----------
 4 files changed, 11 insertions(+), 43 deletions(-)

diff --git a/modules/dev-tools/module.json b/modules/dev-tools/module.json
index 8ee6fd1a..094f8336 100644
--- a/modules/dev-tools/module.json
+++ b/modules/dev-tools/module.json
@@ -4,12 +4,11 @@
   "capabilities": [
     "package-manager"
   ],
+  "requires": [
+    "go-toolchain",
+    "node-toolchain"
+  ],
   "resources": [
-    {
-      "id": "go",
-      "type": "package",
-      "package": "go"
-    },
     {
       "id": "c-compiler",
       "type": "package",
@@ -20,16 +19,6 @@
       "type": "package",
       "package": "make"
     },
-    {
-      "id": "nodejs",
-      "type": "package",
-      "package": "nodejs"
-    },
-    {
-      "id": "npm",
-      "type": "package",
-      "package": "npm"
-    },
     {
       "id": "python",
       "type": "package",
diff --git a/modules/lab/module.json b/modules/lab/module.json
index e23963df..ef82b87c 100644
--- a/modules/lab/module.json
+++ b/modules/lab/module.json
@@ -6,7 +6,9 @@
     "virtualisation"
   ],
   "requires": [
-    "npm-package-registry"
+    "npm-package-registry",
+    "go-toolchain",
+    "node-toolchain"
   ],
   "contributes": {
     "npm-package-registry": {
@@ -84,16 +86,6 @@
       "type": "package",
       "package": "iproute2"
     },
-    {
-      "id": "npm",
-      "type": "package",
-      "package": "npm"
-    },
-    {
-      "id": "go",
-      "type": "package",
-      "package": "go"
-    },
     {
       "id": "incus",
       "type": "package",
diff --git a/modules/mesh-build-go/module.json b/modules/mesh-build-go/module.json
index bb7f65de..74f4d97c 100644
--- a/modules/mesh-build-go/module.json
+++ b/modules/mesh-build-go/module.json
@@ -27,7 +27,8 @@
     }
   ],
   "requires": [
-    "forge-account"
+    "forge-account",
+    "go-toolchain"
   ],
   "own-secrets": {
     "broker": "${dir:state}/broker"
@@ -105,11 +106,6 @@
       "mode": "0644",
       "template": "files/gitconfig"
     },
-    {
-      "id": "go",
-      "type": "package",
-      "package": "go"
-    },
     {
       "id": "git",
       "type": "package",
diff --git a/modules/mesh-build-node/module.json b/modules/mesh-build-node/module.json
index 6c06d5e2..a11cb96d 100644
--- a/modules/mesh-build-node/module.json
+++ b/modules/mesh-build-node/module.json
@@ -29,7 +29,8 @@
   ],
   "requires": [
     "forge-account",
-    "npm-package-registry"
+    "npm-package-registry",
+    "node-toolchain"
   ],
   "contributes": {
     "npm-package-registry": {
@@ -126,16 +127,6 @@
       "artifact": "toolchain",
       "unknown": "program"
     },
-    {
-      "id": "nodejs",
-      "type": "package",
-      "package": "nodejs"
-    },
-    {
-      "id": "npm",
-      "type": "package",
-      "package": "npm"
-    },
     {
       "id": "git",
       "type": "package",