From 7deac8b8f703702d8ec68490dc2be2301696be8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 4 Oct 2022 17:30:06 +0200 Subject: [PATCH] fetchurl: add pname+version support --- pkgs/build-support/fetchurl/default.nix | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index a85d53adb82..72cfd20652b 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -57,6 +57,11 @@ in # first element of `urls'). name ? "" + # for versioned downloads optionally take pname + version. + # if name is set that is preferred +, pname ? "" +, version ? "" + , # SRI hash. hash ? "" @@ -130,12 +135,16 @@ let else throw "fetchurl requires a hash for fixed-output derivation: ${lib.concatStringsSep ", " urls_}"; in -stdenvNoCC.mkDerivation { - name = - if showURLs then "urls" - else if name != "" then name - else baseNameOf (toString (builtins.head urls_)); - +stdenvNoCC.mkDerivation (( + if (pname != "" && version != "") then + { inherit pname version; } + else + { name = + if showURLs then "urls" + else if name != "" then name + else baseNameOf (toString (builtins.head urls_)); + } +) // { builder = ./builder.sh; nativeBuildInputs = [ curl ] ++ nativeBuildInputs; @@ -177,4 +186,4 @@ stdenvNoCC.mkDerivation { inherit meta; passthru = { inherit url; } // passthru; -} +})