Merge branch 'main' into rvdp/clippy

grahamc · web-flow · commit cf2b58ec2c03 · 2025-10-08T11:52:21.000-04:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
   format:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: DeterminateSystems/determinate-nix-action@main
     - uses: DeterminateSystems/flakehub-cache-action@main
     - name: Check rustfmt
@@ -17,7 +17,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: DeterminateSystems/determinate-nix-action@main
     - uses: DeterminateSystems/flakehub-cache-action@main
     - name: Build
@@ -26,15 +26,15 @@ jobs:
   NixFlakeCheck:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: DeterminateSystems/flake-checker-action@main
       with:
         fail-mode: false
 
   NixFormatting:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         fetch-depth: 0
     - uses: DeterminateSystems/determinate-nix-action@main
@@ -45,15 +45,15 @@ jobs:
   EditorConfig:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - uses: greut/eclint-action@v0
 
   ValidateJsonSchema:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         fetch-depth: 0
     - uses: DeterminateSystems/determinate-nix-action@main
@@ -66,7 +66,7 @@ jobs:
   SynthesizeIntegration:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         fetch-depth: 0
     - uses: DeterminateSystems/determinate-nix-action@main
diff --git a/.github/workflows/json-schema.yaml b/.github/workflows/json-schema.yaml
@@ -15,7 +15,7 @@ jobs:
       pages: write
       id-token: write
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         fetch-depth: 0
     - uses: DeterminateSystems/determinate-nix-action@main
@@ -28,7 +28,7 @@ jobs:
         mkdir -p dist
         nix develop --command generate-schema-doc --config expand_buttons=true schema.json dist/index.html
     - name: Upload docs
-      uses: actions/upload-pages-artifact@v3
+      uses: actions/upload-pages-artifact@v4
       with:
         path: ./dist
     - name: Publish docs to GitHub Pages
diff --git a/.github/workflows/update-flake-lock.yaml b/.github/workflows/update-flake-lock.yaml
@@ -9,7 +9,7 @@ jobs:
   lockfile:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: DeterminateSystems/determinate-nix-action@main
       - uses: DeterminateSystems/flakehub-cache-action@main
       - uses: DeterminateSystems/update-flake-lock@main
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Check flake
         uses: DeterminateSystems/flake-checker-action@main
         with:
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bootspec/Cargo.toml b/bootspec/Cargo.toml
@@ -16,4 +16,4 @@ serde_json = "1.0.99"
 thiserror = "1.0.40"
 
 [dev-dependencies]
-tempfile = "3.20.0"
+tempfile = "3.23.0"
diff --git a/bootspec/rfc0125_spec.json b/bootspec/rfc0125_spec.json
@@ -20,6 +20,9 @@
   },
   "org.nixos.specialisation.v1": {
     "<name>": {
+      "org.nix-community.test": {
+        "foo": "bar"
+      },
       "org.nixos.bootspec.v1": {
         "system": "x86_64-linux",
         "init": "/nix/store/xxx-nixos-system-xxx/init",
diff --git a/bootspec/src/generation.rs b/bootspec/src/generation.rs
@@ -88,6 +88,22 @@ mod tests {
             .map(ToOwned::to_owned)
             .collect::<Vec<_>>();
         assert!(keys.contains(&SpecialisationName(String::from("<name>"))));
+
+        assert_eq!(
+            from_json
+                .specialisations
+                .get(&SpecialisationName("<name>".into()))
+                .unwrap()
+                .extensions
+                .get("org.nix-community.test")
+                .unwrap()
+                .as_object()
+                .unwrap()
+                .get("foo")
+                .unwrap()
+                .as_str(),
+            Some("bar")
+        )
     }
 
     #[test]
diff --git a/bootspec/src/lib.rs b/bootspec/src/lib.rs
@@ -34,11 +34,13 @@ pub const JSON_FILENAME: &str = "boot.json";
 /// The type for a collection of generic extensions.
 pub type Extensions = HashMap<String, serde_json::Value>;
 
-// !!! IMPORTANT: KEEP `BootSpec`, `Specialisations`, and `SCHEMA_VERSION` IN SYNC !!!
+// !!! IMPORTANT: KEEP `BootSpec`, `Specialisations`, `Specialisation`, and `SCHEMA_VERSION` IN SYNC !!!
 /// The current bootspec generation type.
 pub type BootSpec = v1::GenerationV1;
 /// The current specialisations type.
 pub type Specialisations = v1::SpecialisationsV1;
+/// The current specialisations type.
+pub type Specialisation = v1::SpecialisationV1;
 /// The current bootspec schema version.
 pub const SCHEMA_VERSION: u64 = v1::SCHEMA_VERSION;
 
diff --git a/bootspec/src/v1.rs b/bootspec/src/v1.rs
@@ -5,8 +5,9 @@ use std::path::{Path, PathBuf};
 
 use serde::{Deserialize, Serialize};
 
+use crate::deser;
 use crate::error::{BootspecError, SynthesizeError};
-use crate::{Result, SpecialisationName, SystemConfigurationRoot};
+use crate::{Extensions, Result, SpecialisationName, SystemConfigurationRoot};
 
 /// The V1 bootspec schema version.
 pub const SCHEMA_VERSION: u64 = 1;
@@ -48,7 +49,7 @@ impl GenerationV1 {
 
                 specialisations.insert(
                     SpecialisationName(name.to_string()),
-                    Self::synthesize(&toplevel)?,
+                    SpecialisationV1::synthesize(&toplevel)?,
                 );
             }
         }
@@ -62,8 +63,37 @@ impl GenerationV1 {
 
 /// A mapping of V1 bootspec specialisations.
 ///
-/// This structure represents the contents of the `org.nixos.specialisations.v1` key.
-pub type SpecialisationsV1 = HashMap<SpecialisationName, GenerationV1>;
+/// This structure represents the contents of the `org.nixos.specialisation.v1` key.
+pub type SpecialisationsV1 = HashMap<SpecialisationName, SpecialisationV1>;
+
+/// A V1 bootspec specialisation.
+///
+/// This structure represents a single specialisation contained in the `org.nixos.specialisation.v1` key.
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+pub struct SpecialisationV1 {
+    #[serde(flatten)]
+    pub generation: GenerationV1,
+    #[serde(
+        default = "HashMap::new",
+        skip_serializing_if = "HashMap::is_empty",
+        deserialize_with = "deser::skip_generation_fields",
+        flatten
+    )]
+    pub extensions: Extensions,
+}
+
+impl SpecialisationV1 {
+    /// Synthesize a [`SpecialisationV1`] struct from the path to a NixOS generation.
+    ///
+    /// This is useful when used on generations that do not have a bootspec attached to it.
+    pub fn synthesize(generation_path: &Path) -> Result<Self> {
+        let generation = GenerationV1::synthesize(generation_path)?;
+        Ok(Self {
+            generation,
+            extensions: HashMap::new(),
+        })
+    }
+}
 
 /// A V1 bootspec toplevel.
 ///
diff --git a/synthesize/Cargo.toml b/synthesize/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2018"
 
 [dependencies]
 serde_json = "1.0.99"
-tempfile = "3.20.0"
+tempfile = "3.23.0"
 bootspec = { path = "../bootspec" }
-clap = { version = "4.5.43", features = ["derive"] }
+clap = { version = "4.5.48", features = ["derive"] }
 
 [dev-dependencies]
