From 63089535472f5634471967e276843375ba818603 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 23 Jun 2010 04:50:03 +0000 Subject: [PATCH] Small fixes to auto-updater svn path=/nixpkgs/trunk/; revision=22389 --- pkgs/build-support/upstream-updater/create-src-info.sh | 2 +- pkgs/build-support/upstream-updater/update-upstream-data.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/upstream-updater/create-src-info.sh b/pkgs/build-support/upstream-updater/create-src-info.sh index b5c235dcfcf8..fbbbe33a9e7b 100755 --- a/pkgs/build-support/upstream-updater/create-src-info.sh +++ b/pkgs/build-support/upstream-updater/create-src-info.sh @@ -9,7 +9,7 @@ own_dir="$(cd "$(dirname "$0")"; sh -c pwd)" -cp "$own_dir/../builder-defs/template-bdp-uud.nix" "$1.nix" +cp "$own_dir/../builder-defs/template-auto-callable.nix" "$1.nix" sed -e "s@src-for-default.nix@src-for-$1.nix@g" -i "$1.nix" echo '{}' > "src-for-$1.nix" cat << EOF > src-info-for-$1.nix diff --git a/pkgs/build-support/upstream-updater/update-upstream-data.sh b/pkgs/build-support/upstream-updater/update-upstream-data.sh index 936e90f13c19..ac23029bc738 100755 --- a/pkgs/build-support/upstream-updater/update-upstream-data.sh +++ b/pkgs/build-support/upstream-updater/update-upstream-data.sh @@ -57,7 +57,7 @@ prefetchClause="" version="$(echo "$freshUrl" | sed -re "$extractReleaseSF")" - baseName="$(getAttr baseName "$(echo "freshUrl" | sed -re 's@.*/projects/([^/]+)/.*@\1@')")" + baseName="$(getAttr baseName "$(echo "$freshUrl" | sed -re 's@.*/projects/([^/]+)/.*@\1@')")" url="$freshUrl" name="$baseName-$version" advertisedUrl="$freshUrl"