native nix-diff

Cargo.toml

@@ -17,13 +17,14 @@ gethostname = "1.0.2"
 iddqd = { version = "0.3.11", default-features = false, features = ["serde", "std"] }
 itertools = "0.14.0"
 miette = { version = "7.6.0", features = ["fancy"] }
-owo-colors = { version = "4.2.2", features = ["supports-colors"] }
+owo-colors = "4.2.2"
 rustc-hash = "2.1.1"
 same-file = "1.0.6"
 serde = { version = "1.0.190", features = ["derive"] }
 serde_json = "1.0.107"
 shell-words = "1.1.0"
 shellexpand = "3.1.1"
+similar = { version = "2.7.0", features = ["inline"] }
 tap = "1.0.1"
 thiserror = "2.0.15"
 toml = "0.9.5"

src/diff_trees.rs

@@ -9,7 +9,6 @@ use camino::Utf8PathBuf;
 use miette::Context;
 use miette::IntoDiagnostic;
 use owo_colors::OwoColorize;
-use owo_colors::Stream;
 use tap::TryConv;
 use walkdir::WalkDir;
 
@@ -48,20 +47,12 @@ fn display_path_updates(
 ) -> String {
     let mut ret = String::new();
     for path in removed_paths {
-        ret.push_str(
-            &format!("- {path}")
-                .if_supports_color(Stream::Stdout, |text| text.red())
-                .to_string(),
-        );
+        ret.push_str(&format!("- {path}").red().to_string());
         ret.push('\n');
     }
 
     for path in added_paths {
-        ret.push_str(
-            &format!("+ {path}")
-                .if_supports_color(Stream::Stdout, |text| text.green())
-                .to_string(),
-        );
+        ret.push_str(&format!("+ {path}").green().to_string());
         ret.push('\n');
     }
 
@@ -77,21 +68,13 @@ fn display_diff(diff: &Diff) -> String {
             DiffKind::Same => {}
             DiffKind::Added => {
                 let path = entry.format_path(path);
-                ret.push_str(
-                    &format!("+ {path}")
-                        .if_supports_color(Stream::Stdout, |text| text.green())
-                        .to_string(),
-                );
+                ret.push_str(&format!("+ {path}").green().to_string());
                 ret.push('\n');
                 changed_entries += 1;
             }
             DiffKind::Removed => {
                 let path = entry.format_path(path);
-                ret.push_str(
-                    &format!("- {path}")
-                        .if_supports_color(Stream::Stdout, |text| text.red())
-                        .to_string(),
-                );
+                ret.push_str(&format!("- {path}").red().to_string());
                 ret.push('\n');
                 changed_entries += 1;
             }
@@ -101,11 +84,7 @@ fn display_diff(diff: &Diff) -> String {
                 }
 
                 let path = entry.format_path(path);
-                ret.push_str(
-                    &format!("~ {path}")
-                        .if_supports_color(Stream::Stdout, |text| text.yellow())
-                        .to_string(),
-                );
+                ret.push_str(&format!("~ {path}").yellow().to_string());
                 ret.push('\n');
                 changed_entries += 1;
             }

src/id_hasher.rs

@@ -0,0 +1,45 @@
+// Borrowed from `polars_core`:
+// <https://docs.pola.rs/api/rust/dev/polars_core/hashing/struct.IdHasher.html>
+
+use std::hash::BuildHasher;
+use std::hash::Hasher;
+
+#[derive(Default)]
+pub struct IdHasher {
+    hash: u64,
+}
+
+impl Hasher for IdHasher {
+    fn finish(&self) -> u64 {
+        self.hash
+    }
+
+    fn write(&mut self, _bytes: &[u8]) {
+        unreachable!("IdHasher should only be used for integer keys <= 64 bit precision")
+    }
+
+    fn write_u32(&mut self, i: u32) {
+        self.hash = i as u64;
+    }
+
+    #[inline]
+    fn write_u64(&mut self, i: u64) {
+        self.hash = i;
+    }
+
+    fn write_i32(&mut self, i: i32) {
+        self.hash = i as u64;
+    }
+
+    fn write_i64(&mut self, i: i64) {
+        self.hash = i as u64;
+    }
+}
+
+impl BuildHasher for IdHasher {
+    type Hasher = Self;
+
+    fn build_hasher(&self) -> Self::Hasher {
+        Self::default()
+    }
+}

src/main.rs

@@ -1,3 +1,4 @@
+use camino::Utf8Path;
 use clap::Parser;
 
 mod app;
@@ -7,8 +8,10 @@ mod diff_trees;
 mod directories;
 mod format_bulleted_list;
 mod fs;
+mod id_hasher;
 mod nix;
 mod pins;
+mod strings_set;
 mod tracing;
 mod which;
 
@@ -18,6 +21,22 @@ use crate::app::App;
 use crate::config::Config;
 
 fn main() -> miette::Result<()> {
+    let nix = nix::Nix::new()?;
+    println!(
+        "{}",
+        nix::derivation::diff_derivations(
+            &nix,
+            &nix.derivation_info(Utf8Path::new(
+                "/nix/store/bgv2g1nwp7i0nibrpsagpxdmavi8bywv-npingler-packages.drv"
+            ))?,
+            &nix.derivation_info(Utf8Path::new(
+                "/nix/store/8n4z0fzzi19qli6b2rlwlddvgcqsws7j-npingler-packages.drv"
+            ))?,
+        )?
+    );
+
+    panic!("teehee :)");
+
     let opts = cli::Args::parse();
     let filter_reload = tracing::install_tracing(
         opts.log_filter()