Unverified Commit 338c49e0 authored by Silvan Mosberger's avatar Silvan Mosberger Committed by GitHub
Browse files

Merge pull request #273462 from adisbladis/lib-getname-getversion-scopes 

lib.strings: Dont create scopes for getName/getVersion
parents b571c88a bd817120

lib/strings.nix

+12 −12
Original line number Diff line number Diff line
@@ -715,10 +715,10 @@ rec { 
       getName pkgs.youtube-dl

       => "youtube-dl"

  */

  getName = x:

   let

  getName = let

    parse = drv: (parseDrvName drv).name;

   in if isString x

  in x:

    if isString x

    then parse x

    else x.pname or (parse x.name);
@@ -732,10 +732,10 @@ rec { 
       getVersion pkgs.youtube-dl

       => "2016.01.01"

  */

  getVersion = x:

   let

  getVersion = let

    parse = drv: (parseDrvName drv).version;

   in if isString x

  in x:

    if isString x

    then parse x

    else x.version or (parse x.name);