cry/nixide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Split monolithic raw crates into sys crates

Browse source 
Creating a crate for bwd-gc highlights the fact that it would be nice to
fix 2!

The file blocklist is a lost less unmaintainable then the more
fine-grained one we had before.

Fix #9
This commit is contained in:
John Ericson 2025-12-06 15:44:20 -05:00
parent 485070ffa9
commit dbb00333b1
51 changed files with 571 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

9
nix-bindings-store/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "nix-bindings-store"
version = "0.1.1"
version = "0.2.0"
edition = "2021"
build = "build.rs"
license = "LGPL-2.1"
@ -12,8 +12,9 @@ path = "src/lib.rs"
[dependencies]
anyhow = "1.0"
nix-bindings-util = { path = "../nix-bindings-util", version = "0.1.1" }
nix-bindings-util-sys = { path = "../nix-bindings-util-sys", version = "0.1.1" }
nix-bindings-util = { path = "../nix-bindings-util", version = "0.2.0" }
nix-bindings-util-sys = { path = "../nix-bindings-util-sys", version = "0.2.0" }
nix-bindings-store-sys = { path = "../nix-bindings-store-sys", version = "0.2.0" }
lazy_static = "1.4"
[dev-dependencies]
@ -23,7 +24,7 @@ tempfile = "3.10"
[build-dependencies]
pkg-config = "0.3"
# Needed for version parsing in build.rs
nix-bindings-util = { path = "../nix-bindings-util", version = "0.1.1" }
nix-bindings-util = { path = "../nix-bindings-util", version = "0.2.0" }
[lints.rust]
warnings = "deny"

2
nix-bindings-store/src/derivation.rs
View file

@ -1,6 +1,6 @@
#![cfg(nix_at_least = "2.33.0pre")]
use nix_bindings_util_sys as raw;
use nix_bindings_store_sys as raw;
use std::ptr::NonNull;
/// A Nix derivation

2
nix-bindings-store/src/path.rs
View file

@ -1,11 +1,11 @@
use std::ptr::NonNull;
use anyhow::Result;
use nix_bindings_store_sys as raw;
use nix_bindings_util::{
result_string_init,
string_return::{callback_get_result_string, callback_get_result_string_data},
};
use nix_bindings_util_sys as raw;
pub struct StorePath {
raw: NonNull<raw::StorePath>,

5
nix-bindings-store/src/store.rs
View file

@ -1,11 +1,12 @@
use anyhow::{bail, Error, Result};
use lazy_static::lazy_static;
use nix_bindings_store_sys as raw;
use nix_bindings_util::context::Context;
use nix_bindings_util::string_return::{
callback_get_result_string, callback_get_result_string_data,
};
use nix_bindings_util::{check_call, result_string_init};
use nix_bindings_util_sys as raw;
use nix_bindings_util_sys as raw_util;
#[cfg(nix_at_least = "2.33.0pre")]
use std::collections::BTreeMap;
use std::collections::HashMap;
@ -73,7 +74,7 @@ lazy_static! {
#[cfg(nix_at_least = "2.33.0pre")]
unsafe extern "C" fn callback_get_result_store_path_set(
_context: *mut raw::c_context,
_context: *mut raw_util::c_context,
user_data: *mut std::os::raw::c_void,
store_path: *const raw::StorePath,
) {