Merge pull request #543 from nix-community/faukah/push-pyroxlpqkvrt

{home,nixos}: trim contents of /etc/specialisation

Author: NotAShelf

src/home.rs

@@ -179,7 +179,7 @@ impl HomeRebuildArgs {
         tracing::warn!("spec_location path is not valid UTF-8");
         None
       },
-      |s| std::fs::read_to_string(s).ok(),
+      |s| std::fs::read_to_string(s).ok().map(|s| s.trim().to_owned()),
     );
 
     let target_specialisation = if self.no_specialisation {

src/nixos.rs

@@ -565,7 +565,9 @@ impl OsRebuildArgs {
     &self,
     out_path: &Path,
   ) -> Result<PathBuf> {
-    let current_specialisation = std::fs::read_to_string(SPEC_LOCATION).ok();
+    let current_specialisation = std::fs::read_to_string(SPEC_LOCATION)
+      .ok()
+      .map(|s| s.trim().to_owned());
 
     let target_specialisation = if self.no_specialisation {
       None
@@ -701,7 +703,9 @@ impl OsRollbackArgs {
       profile_dir.join(format!("system-{}-link", target_generation.number));
 
     // Handle specialisations
-    let current_specialisation = fs::read_to_string(SPEC_LOCATION).ok();
+    let current_specialisation = fs::read_to_string(SPEC_LOCATION)
+      .ok()
+      .map(|s| s.trim().to_owned());
 
     let target_specialisation = if self.no_specialisation {
       None