From bacccc39a9cfd80b62940002f0c656add2aa3619 Mon Sep 17 00:00:00 2001 From: Hans Joachim Kliemeck Date: Tue, 14 Oct 2025 14:53:13 +0000 Subject: [PATCH] stdenv: pURL - fix chaining case (github&submodules using fetchgit) --- pkgs/build-support/fetchgit/default.nix | 4 ++-- pkgs/build-support/fetchgithub/default.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index ed9daa7ff525..581cd1c9a19c 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -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; diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix index 115f8b5e867e..07c4c393ed88 100644 --- a/pkgs/build-support/fetchgithub/default.nix +++ b/pkgs/build-support/fetchgithub/default.nix @@ -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"