Revert "fetchurl, fetchgit: use __structuredAttrs = true and pass curlOptsList and sparseCheckout as lists"

pkgs/build-support/fetchgit/builder.sh

@@ -4,8 +4,6 @@
 # - revision specified and remote without HEAD
 #
 
-source "$NIX_ATTRS_SH_FILE"
-
 echo "exporting $url (rev $rev) into $out"
 
 runHook preFetch

pkgs/build-support/fetchgit/default.nix

@@ -138,8 +138,6 @@ lib.makeOverridable (
 
         derivationArgs
         // {
-          __structuredAttrs = true;
-
           inherit name;
 
           builder = ./builder.sh;
@@ -245,11 +243,7 @@ lib.makeOverridable (
               "FETCHGIT_HTTP_PROXIES"
             ];
 
-          outputChecks.out = {
-            ${if allowedRequisites != null then "allowedRequisites" else null} = allowedRequisites;
-          };
-
-          inherit preferLocalBuild meta;
+          inherit preferLocalBuild meta allowedRequisites;
 
           passthru = {
             gitRepoUrl = url;

pkgs/build-support/fetchurl/builder.sh

@@ -1,4 +1,3 @@
-source "$NIX_ATTRS_SH_FILE"
 source $mirrorsFile
 
 curlVersion=$(curl -V | head -1 | cut -d' ' -f2)
@@ -23,10 +22,10 @@ if ! [ -f "$SSL_CERT_FILE" ]; then
     curl+=(--insecure)
 fi
 
-curl+=("${curlOptsList[@]}")
+eval "curl+=($curlOptsList)"
 
 curl+=(
-    ${curlOpts[*]}
+    $curlOpts
     $NIX_CURL_FLAGS
 )
 

pkgs/build-support/fetchurl/default.nix

@@ -135,7 +135,6 @@ lib.extendMkDerivation {
 
       # Passthru information, if any.
       passthru ? { },
-
       # Doing the download on a remote machine just duplicates network
       # traffic, so don't do that by default
       preferLocalBuild ? true,
@@ -241,8 +240,6 @@ lib.extendMkDerivation {
 
     derivationArgs
     // {
-      __structuredAttrs = true;
-
       name =
         if finalAttrs.pname or null != null && finalAttrs.version or null != null then
           "${finalAttrs.pname}-${finalAttrs.version}"
@@ -318,13 +315,14 @@ lib.extendMkDerivation {
         ''
       ) curlOpts;
 
+      curlOptsList = lib.escapeShellArgs curlOptsList;
+
       inherit
-        curlOptsList
-        downloadToTemp
-        executable
+        showURLs
         mirrorsFile
         postFetch
-        showURLs
+        downloadToTemp
+        executable
         ;
 
       impureEnvVars = impureEnvVars ++ netrcImpureEnvVars;