mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 20:39:04 +02:00
Update-walker should use basename of .upstream file for default basename of .nix
This commit is contained in:
parent
1797d396ab
commit
248d160f7c
|
@ -88,7 +88,7 @@ ensure_version () {
|
||||||
|
|
||||||
ensure_target () {
|
ensure_target () {
|
||||||
echo "Ensuring target. CURRENT_TARGET: $CURRENT_TARGET" >&2
|
echo "Ensuring target. CURRENT_TARGET: $CURRENT_TARGET" >&2
|
||||||
[ -z "$CURRENT_TARGET" ] && target default.nix
|
[ -z "$CURRENT_TARGET" ] && target "$(basename "$CONFIG_NAME" .upstream).nix"
|
||||||
}
|
}
|
||||||
|
|
||||||
ensure_name () {
|
ensure_name () {
|
||||||
|
@ -227,8 +227,9 @@ do_overwrite () {
|
||||||
|
|
||||||
process_config () {
|
process_config () {
|
||||||
CONFIG_DIR="$(directory_of "$1")"
|
CONFIG_DIR="$(directory_of "$1")"
|
||||||
|
CONFIG_NAME="$(basename "$1")"
|
||||||
BEGIN_EXPRESSION='# Generated upstream information';
|
BEGIN_EXPRESSION='# Generated upstream information';
|
||||||
source "$CONFIG_DIR/$(basename "$1")"
|
source "$CONFIG_DIR/$CONFIG_NAME"
|
||||||
ensure_name
|
ensure_name
|
||||||
ensure_attribute_name
|
ensure_attribute_name
|
||||||
retrieve_version
|
retrieve_version
|
||||||
|
|
Loading…
Reference in a new issue