fetchurl, fetchgit: use __structuredAttrs = true and pass curlOptsList and sparseCheckout as lists (#464475)
This commit is contained in:
@@ -4,6 +4,8 @@
|
||||
# - revision specified and remote without HEAD
|
||||
#
|
||||
|
||||
source "$NIX_ATTRS_SH_FILE"
|
||||
|
||||
echo "exporting $url (rev $rev) into $out"
|
||||
|
||||
runHook preFetch
|
||||
|
||||
@@ -138,6 +138,8 @@ lib.makeOverridable (
|
||||
|
||||
derivationArgs
|
||||
// {
|
||||
__structuredAttrs = true;
|
||||
|
||||
inherit name;
|
||||
|
||||
builder = ./builder.sh;
|
||||
@@ -243,7 +245,11 @@ lib.makeOverridable (
|
||||
"FETCHGIT_HTTP_PROXIES"
|
||||
];
|
||||
|
||||
inherit preferLocalBuild meta allowedRequisites;
|
||||
outputChecks.out = {
|
||||
${if allowedRequisites != null then "allowedRequisites" else null} = allowedRequisites;
|
||||
};
|
||||
|
||||
inherit preferLocalBuild meta;
|
||||
|
||||
passthru = {
|
||||
gitRepoUrl = url;
|
||||
|
||||
Reference in New Issue
Block a user