Unverified Commit 1cdecacb authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #198489 from Artturin/fetchgitlabremoteavvt 

fetchFromGitLab: don't passthruAttrs fetchGit specific attrs to fetchUrl
parents 7744e47b 19d2bb48

pkgs/build-support/fetchgitlab/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ let 
  slug = lib.concatStringsSep "/" ((lib.optional (group != null) group) ++ [ owner repo ]);

  escapedSlug = lib.replaceStrings [ "." "/" ] [ "%2E" "%2F" ] slug;

  escapedRev = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] rev;

  passthruAttrs = removeAttrs args [ "protocol" "domain" "owner" "group" "repo" "rev" ];

  passthruAttrs = removeAttrs args [ "protocol" "domain" "owner" "group" "repo" "rev" "fetchSubmodules" "leaveDotGit" "deepClone" ];



  useFetchGit = deepClone || fetchSubmodules || leaveDotGit;

  fetcher = if useFetchGit then fetchgit else fetchzip;