common-updater-scripts: add --rev to update-source-version
Adds a --rev=<revision> parameter to the script that makes it possible to explicitly specify a new revision. Useful to update unstable packages, where the version and revision may be independent.
This commit is contained in:
parent
fe6c692520
commit
4d8e0f9b77
|
@ -10,7 +10,7 @@ die() {
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
echo "Usage: $scriptName <attr> <version> [<new-source-hash>] [<new-source-url>]"
|
echo "Usage: $scriptName <attr> <version> [<new-source-hash>] [<new-source-url>]"
|
||||||
echo " [--version-key=<version-key>] [--system=<system>] [--file=<file-to-update>]"
|
echo " [--version-key=<version-key>] [--system=<system>] [--file=<file-to-update>] [--rev=<revision>]"
|
||||||
echo " [--ignore-same-hash] [--print-changes]"
|
echo " [--ignore-same-hash] [--print-changes]"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -30,6 +30,9 @@ for arg in "$@"; do
|
||||||
die "Could not find provided file $nixFile"
|
die "Could not find provided file $nixFile"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
--rev=*)
|
||||||
|
newRevision="${arg#*=}"
|
||||||
|
;;
|
||||||
--ignore-same-hash)
|
--ignore-same-hash)
|
||||||
ignoreSameHash="true"
|
ignoreSameHash="true"
|
||||||
;;
|
;;
|
||||||
|
@ -111,6 +114,13 @@ if [[ "$oldVersion" = "$newVersion" ]]; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ -n "$newRevision" ]]; then
|
||||||
|
oldRevision=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.src.rev" | tr -d '"')
|
||||||
|
if [[ -z "$oldRevision" ]]; then
|
||||||
|
die "Couldn't evaluate source revision from '$attr.src'!"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# Escape regex metacharacter that are allowed in store path names
|
# Escape regex metacharacter that are allowed in store path names
|
||||||
oldVersionEscaped=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g')
|
oldVersionEscaped=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g')
|
||||||
oldUrlEscaped=$(echo "$oldUrl" | sed -re 's|[${}.+]|\\&|g')
|
oldUrlEscaped=$(echo "$oldUrl" | sed -re 's|[${}.+]|\\&|g')
|
||||||
|
@ -174,6 +184,15 @@ if cmp -s "$nixFile" "$nixFile.bak"; then
|
||||||
die "Failed to replace source hash of '$attr' to a temporary hash!"
|
die "Failed to replace source hash of '$attr' to a temporary hash!"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Replace new revision, if given
|
||||||
|
if [[ -n "$newRevision" ]]; then
|
||||||
|
sed -i "$nixFile" -re "s|\"$oldRevision\"|\"$newRevision\"|"
|
||||||
|
|
||||||
|
if cmp -s "$nixFile" "$nixFile.bak"; then
|
||||||
|
die "Failed to replace source revision '$oldRevision' to '$newRevision' in '$attr'!"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# If new hash not given on the command line, recalculate it ourselves.
|
# If new hash not given on the command line, recalculate it ourselves.
|
||||||
if [[ -z "$newHash" ]]; then
|
if [[ -z "$newHash" ]]; then
|
||||||
nix-build $systemArg --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true
|
nix-build $systemArg --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true
|
||||||
|
|
Loading…
Reference in a new issue