From d601532dfcd70844b347bf4eaf641ff2ff86c7bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 1 Apr 2021 22:49:58 +0200 Subject: [PATCH 1/2] intltool: fix fetchurl invocation --- pkgs/development/tools/misc/intltool/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index 7a3379d5921..967fc442a73 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # fix "unescaped left brace" errors when using intltool in some cases patches = [(fetchpatch { name = "perl5.26-regex-fixes.patch"; - url = [ + urls = [ "https://sources.debian.org/data/main/i/intltool/0.51.0-5/debian/patches/perl5.26-regex-fixes.patch" "https://src.fedoraproject.org/rpms/intltool/raw/d8d2ef29fb122a42a6b6678eb1ec97ae56902af2/f/intltool-perl5.26-regex-fixes.patch" ]; From e5ec487840c458146440511e8d23f13de9bcadca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 1 Apr 2021 22:29:39 +0200 Subject: [PATCH 2/2] fetchurl: check that `url` is a string Otherwise we (may) get a hard to debug issue in the tarball job, e.g. see the grandparent commit. --- pkgs/build-support/fetchurl/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index c65738aef41..8ce69a7f187 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -104,7 +104,9 @@ let if urls != [] && url == "" then (if lib.isList urls then urls else throw "`urls` is not a list") - else if urls == [] && url != "" then [url] + else if urls == [] && url != "" then + (if lib.isString url then [url] + else throw "`url` is not a string") else throw "fetchurl requires either `url` or `urls` to be set"; hash_ =