summaryrefslogtreecommitdiff
path: root/lib/strings.nix
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2023-12-11 14:47:48 +1300
committeradisbladis <adisbladis@gmail.com>2023-12-11 14:49:11 +1300
commitbd817120c4c6705e693274e50c578c15e5ca6c13 (patch)
tree6d6c383bfb73548b33a0368d5af27e77a1a6beb9 /lib/strings.nix
parentMerge pull request #250016 from lopsided98/g2o-update (diff)
downloadnixpkgs-bd817120c4c6705e693274e50c578c15e5ca6c13.tar.gz
lib.strings: Dont create scopes for getName/getVersion
We can create the `parse` function in a scope one level up to avoid recomputing it every time.
Diffstat (limited to 'lib/strings.nix')
-rw-r--r--lib/strings.nix24
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/strings.nix b/lib/strings.nix
index 695aaaacd348..3403f9f32bb6 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -715,12 +715,12 @@ rec {
getName pkgs.youtube-dl
=> "youtube-dl"
*/
- getName = x:
- let
- parse = drv: (parseDrvName drv).name;
- in if isString x
- then parse x
- else x.pname or (parse x.name);
+ getName = let
+ parse = drv: (parseDrvName drv).name;
+ in x:
+ if isString x
+ then parse x
+ else x.pname or (parse x.name);
/* This function takes an argument that's either a derivation or a
derivation's "name" attribute and extracts the version part from that
@@ -732,12 +732,12 @@ rec {
getVersion pkgs.youtube-dl
=> "2016.01.01"
*/
- getVersion = x:
- let
- parse = drv: (parseDrvName drv).version;
- in if isString x
- then parse x
- else x.version or (parse x.name);
+ getVersion = let
+ parse = drv: (parseDrvName drv).version;
+ in x:
+ if isString x
+ then parse x
+ else x.version or (parse x.name);
/* Extract name with version from URL. Ask for separator which is
supposed to start extension.