From 84994b8a80bf6f118893f2cf638cadc4bc60a21c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:36:32 +0000 Subject: [PATCH 1/2] Bump once_cell from 1.14.0 to 1.17.0 Bumps [once_cell](https://github.com/matklad/once_cell) from 1.14.0 to 1.17.0. - [Release notes](https://github.com/matklad/once_cell/releases) - [Changelog](https://github.com/matklad/once_cell/blob/master/CHANGELOG.md) - [Commits](https://github.com/matklad/once_cell/compare/v1.14.0...v1.17.0) --- updated-dependencies: - dependency-name: once_cell dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- src/core/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 71f269e6b6..ee1eb5f1ff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -685,9 +685,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.14.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" [[package]] name = "oorandom" diff --git a/src/core/Cargo.toml b/src/core/Cargo.toml index 820a60868e..512d9cf4e9 100644 --- a/src/core/Cargo.toml +++ b/src/core/Cargo.toml @@ -38,7 +38,7 @@ murmurhash3 = "0.0.5" niffler = { version = "2.3.1", default-features = false, features = [ "gz" ] } nohash-hasher = "0.2.0" num-iter = "0.1.43" -once_cell = "1.3.1" # once_cell 1.14+ requires Rust 1.56+ +once_cell = "1.17.0" # once_cell 1.14+ requires Rust 1.56+ rayon = { version = "1.6.1", optional = true } serde = { version = "1.0.152", features = ["derive"] } serde_json = "1.0.91" From 8a6a5884864bffa7310f982ce2f023389ce43775 Mon Sep 17 00:00:00 2001 From: Luiz Irber Date: Tue, 3 Jan 2023 19:39:08 -0800 Subject: [PATCH 2/2] use importCargoLock to avoid breaking dependabot on every Cargo update --- flake.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 745fcbb0cc..fc2235eed9 100644 --- a/flake.nix +++ b/flake.nix @@ -95,10 +95,8 @@ src = ./.; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-IaIX4RdXEhLQhne+QiSfdP1KiIwZUqxRg14uWknS+0o="; + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; }; nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ];