From 5eedbab04126e3719491f1206fa7b4e8f8c672b4 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Tue, 3 Oct 2023 11:09:37 -0700 Subject: [PATCH] Update nix-config-parser (#664) --- Cargo.lock | 18 ++++++++++-------- Cargo.toml | 3 ++- src/action/common/place_nix_configuration.rs | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cf5ef8b..a7895ab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -614,9 +614,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" [[package]] name = "heck" @@ -784,12 +784,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.1", "serde", ] @@ -943,10 +943,11 @@ dependencies = [ [[package]] name = "nix-config-parser" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a94767d6f881412ae02a87a4b6136b4079cbda9d3eab8f4ae272c9db740902c" +checksum = "383d96c6f2c44fc706e7a523743434465d62db109b7c8364b642f35853475d67" dependencies = [ + "indexmap 2.0.2", "serde", "thiserror", ] @@ -963,6 +964,7 @@ dependencies = [ "dyn-clone", "eyre", "glob", + "indexmap 2.0.2", "is_ci", "nix", "nix-config-parser", @@ -1527,7 +1529,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.0.0", + "indexmap 2.0.2", "serde", "serde_json", "serde_with_macros", diff --git a/Cargo.toml b/Cargo.toml index 4dc906a..2964650 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,10 +56,11 @@ uuid = { version = "1.2.2", features = ["serde"] } os-release = { version = "0.1.0", default-features = false } is_ci = { version = "1.1.1", default-features = false, optional = true } strum = { version = "0.25.0", features = ["derive"] } -nix-config-parser = { version = "0.1.2", features = ["serde"] } +nix-config-parser = { version = "0.2", features = ["serde"] } which = "4.4.0" sysctl = "0.5.4" walkdir = "2.3.3" +indexmap = { version = "2.0.2", features = ["serde"] } [dev-dependencies] eyre = { version = "0.6.8", default-features = false, features = [ "track-caller" ] } diff --git a/src/action/common/place_nix_configuration.rs b/src/action/common/place_nix_configuration.rs index d24fcad..a7db6ab 100644 --- a/src/action/common/place_nix_configuration.rs +++ b/src/action/common/place_nix_configuration.rs @@ -8,7 +8,7 @@ use crate::action::{ }; use crate::parse_ssl_cert; use crate::settings::UrlOrPathOrString; -use std::collections::hash_map::Entry; +use indexmap::map::Entry; use std::path::PathBuf; const NIX_CONF_FOLDER: &str = "/etc/nix";