From e9b835d9752c801642721d1cc9918d66dcc1f0f0 Mon Sep 17 00:00:00 2001 From: Solene Rapenne Date: Sun, 28 Aug 2022 14:51:19 +0200 Subject: [PATCH 1/3] find-tarballs.nix: add a new attribute and include patches files --- maintainers/scripts/find-tarballs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index 990185bbb3bc..32fb5ea0111c 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); 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 { From f0e4074eea548627e1b3a6bc210212b37c62fadf Mon Sep 17 00:00:00 2001 From: Solene Rapenne Date: Sun, 28 Aug 2022 14:51:26 +0200 Subject: [PATCH 2/3] copy-tarballs.pl: skip files that are patches --- maintainers/scripts/copy-tarballs.pl | 6 ++++++ 1 file changed, 6 insertions(+) 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)) { From 956555eca7a2f6e4483dd036afdb44ddcf6f8ca5 Mon Sep 17 00:00:00 2001 From: Solene Rapenne Date: Mon, 29 Aug 2022 10:17:39 +0200 Subject: [PATCH 3/3] find-tarballs.nix: isPatch should be defined only when postFetch is not empty --- maintainers/scripts/find-tarballs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index 32fb5ea0111c..685a33d137ce 100644 --- a/maintainers/scripts/find-tarballs.nix +++ b/maintainers/scripts/find-tarballs.nix @@ -14,7 +14,7 @@ let operator = const [ ]; }); - urls = map (drv: { url = head (drv.urls or [ drv.url ]); hash = drv.outputHash; isPatch = (drv?postFetch); 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