From d3e5b8feeea29e91b784023432832b5b68514035 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Dec 2012 13:05:43 +0400
Subject: [PATCH] Fix dummy pseudo-updates being found for some packages

---
 .../upstream-updater/update-walker.sh            | 16 ++++++++++++++--
 .../tools/misc/intltool/default.upstream         |  1 +
 pkgs/games/lincity/ng.upstream                   |  1 +
 pkgs/tools/graphics/asymptote/default.nix        |  1 +
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/upstream-updater/update-walker.sh b/pkgs/build-support/upstream-updater/update-walker.sh
index 8d7a6b219f1..b8621616169 100755
--- a/pkgs/build-support/upstream-updater/update-walker.sh
+++ b/pkgs/build-support/upstream-updater/update-walker.sh
@@ -97,6 +97,12 @@ ensure_name () {
   echo "Resulting name: $CURRENT_NAME"
 }
 
+ensure_attribute_name () {
+  echo "Ensuring attribute name. CURRENT_ATTRIBUTE_NAME: $CURRENT_ATTRIBUTE_NAME" >&2
+  [ -z "$CURRENT_ATTRIBUTE_NAME" ] && attribute_name "$CURRENT_NAME"
+  echo "Resulting attribute name: $CURRENT_ATTRIBUTE_NAME"
+}
+
 ensure_choice () {
   echo "Ensuring that choice is made." >&2
   echo "NEED_TO_CHOOSE_URL: [$NEED_TO_CHOOSE_URL]." >&2
@@ -127,8 +133,13 @@ name () {
   echo "CURRENT_NAME: $CURRENT_NAME" >&2
 }
 
+attribute_name () {
+  CURRENT_ATTRIBUTE_NAME="$1"
+  echo "CURRENT_ATTRIBUTE_NAME: $CURRENT_ATTRIBUTE_NAME" >&2
+}
+
 retrieve_version () {
-  PACKAGED_VERSION="$(nix-instantiate --eval-only '<nixpkgs>' -A "$CURRENT_NAME".meta.version | xargs)"
+  PACKAGED_VERSION="$(nix-instantiate --eval-only '<nixpkgs>' -A "$CURRENT_ATTRIBUTE_NAME".meta.version | xargs)"
 }
 
 directory_of () {
@@ -159,7 +170,7 @@ do_write_expression () {
   echo "${1}rec {"
   echo "${1}  baseName=\"$CURRENT_NAME\";"
   echo "${1}  version=\"$CURRENT_VERSION\";"
-  echo "${1}  name=\"$CURRENT_NAME-$CURRENT_VERSION\";"
+  echo "${1}  name=\"\${baseName}-\${version}\";"
   echo "${1}  hash=\"$CURRENT_HASH\";"
   echo "${1}  url=\"$CURRENT_URL\";"
   echo "${1}  sha256=\"$CURRENT_HASH\";"
@@ -219,6 +230,7 @@ process_config () {
   BEGIN_EXPRESSION='# Generated upstream information';
   source "$CONFIG_DIR/$(basename "$1")"
   ensure_name
+  ensure_attribute_name
   retrieve_version
   ensure_choice
   ensure_version
diff --git a/pkgs/development/tools/misc/intltool/default.upstream b/pkgs/development/tools/misc/intltool/default.upstream
index dc40b90e6cc..4a2965b036a 100644
--- a/pkgs/development/tools/misc/intltool/default.upstream
+++ b/pkgs/development/tools/misc/intltool/default.upstream
@@ -1 +1,2 @@
+attribute_name intltool_standalone
 url https://launchpad.net/intltool/+download
diff --git a/pkgs/games/lincity/ng.upstream b/pkgs/games/lincity/ng.upstream
index 6288c922a0b..d73d1a2c419 100644
--- a/pkgs/games/lincity/ng.upstream
+++ b/pkgs/games/lincity/ng.upstream
@@ -1,4 +1,5 @@
 target ng.nix
+attribute_name lincity_ng
 url https://fedorahosted.org/LinCity-NG/wiki/Downloads
 version_link tar.bz2
 version_link tar.bz2
diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index 6a2b799f2b4..e32a3901a92 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -59,6 +59,7 @@ rec {
   '' ["minInit" "addInputs" "doUnpack"];
 
   meta = {
+    inherit (s) version;
     description = "A tool for programming graphics intended to replace Metapost";
     maintainers = [
       a.lib.maintainers.raskin