nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-29 19:30:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #74269 from talyz/backport-getname-fixes

Browse Source 
[19.09] Backport lib.getName fixes
This commit is contained in:
worldofpeace
2019-11-26 16:39:44 +00:00
committed by GitHub
parent b4ede959dd cc8bd613f5
commit e056ef31e9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maintainers/scripts/update.nix
View File

@@ -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);
};

2
pkgs/common-updater/scripts/update-source-version
View File

@@ -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'!"