Unverified Commit 2e92b7cf authored by Anderson Torres's avatar Anderson Torres Committed by GitHub
Browse files

Merge pull request #188626 from rapenne-s/include_patches_tarballs 

find-tarballs.nix: Include patches
parents 597ed547 956555ec

maintainers/scripts/copy-tarballs.pl

+6 −0
Original line number Diff line number Diff line
@@ -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)) {

maintainers/scripts/find-tarballs.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 {