attic/nix_store: Add support for Lix

Fixes #229.

Co-authored-by: Nikodem Rabuliński <nikodem@rabulinski.com>

Author: zhaofengli

.github/workflows/build.yml

@@ -76,6 +76,7 @@ jobs:
           - "2.24"
           - "2.25"
           - "2.26"
+          - "lix-2.91"
           - "default"
     runs-on: ${{ matrix.os }}
     steps:

attic/Cargo.toml

@@ -50,13 +50,17 @@ system-deps = { version = "7.0", optional = true }
 version-compare = "0.2.0"
 
 [package.metadata.system-deps]
-nix-store = { version = "2.24", feature = "nix_store" }
-nix-main = { version = "2.24", feature = "nix_store" }
+nix-store = { version = "2.24", feature = "nix_store_nix" }
+nix-main = { version = "2.24", feature = "nix_store_nix" }
+
+lix-store = { version = "2.91", feature = "nix_store_lix" }
+lix-main = { version = "2.91", feature = "nix_store_lix" }
 
 [features]
 default = [
 	"chunking",
 	"nix_store",
+	"nix_store_nix",
 	"stream",
 	"tokio",
 ]
@@ -76,6 +80,9 @@ nix_store = [
 	"dep:system-deps",
 ]
 
+nix_store_nix = []
+nix_store_lix = []
+
 # Stream utilities.
 stream = ["tokio", "dep:async-stream"]
 

attic/build.rs

@@ -13,7 +13,13 @@ mod nix_store {
     use version_compare::Version;
     use system_deps::Dependencies;
 
+    #[cfg(all(feature = "nix_store_nix", feature = "nix_store_lix"))]
+    compile_error!("nix_store_nix and nix_store_lix are mutually exclusive");
 
+    #[cfg(all(not(feature = "nix_store_nix"), not(feature = "nix_store_lix")))]
+    compile_error!("One of nix_store_nix and nix_store_lix must be enabled");
+
+    #[cfg(feature = "nix_store_nix")]
     fn apply_variant_flags(build: &mut Build, deps: &Dependencies) {
         let nix_main = deps.get_by_name("nix-main").expect("Failed to get version of nix-main");
         let version = Version::from(&nix_main.version).unwrap();
@@ -28,6 +34,11 @@ mod nix_store {
         build.define("NIX_VERSION", &*format!("{version}"));
     }
 
+    #[cfg(feature = "nix_store_lix")]
+    fn apply_variant_flags(build: &mut Build, deps: &Dependencies) {
+        build.define("ATTIC_VARIANT_LIX", None);
+    }
+
     pub fn build_bridge() {
         let deps = system_deps::Config::new().probe().unwrap();
 

attic/src/nix_store/bindings/nix-includes.hpp

@@ -14,6 +14,17 @@
 	#include <nix/path.hh>
 	#include <nix/serialise.hh>
 	#include <nix/shared.hh>
+#elif defined(ATTIC_VARIANT_LIX)
+	#include <lix/config.h>
+
+	#include <lix/libstore/store-api.hh>
+	#include <lix/libstore/local-store.hh>
+	#include <lix/libstore/remote-store.hh>
+	#include <lix/libstore/uds-remote-store.hh>
+	#include <lix/libutil/hash.hh>
+	#include <lix/libstore/path.hh>
+	#include <lix/libutil/serialise.hh>
+	#include <lix/libmain/shared.hh>
 #else
 	#error Unsupported variant
 #endif

attic/src/nix_store/bindings/nix.hpp

@@ -25,7 +25,11 @@ using RBasePathSlice = RSlice<const unsigned char>;
 using RHashSlice = RSlice<const unsigned char>;
 
 static bool hash_is_sha256(const nix::Hash &hash) {
+#ifdef ATTIC_VARIANT_LIX
+	return hash.type == nix::HashType::SHA256;
+#else
 	return hash.algo == nix::HashAlgorithm::SHA256;
+#endif
 }
 
 struct AsyncWriteSender;

flake/nix-versions.nix

@@ -39,6 +39,7 @@ in
           "2.24" = pkgs.nixVersions.nix_2_24;
           "2.25" = pkgs.nixVersions.nix_2_25;
           "2.26" = pkgs.nixVersions.nix_2_26;
+          "lix-2.91" = pkgs.lixVersions.lix_2_91;
         };
 
         manifestFile = let