public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #118283 from vcunat/p/fetchurl-typecheck

This commit is contained in:
Sandro 2021-04-02 00:24:43 +02:00 committed by GitHub
parent 20ab57778b e5ec487840
commit 9bbfb26854
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/fetchurl/default.nix
View File

@ -104,7 +104,9 @@ let
if urls != [] && url == "" then if urls != [] && url == "" then
(if lib.isList urls then urls (if lib.isList urls then urls
else throw "`urls` is not a list") 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"; else throw "fetchurl requires either `url` or `urls` to be set";
hash_ = hash_ =

2
pkgs/development/tools/misc/intltool/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
# fix "unescaped left brace" errors when using intltool in some cases # fix "unescaped left brace" errors when using intltool in some cases
patches = [(fetchpatch { patches = [(fetchpatch {
name = "perl5.26-regex-fixes.patch"; 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://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" "https://src.fedoraproject.org/rpms/intltool/raw/d8d2ef29fb122a42a6b6678eb1ec97ae56902af2/f/intltool-perl5.26-regex-fixes.patch"
]; ];