From 776b4560222462c7670b62ddf85aa3d0ebae1434 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 25 Nov 2019 15:08:34 -0500
Subject: [PATCH 1/2] update.nix: fix eval

(cherry picked from commit e716e86bedf7ca567f902317b9ce105253478e2c)
---
 maintainers/scripts/update.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix
index 7192f6e3b234..60c6113bf70f 100755
--- a/maintainers/scripts/update.nix
+++ b/maintainers/scripts/update.nix
@@ -126,7 +126,7 @@ let
 
   packageData = package: {
     name = package.name;
-    pname = lib.getName package;
+    pname = pkgs.lib.getName package;
     updateScript = map builtins.toString (pkgs.lib.toList package.updateScript);
   };
 

From cc8bd613f5ab99e4c9a87d7c98cfbdbdfcab9e83 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Tue, 26 Nov 2019 14:18:33 +0100
Subject: [PATCH 2/2] common-updater-scripts: Fix breakage

Fixes a bug introduced by 9b090ccbca3f7dd26d91db06e96e8bf8282c37ca
where the script fails to run if $attr.${versionKey} exists.

(cherry picked from commit 809768bb91c04fd49b8500daf9b68a450b9fa55c)
---
 pkgs/common-updater/scripts/update-source-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version
index 0a436ff02a3d..d051a0f75c13 100755
--- a/pkgs/common-updater/scripts/update-source-version
+++ b/pkgs/common-updater/scripts/update-source-version
@@ -93,7 +93,7 @@ if [ -z "$oldUrl" ]; then
 fi
 
 drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; lib.getName $attr" | tr -d '"')
-oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or lib.getVersion $attr" | tr -d '"')
+oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (lib.getVersion $attr)" | tr -d '"')
 
 if [ -z "$drvName" -o -z "$oldVersion" ]; then
     die "Couldn't evaluate name and version from '$attr.name'!"