Merge remote-tracking branch 'origin/staging-next' into staging

Conflicts:
- pkgs/development/python-modules/langsmith/default.nix
- pkgs/development/python-modules/rich-pixels/default.nix
- pkgs/servers/teleport/generic.nix

3 files changed, 29 insertions, 20 deletions

diff --git a/maintainers/scripts/kde/collect-metadata.py b/maintainers/scripts/kde/collect-metadata.py
index eaa6196471365..3a7a3e95508e0 100755
--- a/maintainers/scripts/kde/collect-metadata.py
+++ b/maintainers/scripts/kde/collect-metadata.py
@@ -27,8 +27,13 @@ import utils
     ),
     default=pathlib.Path(__file__).parent.parent.parent.parent
 )
-def main(repo_metadata: pathlib.Path, nixpkgs: pathlib.Path):
-    metadata = utils.KDERepoMetadata.from_repo_metadata_checkout(repo_metadata)
+@click.option(
+    "--unstable",
+    default=False,
+    is_flag=True
+)
+def main(repo_metadata: pathlib.Path, nixpkgs: pathlib.Path, unstable: bool):
+    metadata = utils.KDERepoMetadata.from_repo_metadata_checkout(repo_metadata, unstable)
     out_dir = nixpkgs / "pkgs/kde/generated"
     metadata.write_json(out_dir)
 
diff --git a/maintainers/scripts/kde/utils.py b/maintainers/scripts/kde/utils.py
index b3a00093d7038..14ca61df35543 100644
--- a/maintainers/scripts/kde/utils.py
+++ b/maintainers/scripts/kde/utils.py
@@ -104,7 +104,7 @@ class KDERepoMetadata:
         return project
 
     @classmethod
-    def from_repo_metadata_checkout(cls, repo_metadata: pathlib.Path):
+    def from_repo_metadata_checkout(cls, repo_metadata: pathlib.Path, unstable=False):
         projects = [
             Project.from_yaml(metadata_file)
             for metadata_file in repo_metadata.glob("projects-invent/**/metadata.yaml")
@@ -122,29 +122,32 @@ class KDERepoMetadata:
             dep_graph={},
         )
 
-        dep_specs = ["dependency-data-stable-kf6-qt6"]
         dep_graph = collections.defaultdict(set)
 
-        for spec in dep_specs:
-            spec_path = repo_metadata / "dependencies" / spec
-            for line in spec_path.open():
-                line = line.strip()
-                if line.startswith("#"):
-                    continue
-                if not line:
-                    continue
+        if unstable:
+            spec_name = "dependency-data-kf6-qt6"
+        else:
+            spec_name = "dependency-data-stable-kf6-qt6"
 
-                dependent, dependency = line.split(": ")
+        spec_path = repo_metadata / "dependencies" / spec_name
+        for line in spec_path.open():
+            line = line.strip()
+            if line.startswith("#"):
+                continue
+            if not line:
+                continue
 
-                dependent = self.try_lookup_package(dependent)
-                if dependent is None:
-                    continue
+            dependent, dependency = line.split(": ")
 
-                dependency = self.try_lookup_package(dependency)
-                if dependency is None:
-                    continue
+            dependent = self.try_lookup_package(dependent)
+            if dependent is None:
+                continue
 
-                dep_graph[dependent].add(dependency)
+            dependency = self.try_lookup_package(dependency)
+            if dependency is None:
+                continue
+
+            dep_graph[dependent].add(dependency)
 
         self.dep_graph = dep_graph
 
diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 73ce8712fbf18..93dd9a73500bc 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -100,6 +100,7 @@ luuid,,,,20120509-2,,
 luv,,,,1.48.0-2,,
 lush.nvim,,,https://luarocks.org/dev,,,teto
 lyaml,,,,,,lblasc
+lz.n,,,,,,mrcjkb
 magick,,,,,5.1,donovanglover
 markdown,,,,,,
 mediator_lua,,,,,,