mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-21 04:28:40 +03:00
Merge pull request #188626 from rapenne-s/include_patches_tarballs
find-tarballs.nix: Include patches
This commit is contained in:
commit
2e92b7cf57
@ -164,6 +164,7 @@ elsif (defined $expr) {
|
|||||||
my $algo = $fetch->{type};
|
my $algo = $fetch->{type};
|
||||||
my $hash = $fetch->{hash};
|
my $hash = $fetch->{hash};
|
||||||
my $name = $fetch->{name};
|
my $name = $fetch->{name};
|
||||||
|
my $isPatch = $fetch->{isPatch};
|
||||||
|
|
||||||
if ($hash =~ /^([a-z0-9]+)-([A-Za-z0-9+\/=]+)$/) {
|
if ($hash =~ /^([a-z0-9]+)-([A-Za-z0-9+\/=]+)$/) {
|
||||||
$algo = $1;
|
$algo = $1;
|
||||||
@ -189,6 +190,11 @@ elsif (defined $expr) {
|
|||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($isPatch) {
|
||||||
|
print STDERR "skipping $url (support for patches is missing)\n";
|
||||||
|
next;
|
||||||
|
}
|
||||||
|
|
||||||
next if defined $exclude && $url =~ /$exclude/;
|
next if defined $exclude && $url =~ /$exclude/;
|
||||||
|
|
||||||
if (alreadyMirrored($algo, $hash)) {
|
if (alreadyMirrored($algo, $hash)) {
|
||||||
|
@ -14,12 +14,12 @@ let
|
|||||||
operator = const [ ];
|
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 =
|
fetchurlDependencies =
|
||||||
filter
|
filter
|
||||||
(drv: drv.outputHash or "" != "" && drv.outputHashMode or "flat" == "flat"
|
(drv: drv.outputHash or "" != "" && drv.outputHashMode or "flat" == "flat"
|
||||||
&& drv.postFetch or "" == "" && (drv ? url || drv ? urls))
|
&& (drv ? url || drv ? urls))
|
||||||
dependencies;
|
dependencies;
|
||||||
|
|
||||||
dependencies = map (x: x.value) (genericClosure {
|
dependencies = map (x: x.value) (genericClosure {
|
||||||
|
Loading…
Reference in New Issue
Block a user