Commit dd9af800 authored by Yueh-Shun Li's avatar Yueh-Shun Li
Browse files

fetchFromGitHub: pass owner and repo via derivationArgs

parent e0ba367c

pkgs/build-support/fetchgithub/default.nix

+14 −2
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ lib.makeOverridable ( 
    revWithTag = if tag != null then "refs/tags/${tag}" else rev;



    fetcherArgs =

      finalAttrs:

      passthruAttrs

      // (

        if useFetchGit then
@@ -127,6 +128,12 @@ lib.makeOverridable ( 
              ;

            url = gitRepoUrl;

            inherit passthru;

            derivationArgs = {

              inherit

                owner

                repo

                ;

            };

          }

          // lib.optionalAttrs (leaveDotGit != null) { inherit leaveDotGit; }

        else
@@ -139,7 +146,7 @@ lib.makeOverridable ( 
            url =

              if private then

                let

                  endpoint = "/repos/${owner}/${repo}/tarball/${revWithTag}";

                  endpoint = "/repos/${finalAttrs.owner}/${finalAttrs.repo}/tarball/${revWithTag}";

                in

                if githubBase == "github.com" then

                  "https://api.github.com${endpoint}"
@@ -148,7 +155,12 @@ lib.makeOverridable ( 
              else

                "${baseUrl}/archive/${revWithTag}.tar.gz";

            extension = "tar.gz";



            derivationArgs = {

              inherit

                owner

                repo

                ;

            };

            passthru = {

              inherit gitRepoUrl;

            }