Merge branch 'main' into feat/mold

prefix-dev · Sep 2, 2024 · de6809c · de6809c
2 parents 89e8f10 + a7ae7bb
commit de6809c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
@@ -10,4 +10,4 @@ jobs:
         uses: actions/[email protected]
 
       - name: Check spelling
-        uses: crate-ci/[email protected].1
+        uses: crate-ci/[email protected].3
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -169,7 +169,7 @@ pre-build = [
     "apt-get update && apt-get install --assume-yes libssl-dev:$CROSS_DEB_ARCH",
 ]
 
-# [patch.crates-io]
+[patch.crates-io]
 # rattler = { git = "https://github.com/nichmor/rattler", branch = "feat/add-extra-field-on-about-json" }
 # rattler_conda_types = { git = "https://github.com/nichmor/rattler", branch = "feat/add-extra-field-on-about-json" }
 # rattler_digest = { git = "https://github.com/nichmor/rattler", branch = "feat/add-extra-field-on-about-json" }
@@ -181,7 +181,7 @@ pre-build = [
 # rattler_solve = { git = "https://github.com/nichmor/rattler", branch = "feat/add-extra-field-on-about-json" }
 # rattler_virtual_packages = { git = "https://github.com/nichmor/rattler", branch = "feat/add-extra-field-on-about-json" }
 # rattler_package_streaming = { git = "https://github.com/nichmor/rattler", branch = "feat/add-extra-field-on-about-json" }
-# clap-markdown = { git = "https://github.com/ruben-arts/clap-markdown", branch = "main" }
+clap-markdown = { git = "https://github.com/ruben-arts/clap-markdown", branch = "main" }
 
 
 # rattler = { path = "../rattler/crates/rattler" }

diff --git a/docs/reference/cli.md b/docs/reference/cli.md
@@ -182,6 +182,11 @@ Build a package from a recipe
 	- Possible values: `true`, `false`
 
 
+- `--extra-meta <EXTRA_META>`
+
+	Extra metadata to include in about.json
+
+
 ###### **Modifying result**
 
 - `--package-format <PACKAGE_FORMAT>`

diff --git a/docs/reference/recipe_file.md b/docs/reference/recipe_file.md
@@ -611,7 +611,7 @@ You can ignore them by package name, or by naming the runtime dependency directl
         - zlib
 ```
 
-Using a runtime depenedency name:
+Using a runtime dependency name:
 
 ```yaml
   requirements: