talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

buildRustCrate: also replace hyphens in CRATEVERSION

Browse Source 
PR #401965 missed that SemVer (which is the format cargo enforces for
version) also allows hyphens which bash doesn't like.
This commit is contained in:
sternenseemann 2025-07-07 22:05:54 +02:00
parent deb20abbe1
commit c2f705ce80
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/build-support/rust/build-rust-crate/configure-crate.nix
View File

@ -246,7 +246,10 @@ in
IFS="$_OLDIFS"
CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/" -e "s/-/_/g")
CRATEVERSION=$(echo ${crateVersion} | sed -e "s/[\.\+]/_/g")
# SemVer allows version numbers to contain alphanumeric characters and `.+-`
# which aren't legal bash identifiers.
# https://semver.org/#backusnaur-form-grammar-for-valid-semver-versions
CRATEVERSION=$(echo ${crateVersion} | sed -e "s/[\.\+-]/_/g")
grep -P "^cargo:(?!:?(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \
| awk -F= "/^cargo::metadata=/ { gsub(/-/, \"_\", \$2); print \"export \" toupper(\"DEP_$(echo $CRATENAME)_\" \$2) \"=\" \"\\\"\"\$3\"\\\"\"; next }
/^cargo:/ { sub(/^cargo::?/, \"\", \$1); gsub(/-/, \"_\", \$1); print \"export \" toupper(\"DEP_$(echo $CRATENAME)_\" \$1) \"=\" \"\\\"\"\$2\"\\\"\"; print \"export \" toupper(\"DEP_$(echo $CRATENAME)_$(echo $CRATEVERSION)_\" \$1) \"=\" \"\\\"\"\$2\"\\\"\"; next }" > target/env