From c8f63831bab45efe19fbbf1d873a888acc0bba74 Mon Sep 17 00:00:00 2001 From: Yann Hamdaoui Date: Wed, 3 Jul 2024 10:59:24 +0200 Subject: [PATCH] Manual flake.lock update to hopefully fix CI And add nix-flake as a new dependency for the Nix FFI, since it was modularized upstream in latest Nix versions and thus need to be mentioned explicitly now. --- core/build.rs | 2 +- flake.lock | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/build.rs b/core/build.rs index 22ff4805d6..27895e9264 100644 --- a/core/build.rs +++ b/core/build.rs @@ -9,7 +9,7 @@ fn main() { use cxx_build::CFG; use std::path::PathBuf; - for lib in &["nix-store", "nix-cmd", "nix-expr", "nix-main"] { + for lib in &["nix-store", "nix-cmd", "nix-expr", "nix-main", "nix-flake"] { let lib = pkg_config::Config::new() .atleast_version("2.16.0") .probe(lib) diff --git a/flake.lock b/flake.lock index 01d7ef7383..c461a681a3 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1719685792, - "narHash": "sha256-WIoVERD4AN6CmfGSRPy3mfPx2dDbRHgzP2V8z6aNbaY=", + "lastModified": 1720025378, + "narHash": "sha256-zlIdj0oLvMEHlllP/7tvY+kE987xsN4FPux6WHSOh00=", "owner": "ipetkov", "repo": "crane", - "rev": "aa5dcd0518a422dfd545d565f0d5a25971fea52a", + "rev": "087e08a41009bf083d51ab35d8e30b1b7eafa7b0", "type": "github" }, "original": { @@ -242,11 +242,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1719654710, - "narHash": "sha256-DX6diqlV5taowCyZ040rSKHr6OuRWZIc3zpDME9Cj/g=", + "lastModified": 1720022199, + "narHash": "sha256-zzmTr3eDQpmTInSOvVuBG5ID0rlz7qNlAvP69qf1O54=", "owner": "nixos", "repo": "nix", - "rev": "32e6cc64b5e22cc47e4fb440ba049881dce4f127", + "rev": "509be0e77aacd8afcf419526620994cbbbe3708a", "type": "github" }, "original": { @@ -321,11 +321,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1719506693, - "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", + "lastModified": 1719848872, + "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", + "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "type": "github" }, "original": { @@ -423,11 +423,11 @@ ] }, "locked": { - "lastModified": 1719627476, - "narHash": "sha256-LBfULF+2sCaWmkjmj1LkkGrAS/E9ZdXU1A5wWKjt9p0=", + "lastModified": 1720059535, + "narHash": "sha256-h/O3PoV3KvQG4tC5UpANBZOsptAZCzEGiwyi+3oSpYc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5be53be9e5c766fc72fc5d65ba8a566cc0c3217f", + "rev": "8deeed2dfa21837c7792b46b6a9b2e73f97b472b", "type": "github" }, "original": {