crane-utils: bump dependencies (#508)

ipetkov · Jan 28, 2024 · c5a3c5d · c5a3c5d
1 parent 960d350
commit c5a3c5d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/lib/downloadCargoPackageFromGit.nix b/lib/downloadCargoPackageFromGit.nix
@@ -44,15 +44,15 @@ let
 in
 runCommand "cargo-git" deps ''
   mkdir -p $out
-  existing_crates=()
+  declare -A existing_crates
   while read -r cargoToml; do
     local crate=$(
       cargo metadata --format-version 1 --no-deps --manifest-path "$cargoToml" |
       jq -r '.packages[] | select(.manifest_path == "'"$cargoToml"'") | "\(.name)-\(.version)"'
     )
 
     if [ -n "$crate" ]; then
-      if [[ " ''${existing_crates[*]} " =~ " $crate " ]]; then
+      if [[ -n "''${existing_crates["$crate"]}" ]]; then
         >&2 echo "warning: skipping duplicate package $crate found at $cargoToml"
         continue
       fi
@@ -65,7 +65,7 @@ runCommand "cargo-git" deps ''
       crane-resolve-workspace-inheritance "$cargoToml" > "$dest/Cargo.toml.resolved" &&
         mv "$dest/Cargo.toml"{.resolved,}
 
-      existing_crates+=("$crate")
+      existing_crates["$crate"]='1'
     fi
   done < <(find ${repo} -name Cargo.toml)
 ''
diff --git a/pkgs/crane-utils/Cargo.lock b/pkgs/crane-utils/Cargo.lock
diff --git a/pkgs/crane-utils/Cargo.toml b/pkgs/crane-utils/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 anyhow = "1"
 serde_json = "1"
 serde = { version = "1", features = ["derive"] }
-toml_edit = "0.20.1"
+toml_edit = "0.21.0"
 
 [dev-dependencies]
 pretty_assertions = "1.3.0"
diff --git a/pkgs/crane-utils/default.nix b/pkgs/crane-utils/default.nix
@@ -8,5 +8,5 @@ rustPlatform.buildRustPackage {
 
   src = lib.sourceFilesBySuffices ./. [ ".rs" ".toml" ".lock" ];
 
-  cargoSha256 = "sha256-joZrcKKByaGopWzPhaytCSU+LnlhQaNIXZoh40UCSrM=";
+  cargoSha256 = "sha256-/ybcjLrjLBuL8jYN0thBQtqyrpKDPAltF9sRqc98Yw0=";
 }