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

fetchgit: pass tag directly and make overridable

parent 076076e9
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -42,9 +42,6 @@ lib.makeOverridable (
    constructDrv = stdenvNoCC.mkDerivation;

    excludeDrvArgNames = [
      # Passed via `passthru`
      "tag"

      # Additional stdenv.mkDerivation arguments from derived fetchers.
      "derivationArgs"

@@ -65,7 +62,7 @@ lib.makeOverridable (
          rev ? null,
          name ? urlToName {
            inherit url;
            rev = lib.revOrTag rev tag;
            rev = lib.revOrTag rev finalAttrs.tag;
            # when rootDir is specified, avoid invalidating the result when rev changes
            append = if rootDir != "" then "-${lib.strings.sanitizeDerivationName rootDir}" else "";
          },
@@ -176,7 +173,11 @@ lib.makeOverridable (
              rootDir
              gitConfigFile
              ;
            rev = getRevWithTag { inherit tag rev; };
            inherit tag;
            rev = getRevWithTag {
              inherit (finalAttrs) tag;
              inherit rev;
            };

            postHook =
              if netrcPhase == null then
@@ -216,7 +217,6 @@ lib.makeOverridable (

            passthru = {
              gitRepoUrl = url;
              inherit tag;
            }
            // passthru;
          }