Skip to content

fetchgit{,hub,lab}: passthru rev based on tag #369506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Atemu merged 3 commits into from
Jan 1, 2025
Merged

fetchgit{,hub,lab}: passthru rev based on tag #369506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f50def
fetchgit: passthru `tag`
pbsds Dec 30, 2024
39ddc92
fetchFromGitHub: passthru `rev` based on `tag`
pbsds Dec 30, 2024
f7eba55
fetchFromGitLab: passthru `rev` based on `tag`
pbsds Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkgs/build-support/fetchgit/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ stdenvNoCC.mkDerivation {

passthru = {
gitRepoUrl = url;
inherit tag;
};
}
))
6 changes: 4 additions & 2 deletions pkgs/build-support/fetchgithub/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,14 @@ let

gitRepoUrl = "${baseUrl}.git";

revWithTag = if tag != null then "refs/tags/${tag}" else rev;

fetcherArgs = (if useFetchGit
then {
inherit tag rev deepClone fetchSubmodules sparseCheckout fetchLFS; url = gitRepoUrl;
} // lib.optionalAttrs (leaveDotGit != null) { inherit leaveDotGit; }
else {
url = "${baseUrl}/archive/${if tag != null then "refs/tags/${tag}" else rev}.tar.gz";
url = "${baseUrl}/archive/${revWithTag}.tar.gz";

passthru = {
inherit gitRepoUrl;
Expand All @@ -73,5 +75,5 @@ let
) // privateAttrs // passthruAttrs // { inherit name; };
in

fetcher fetcherArgs // { meta = newMeta; inherit rev owner repo tag; }
fetcher fetcherArgs // { meta = newMeta; inherit owner repo tag; rev = revWithTag; }
)
9 changes: 4 additions & 5 deletions pkgs/build-support/fetchgitlab/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,9 @@ lib.makeOverridable (
repo
]
);
revWithTag = if tag != null then "refs/tags/" + tag else rev;
escapedSlug = lib.replaceStrings [ "." "/" ] [ "%2E" "%2F" ] slug;
escapedRev = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] (
if tag != null then "refs/tags/" + tag else rev
);
escapedRevWithTag = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] revWithTag;
passthruAttrs = removeAttrs args [
"protocol"
"domain"
Expand Down Expand Up @@ -77,7 +76,7 @@ lib.makeOverridable (
}
else
{
url = "${protocol}://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRev}";
url = "${protocol}://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRevWithTag}";

passthru = {
inherit gitRepoUrl;
Expand All @@ -95,9 +94,9 @@ lib.makeOverridable (
meta.homepage = "${protocol}://${domain}/${slug}/";
inherit
tag
rev
owner
repo
;
rev = revWithTag;
}
)
Loading