From dcd597f50f9b25a6a6a6eda69a96fa004ed20e49 Mon Sep 17 00:00:00 2001
From: Zoey Greer <zoey@buildbuddy.io>
Date: Tue, 1 Sep 2026 11:22:00 -0400
Subject: [PATCH 1/2] re-add removed parameter `package_template`

---
 apt/extensions.bzl | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/apt/extensions.bzl b/apt/extensions.bzl
index 5969d27..51301c3 100644
--- a/apt/extensions.bzl
+++ b/apt/extensions.bzl
@@ -325,6 +325,7 @@ def _distroless_extension(mctx):
     resolution_queue = []
     already_resolved = {}
     dependency_set_mergedusr = {}
+    dependency_set_package_template = {}
     package_repo_roots = {
         False: {},
         True: {},
@@ -335,6 +336,8 @@ def _distroless_extension(mctx):
             if install.dependency_set:
                 current_mergedusr = dependency_set_mergedusr.get(install.dependency_set, False)
                 dependency_set_mergedusr[install.dependency_set] = current_mergedusr or install.mergedusr
+                if install.dependency_set not in dependency_set_package_template and install.package_template != None:
+                    dependency_set_package_template[install.dependency_set] = install.package_template
 
             for dep_constraint in install.packages:
                 constraint = version_constraint.parse_dep(dep_constraint)
@@ -365,6 +368,7 @@ def _distroless_extension(mctx):
                             "amd64",
                             install.suites,
                             install.mergedusr,
+                            install.package_template,
                             False,
                         ))
                         continue
@@ -380,6 +384,7 @@ def _distroless_extension(mctx):
                         arch,
                         install.suites,
                         install.mergedusr,
+                        install.package_template,
                         False,
                     ))
 
@@ -389,7 +394,7 @@ def _distroless_extension(mctx):
         if i == ITERATION_MAX:
             fail("apt.install exhausted, please file a bug")
 
-        (dependency_set_name, name, version, arch, suites, mergedusr, is_transitive_dependency) = resolution_queue.pop()
+        (dependency_set_name, name, version, arch, suites, mergedusr, package_template, is_transitive_dependency) = resolution_queue.pop()
 
         mctx.report_progress("Resolving %s:%s" % (name, arch))
 
@@ -460,6 +465,7 @@ def _distroless_extension(mctx):
                     arch,
                     suites,
                     mergedusr,
+                    package_template,
                     True,
                 ))
             glock.add_package_dependency(package, dep, arch)
@@ -477,11 +483,15 @@ def _distroless_extension(mctx):
     package_repo_modes = compute_package_repo_modes(glock.packages(), package_repo_roots)
     for depset_name in dependency_sets.keys():
         depset_mergedusr = dependency_set_mergedusr.get(depset_name, False)
+        kwargs = {}
+        if depset_name in dependency_set_package_template:
+            kwargs["package_template"] = dependency_set_package_template[depset_name]
         translate_dependency_set(
             name = depset_name,
             depset_name = depset_name,
             lock_content = lock_content,
             mergedusr = depset_mergedusr,
+            **kwargs
         )
 
     # Generate a repo per package which will be aliased by hub repo.
@@ -657,6 +667,9 @@ install = tag_class(
         "suites": attr.string_list(),
         "include_transitive": attr.bool(default = True),
         "mergedusr": attr.bool(default = False),
+        "package_template": attr.label(
+            allow_single_file = True,
+        ),
     },
 )
 

From f0e1261f2f10b758ff9593ec0109d021cd65bc59 Mon Sep 17 00:00:00 2001
From: Zoey Greer <zoey@buildbuddy.io>
Date: Tue, 1 Sep 2026 16:25:01 -0400
Subject: [PATCH 2/2] unnecessary in `resolution_queue`.

---
 apt/extensions.bzl | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/apt/extensions.bzl b/apt/extensions.bzl
index 51301c3..7648f85 100644
--- a/apt/extensions.bzl
+++ b/apt/extensions.bzl
@@ -368,7 +368,6 @@ def _distroless_extension(mctx):
                             "amd64",
                             install.suites,
                             install.mergedusr,
-                            install.package_template,
                             False,
                         ))
                         continue
@@ -384,7 +383,6 @@ def _distroless_extension(mctx):
                         arch,
                         install.suites,
                         install.mergedusr,
-                        install.package_template,
                         False,
                     ))
 
@@ -394,7 +392,7 @@ def _distroless_extension(mctx):
         if i == ITERATION_MAX:
             fail("apt.install exhausted, please file a bug")
 
-        (dependency_set_name, name, version, arch, suites, mergedusr, package_template, is_transitive_dependency) = resolution_queue.pop()
+        (dependency_set_name, name, version, arch, suites, mergedusr, is_transitive_dependency) = resolution_queue.pop()
 
         mctx.report_progress("Resolving %s:%s" % (name, arch))
 
@@ -465,7 +463,6 @@ def _distroless_extension(mctx):
                     arch,
                     suites,
                     mergedusr,
-                    package_template,
                     True,
                 ))
             glock.add_package_dependency(package, dep, arch)