From 7ca8e139189ff3935dbe6ef12ff014cf8e028e04 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Jan 2016 20:08:22 +0100 Subject: [PATCH] lib.getVersion: extend the function to cope with strings as well as derivations --- lib/strings.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/strings.nix b/lib/strings.nix index 098da975c60..fc6c2152b9f 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -189,9 +189,13 @@ rec { versionAtLeast = v1: v2: !versionOlder v1 v2; - # Get the version of the specified derivation, as specified in its - # ‘name’ attribute. - getVersion = drv: (builtins.parseDrvName drv.name).version; + # This function takes an argument that's either a derivation or a + # derivation's "name" attribute and extracts the version part from that + # argument. For example: + # + # lib.getVersion "youtube-dl-2016.01.01" ==> "2016.01.01" + # lib.getVersion pkgs.youtube-dl ==> "2016.01.01" + getVersion = x: (builtins.parseDrvName (x.name or x)).version; # Extract name with version from URL. Ask for separator which is