diff options
| author | Anderson Torres <torres.anderson.85@protonmail.com> | 2022-11-01 14:24:04 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-01 14:24:04 -0300 |
| commit | 2e92b7cf573989edf8e2f153bdc91bfc5b906064 (patch) | |
| tree | 0a7a59b828bdfb4dbc950d7ed13805804211d44c /maintainers | |
| parent | 597ed547fc40745964f7f846371598086b020a70 (diff) | |
| parent | 956555eca7a2f6e4483dd036afdb44ddcf6f8ca5 (diff) | |
Merge pull request #188626 from rapenne-s/include_patches_tarballs
find-tarballs.nix: Include patches
Diffstat (limited to 'maintainers')
| -rwxr-xr-x | maintainers/scripts/copy-tarballs.pl | 6 | ||||
| -rw-r--r-- | maintainers/scripts/find-tarballs.nix | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index 6a08eb88bf849..c81b49bfb5993 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 990185bbb3bc7..685a33d137ce0 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 { |