JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fetchgitlab: make args more similar to fetchgithub

Browse Source
This commit is contained in:
Nicolas Benes 2023-11-18 13:14:08 +01:00
parent 27640d4921
commit 9375cf2008
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/build-support/fetchgitlab/default.nix
View File

@ -1,9 +1,10 @@
{ fetchgit, fetchzip, lib }:
{ lib, fetchgit, fetchzip }:
lib.makeOverridable (
# gitlab example
{ owner, repo, rev, protocol ? "https", domain ? "gitlab.com", name ? "source", group ? null
, fetchSubmodules ? false, leaveDotGit ? false, deepClone ? false
, fetchSubmodules ? false, leaveDotGit ? false
, deepClone ? false
, ... # For hash agility
} @ args:
@ -13,7 +14,7 @@ let
escapedRev = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] rev;
passthruAttrs = removeAttrs args [ "protocol" "domain" "owner" "group" "repo" "rev" "fetchSubmodules" "leaveDotGit" "deepClone" ];
useFetchGit = deepClone || fetchSubmodules || leaveDotGit;
useFetchGit = fetchSubmodules || leaveDotGit || deepClone;
fetcher = if useFetchGit then fetchgit else fetchzip;
gitRepoUrl = "${protocol}://${domain}/${slug}.git";

2
pkgs/build-support/fetchzip/default.nix
View File

@ -24,7 +24,7 @@
# the rest are given to fetchurl as is
, ... } @ args:
assert (extraPostFetch != "") -> lib.warn "use 'postFetch' instead of 'extraPostFetch' with 'fetchzip' and 'fetchFromGitHub'." true;
assert (extraPostFetch != "") -> lib.warn "use 'postFetch' instead of 'extraPostFetch' with 'fetchzip' and 'fetchFromGitHub' or 'fetchFromGitLab'." true;
let
tmpFilename =