stdenv: pURL - fix chaining case (github&submodules using fetchgit)

This commit is contained in:
Hans Joachim Kliemeck
2025-10-14 14:53:13 +00:00
committed by d068328
parent f7cbf2374b
commit bacccc39a9
2 changed files with 6 additions and 6 deletions
+2 -2
View File
@@ -187,13 +187,13 @@ lib.makeOverridable (
inherit preferLocalBuild allowedRequisites;
meta = meta // {
meta = lib.recursiveUpdate {
identifiers.purlParts = {
type = "generic";
# https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/generic-definition.md
spec = "${name}?vcs_url=${url}@${(lib.revOrTag rev tag)}";
};
};
} meta;
passthru = {
gitRepoUrl = url;
+4 -4
View File
@@ -42,9 +42,8 @@ lib.makeOverridable (
builtins.unsafeGetAttrPos "rev" args
);
baseUrl = "https://${githubBase}/${owner}/${repo}";
newMeta =
meta
// {
newMeta = lib.recursiveUpdate (
{
homepage = meta.homepage or baseUrl;
identifiers.purlParts =
if githubBase == "github.com" then
@@ -63,7 +62,8 @@ lib.makeOverridable (
// lib.optionalAttrs (position != null) {
# to indicate where derivation originates, similar to make-derivation.nix's mkDerivation
position = "${position.file}:${toString position.line}";
};
}
) meta;
passthruAttrs = removeAttrs args [
"owner"