diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index 6a08eb88bf84..c81b49bfb599 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -164,6 +164,7 @@ elsif (defined $expr) { my $algo = $fetch->{type}; my $hash = $fetch->{hash}; my $name = $fetch->{name}; + my $isPatch = $fetch->{isPatch}; if ($hash =~ /^([a-z0-9]+)-([A-Za-z0-9+\/=]+)$/) { $algo = $1; @@ -189,6 +190,11 @@ elsif (defined $expr) { next; } + if ($isPatch) { + print STDERR "skipping $url (support for patches is missing)\n"; + next; + } + next if defined $exclude && $url =~ /$exclude/; if (alreadyMirrored($algo, $hash)) { diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index 990185bbb3bc..685a33d137ce 100644 --- a/maintainers/scripts/find-tarballs.nix +++ b/maintainers/scripts/find-tarballs.nix @@ -14,12 +14,12 @@ let operator = const [ ]; }); - urls = map (drv: { url = head (drv.urls or [ drv.url ]); hash = drv.outputHash; type = drv.outputHashAlgo; name = drv.name; }) fetchurlDependencies; + urls = map (drv: { url = head (drv.urls or [ drv.url ]); hash = drv.outputHash; isPatch = (drv?postFetch && drv.postFetch != ""); type = drv.outputHashAlgo; name = drv.name; }) fetchurlDependencies; fetchurlDependencies = filter (drv: drv.outputHash or "" != "" && drv.outputHashMode or "flat" == "flat" - && drv.postFetch or "" == "" && (drv ? url || drv ? urls)) + && (drv ? url || drv ? urls)) dependencies; dependencies = map (x: x.value) (genericClosure {