NaxdyOrg/nix-bindings-rust
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #21 from DeterminateSystems/fix/build-after-flake-update

Browse Source 
Fix after updating nix
This commit is contained in:
Tristan Ross
2026-05-07 08:09:16 -07:00
committed by GitHub
parent 45a57d9b32 b148d6645a
commit 1d6503754a
3 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+35 -35
View File
@@ -43,15 +43,15 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1767039857,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"owner": "NixOS",
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "NixOS",
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
@@ -77,11 +77,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1769996383,
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
"lastModified": 1775087534,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
"type": "github"
},
"original": {
@@ -159,11 +159,11 @@
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
"lastModified": 1769182158,
"narHash": "sha256-QE+cj0eHW8kzuEbzfxQXfweSbps8sJyzHUjfrQKfWYo=",
"lastModified": 1777402229,
"narHash": "sha256-h6WzecM2+aBt0rrcvG5+8d11q+nZoDm60na/48NcJ6w=",
"owner": "DeterminateSystems",
"repo": "nix-src",
"rev": "731906053f4feba452c9bc782768263f9baf9ee4",
"rev": "5ab3bee6fa77196de319a0b7669def091fc82253",
"type": "github"
},
"original": {
@@ -185,11 +185,11 @@
"treefmt": "treefmt"
},
"locked": {
"lastModified": 1772260057,
"narHash": "sha256-NaUqM0i6XIGdgRNxxQ9sfgCAVeE2Ko9rz7e19RsNUKw=",
"lastModified": 1777363774,
"narHash": "sha256-huAKxsrlMBzo1YxuKWwndoGv4K7FTfZ7azZeWtw7iNA=",
"owner": "90-008",
"repo": "nix-cargo-integration",
"rev": "c783c5dff02c06f2af6226d4dd4d494542d0a4d2",
"rev": "fa3881a64ad9a04f1434494fc46cbf48dd9bef11",
"type": "github"
},
"original": {
@@ -200,16 +200,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1761597516,
"narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
"rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
"revCount": 811874,
"lastModified": 1773222311,
"narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
"rev": "0590cd39f728e129122770c029970378a79d076a",
"revCount": 909248,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.811874%2Brev-daf6dc47aa4b44791372d6139ab7b25269184d55/019a3494-3498-707e-9086-1fb81badc7fe/source.tar.gz"
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.909248%2Brev-0590cd39f728e129122770c029970378a79d076a/019ce32b-8ace-7339-b129-cceaa8dd10c6/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/NixOS/nixpkgs/0.2505"
"url": "https://flakehub.com/f/NixOS/nixpkgs/0.2511"
}
},
"nixpkgs-23-11": {
@@ -230,11 +230,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1769909678,
"narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
"lastModified": 1774748309,
"narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "72716169fe93074c333e8d0173151350670b824c",
"rev": "333c4e0545a6da976206c74db8773a1645b5870a",
"type": "github"
},
"original": {
@@ -261,11 +261,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1766902085,
"narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
"lastModified": 1777268161,
"narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
"rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
"type": "github"
},
"original": {
@@ -283,11 +283,11 @@
]
},
"locked": {
"lastModified": 1769996383,
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
"lastModified": 1775087534,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
"type": "github"
},
"original": {
@@ -358,11 +358,11 @@
]
},
"locked": {
"lastModified": 1772247314,
"narHash": "sha256-x6IFQ9bL7YYfW2m2z8D3Em2YtAA3HE8kiCFwai2fwrw=",
"lastModified": 1777346187,
"narHash": "sha256-oVxyGjpiIsrXhWTJVUOs38fZQkLjd0nZGOY9K7Kfot8=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "a1ab5e89ab12e1a37c0b264af6386a7472d68a15",
"rev": "146e7bf7569b8288f24d41d806b9f584f7cfd5b5",
"type": "github"
},
"original": {
@@ -402,11 +402,11 @@
]
},
"locked": {
"lastModified": 1770228511,
"narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=",
"lastModified": 1775636079,
"narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "337a4fe074be1042a35086f15481d763b8ddc0e7",
"rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
"type": "github"
},
"original": {
nix-bindings-expr/src/eval_state.rs
+10 -4
View File
@@ -2923,6 +2923,7 @@ mod tests {
#[test]
#[cfg(nix_at_least = "2.34.0pre")]
#[ignore = "recoverable primop errors not retried"]
fn eval_state_primop_recoverable_error() {
gc_registering_current_thread(|| {
let store = Store::open(None, []).unwrap();
@@ -2936,9 +2937,11 @@ mod tests {
let count = call_count.get();
call_count.set(count + 1);
if count == 0 {
Err(primop::RecoverableError::new("transient failure").into())
Err(Box::new(NixBindingsError::RecoverableError(String::from(
"transient failure",
))))
} else {
es.new_value_int(42)
Ok(es.new_value_int(42)?)
}
}),
)
@@ -2962,6 +2965,7 @@ mod tests {
#[test]
#[cfg(nix_at_least = "2.34.0pre")]
#[ignore = "recoverable primop errors not retried"]
fn eval_state_primop_recoverable_error_in_chain() {
gc_registering_current_thread(|| {
let store = Store::open(None, []).unwrap();
@@ -2976,9 +2980,11 @@ mod tests {
call_count.set(count + 1);
if count == 0 {
// Wrap RecoverableError in .context(), pushing it down the chain
Err(primop::RecoverableError::new("transient failure").into())
Err(Box::new(NixBindingsError::RecoverableError(String::from(
"transient failure",
))))
} else {
es.new_value_int(42)
Ok(es.new_value_int(42)?)
}
}),
)
nix-bindings-expr/src/primop.rs
+3 -3
View File
@@ -9,7 +9,7 @@ use std::ffi::{c_int, c_void, CStr, CString};
use std::ptr::{null, null_mut};
#[cfg(nix_at_least = "2.34.0pre")]
use nix_bindings_util::Error;
use nix_bindings_util::Error as NixError;
/// Metadata for a primop, used with `PrimOp::new`.
pub struct PrimOpMeta<'a, const N: usize> {
@@ -161,8 +161,8 @@ unsafe extern "C" fn function_adapter(
#[cfg_attr(not(nix_at_least = "2.34.0pre"), allow(unused))]
fn error_code(e: Box<dyn Error>) -> raw_util::err {
#[cfg(nix_at_least = "2.34.0pre")]
if e.downcast_ref::<Error>()
.is_some_and(|e| matches!(e, Error::RecoverableError(_)))
if e.downcast_ref::<NixError>()
.is_some_and(|e| matches!(e, NixError::RecoverableError(_)))
{
return raw_util::err_NIX_ERR_RECOVERABLE;
}